Replace remaining references to 2.9.0 with 2.9.1.

Also update the tech note listing the places that need to be changed when a
new version is released and the script which updates them automatically.

Finally update a couple of copyright years.

Closes #12185.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig
index fe371c851971ba1c30bfaf3cf42e997461dc4ec8..79ee2f98245521f970fa20f9eef5c8832fedd8ba 100644 (file)
--- a/build/osx/wxvers.xcconfig
+++ b/build/osx/wxvers.xcconfig
@@ -1,4 +1,4 @@
 // update this file with new version numbers
 
 DYLIB_COMPATIBILITY_VERSION = 2.9
-DYLIB_CURRENT_VERSION = 2.9.0
+DYLIB_CURRENT_VERSION = 2.9.1

diff --git a/docs/doxygen/latexdocstart.inc b/docs/doxygen/latexdocstart.inc
index d25c68a3ad8c748658c95ae3df4101420248065a..5f6108ce41cece9a1f00d42f2f53e1841ae56f36 100644 (file)
--- a/docs/doxygen/latexdocstart.inc
+++ b/docs/doxygen/latexdocstart.inc
@@ -49,7 +49,7 @@
 \end{center}
 \end{figure}
 \vspace*{2cm}
-{\large Version 2.9.0 }\\
+{\large Version 2.9.1 }\\
 \vspace*{1cm}
 {Generated on \today}\\
 \end{center}

diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h
index e61dc4ebe5255397bfb940f668184662fd972349..85bc57d4f2d8a4677cdc482e3b32a86b91bdd6f1 100644 (file)
--- a/docs/doxygen/mainpages/manual.h
+++ b/docs/doxygen/mainpages/manual.h
@@ -12,7 +12,7 @@
 @mainpage Reference manual
 @author Julian Smart, Robert Roebling, Vadim Zeitlin, Robin Dunn,
         Stefan Csomor, Francesco Montorsi, Bryan Petty, et al
-@date April, 2010
+@date July, 2010
 
 @image html main_wxlogo.png
 

diff --git a/docs/tech/tn0011.txt b/docs/tech/tn0011.txt
index 2ca9c565024f037d49eea828f719c71e95aec00f..280236d77d60fa918430063af5a354c9c108d472 100644 (file)
--- a/docs/tech/tn0011.txt
+++ b/docs/tech/tn0011.txt
@@ -9,17 +9,18 @@
 
    configure.in
    *.spec
-   include/wx/version.h
-   include/msvc/wx/setup.h [only major.minor used here]
-   samples/minimal/borland_ide.cpp
+   build/bakefiles/version.bkl {C:R:A}
+   build/osx/wxvers.xcconfig
+   docs/changes.txt
    docs/doxygen/Doxyfile_inc (PROJECT_NUMBER)
+   docs/doxygen/latexdocstart.inc
    docs/doxygen/mainpages/manual.h (just date)
    docs/msw/install.txt {major release only}
-   docs/changes.txt
-   build/bakefiles/version.bkl {C:R:A}
-   build/script/win_docs.bat {windows doc and setup file}
-   distrib/scripts/build-environ.cfg {SVN tar and zip files}
+   include/wx/version.h
    include/wx/osx/config_xcode.h
+   samples/Info.plist
+   samples/docview/Info.plist
+   samples/minimal/borland_ide.cpp {major release only}
 
    The script misc/scripts/inc_release can be used for incrementing
    the release field of the version, i.e. changing 2.8.x to 2.8.x+1.

diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release
index 8f342592123e44935ba2c9a4c39692e8b8751342..b35b6951816eb5d4b8b396565a29a2f2020685e1 100755 (executable)
--- a/misc/scripts/inc_release
+++ b/misc/scripts/inc_release
@@ -71,15 +71,6 @@ msg "Updating version to $ver_string_new"
 
 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/" \
@@ -89,11 +80,27 @@ for f in *.spec; do
     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 docs/doxygen/Doxyfile_inc \
     "/^PROJECT_NUMBER/s/$ver_for_sed/$ver_string_new/"
+
 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 distrib/scripts/build-environ.cfg \
-    "/BUILD_VERSION=/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/"

diff --git a/samples/Info.plist b/samples/Info.plist
index fd45201dbab813b82aa4915b4648ea8837fd8146..daeb525d56f40d9af4bf9948c21ca57dab4662db 100755 (executable)
--- a/samples/Info.plist
+++ b/samples/Info.plist
@@ -7,7 +7,7 @@
        <key>CFBundleExecutable</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundleGetInfoString</key>
-       <string>$(PRODUCT_NAME) version 2.9.0, (c) 2005-2007 wxWidgets</string>
+       <string>$(PRODUCT_NAME) version 2.9.1, (c) 2005-2010 wxWidgets</string>
        <key>CFBundleIconFile</key>
        <string>wxmac.icns</string>
        <key>CFBundleIdentifier</key>
@@ -15,22 +15,22 @@
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleLongVersionString</key>
-       <string>2.9.0, (c) 2005-2007 wxWidgets</string>
+       <string>2.9.1, (c) 2005-2010 wxWidgets</string>
        <key>CFBundleName</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.9.0</string>
+       <string>2.9.1</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>2.9.0</string>
+       <string>2.9.1</string>
        <key>CSResourcesFileMapped</key>
        <true/>
        <key>LSRequiresCarbon</key>
        <true/>
        <key>NSHumanReadableCopyright</key>
-       <string>Copyright 2005-2007 wxWidgets</string>
+       <string>Copyright 2005-2010 wxWidgets</string>
 </dict>
 </plist>

diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist
index 9bf4d70624138a2c646c5b4d738138122a5c60c1..19fdb0f31c3a8a01af22a9e38e55613792783883 100755 (executable)
--- a/samples/docview/Info.plist
+++ b/samples/docview/Info.plist
@@ -51,7 +51,7 @@
        <key>CFBundleExecutable</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundleGetInfoString</key>
-       <string>$(PRODUCT_NAME) version 2.9.0, (c) 2005-2008 wxWidgets</string>
+       <string>$(PRODUCT_NAME) version 2.9.1, (c) 2005-2010 wxWidgets</string>
        <key>CFBundleIconFile</key>
        <string>doc</string>
        <key>CFBundleIdentifier</key>
@@ -66,22 +66,22 @@
                <string>it</string>
        </array>
        <key>CFBundleLongVersionString</key>
-       <string>2.9.0, (c) 2005-2008 wxWidgets</string>
+       <string>2.9.1, (c) 2005-2010 wxWidgets</string>
        <key>CFBundleName</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.9.0</string>
+       <string>2.9.1</string>
        <key>CFBundleSignature</key>
        <string>WXMA</string>
        <key>CFBundleVersion</key>
-       <string>2.9.0</string>
+       <string>2.9.1</string>
        <key>CSResourcesFileMapped</key>
        <true/>
        <key>LSRequiresCarbon</key>
        <true/>
        <key>NSHumanReadableCopyright</key>
-       <string>Copyright 2005-2008 wxWidgets</string>
+       <string>Copyright 2005-2010 wxWidgets</string>
 </dict>
 </plist>