using #ifdef wxABORT_ON_CONFIG_ERROR not just #if as elsewhere

[wxWidgets.git] / misc / scripts / inc_release

diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release
index 8f342592123e44935ba2c9a4c39692e8b8751342..160cf7b5a23c9ca2df84e028913d2e707b7d5543 100755 (executable)
--- a/misc/scripts/inc_release
+++ b/misc/scripts/inc_release
@@ -4,7 +4,6 @@
 # Purpose:    increments the release version number in all files mentioned in
 #             docs/tech/tn0011.txt
 # Created:    2007-01-07
 # Purpose:    increments the release version number in all files mentioned in
 #             docs/tech/tn0011.txt
 # Created:    2007-01-07

-# RCS-ID:     $Id$

 # Copyright:  (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 # Licence:    wxWindows licence
 ##############################################################################
 # Copyright:  (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 # Licence:    wxWindows licence
 ##############################################################################


@@ -71,15 +70,6 @@ msg "Updating version to $ver_string_new"
 
 ver_for_sed="$ver_major\.$ver_minor\.$ver_release"
 
 
 ver_for_sed="$ver_major\.$ver_minor\.$ver_release"
 

-run_sed include/wx/version.h \
-    "s/^\(#define wxRELEASE_NUMBER *\) $ver_release$/\1 $ver_release_new/" \
-    "s/^\(#define wxSUBRELEASE_NUMBER *\) [0-9]\{1,\}$/\1 0/" \
-    "/^#define wxVERSION_STRING/s/$ver_for_sed/$ver_string_new/"
-run_sed include/wx/osx/config_xcode.h \
-    "/^#define PACKAGE/s/$ver_for_sed/$ver_string_new/"
-run_sed src/wxWindows.xcodeproj/project.pbxproj \
-    "/DYLIB_.* = /s/$ver_for_sed/$ver_string_new/"
-

 run_sed configure.in \
     "/^AC_INIT/s/$ver_for_sed/$ver_string_new/" \
     "s/^wx_release_number=$ver_release/wx_release_number=$ver_release_new/" \
 run_sed configure.in \
     "/^AC_INIT/s/$ver_for_sed/$ver_string_new/" \
     "s/^wx_release_number=$ver_release/wx_release_number=$ver_release_new/" \


@@ -89,11 +79,42 @@ for f in *.spec; do
     run_sed $f "/^%define *ver/s/$ver_for_sed/$ver_string_new/"
 done
 
     run_sed $f "/^%define *ver/s/$ver_for_sed/$ver_string_new/"
 done
 

+run_sed build/osx/wxvers.xcconfig \
+    "/DYLIB_.* = /s/$ver_for_sed/$ver_string_new/"
+
+run_sed build/tools/bld_chm_exe.bat \
+    "/^SET WXW_VER=/s/$ver_for_sed/$ver_string_new/"
+
+run_sed docs/readme.txt \
+    "/wxWidgets /s/$ver_for_sed/$ver_string_new/" \
+    "/\//s/$ver_for_sed/$ver_string_new/" \
+    "/naming: while/s/$ver_for_sed/$ver_string_new/" 
+

 run_sed docs/doxygen/Doxyfile_inc \
     "/^PROJECT_NUMBER/s/$ver_for_sed/$ver_string_new/"
 run_sed docs/doxygen/Doxyfile_inc \
     "/^PROJECT_NUMBER/s/$ver_for_sed/$ver_string_new/"

+

 run_sed docs/doxygen/latexdocstart.inc \
 run_sed docs/doxygen/latexdocstart.inc \

-    "/{\\\\large Version/s/$ver_for_sed/$ver_string_new/"
-run_sed build/script/win_docs.bat "/SET WXW_VER=/s/$ver_for_sed/$ver_string_new/"
+    "/\\large Version/s/$ver_for_sed/$ver_string_new/"
+
+run_sed include/wx/version.h \
+    "s/^\(#define wxRELEASE_NUMBER *\) $ver_release$/\1 $ver_release_new/" \
+    "s/^\(#define wxSUBRELEASE_NUMBER *\) [0-9]\{1,\}$/\1 0/" \
+    "/^#define wxVERSION_STRING/s/$ver_for_sed/$ver_string_new/"
+
+run_sed include/wx/osx/config_xcode.h \
+    "/^#define PACKAGE/s/$ver_for_sed/$ver_string_new/"
+
+run_sed samples/Info.plist \
+    "/version/s/$ver_for_sed/$ver_string_new/" \
+    "/<string>/s/$ver_for_sed/$ver_string_new/"
+
+run_sed samples/minimal/Info_carbon.plist \
+    "/<string>/s/$ver_for_sed/$ver_string_new/"
+run_sed samples/minimal/Info_cocoa.plist \
+    "/<string>/s/$ver_for_sed/$ver_string_new/"
+
+run_sed samples/docview/Info.plist \
+    "/versionon/s/$ver_for_sed/$ver_string_new/" \
+    "/<string>/s/$ver_for_sed/$ver_string_new/"

 
 

-run_sed distrib/scripts/build-environ.cfg \
-    "/BUILD_VERSION=/s/$ver_for_sed/$ver_string_new/"
+msg "Don't forget to change the C:R:A triplet in build/bakefiles/version.bkl now!"