From: Vadim Zeitlin Date: Mon, 12 Jul 2010 22:49:59 +0000 (+0000) Subject: Replace remaining references to 2.9.0 with 2.9.1. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e3837d0030bd99411e832f675dacf945d158cfa 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 fe371c8519..79ee2f9824 100644 --- 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 d25c68a3ad..5f6108ce41 100644 --- 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 e61dc4ebe5..85bc57d4f2 100644 --- 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 2ca9c56502..280236d77d 100644 --- 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 8f34259212..b35b695181 100755 --- 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/" \ + "//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/" \ + "//s/$ver_for_sed/$ver_string_new/" diff --git a/samples/Info.plist b/samples/Info.plist index fd45201dba..daeb525d56 100755 --- a/samples/Info.plist +++ b/samples/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.0, (c) 2005-2007 wxWidgets + $(PRODUCT_NAME) version 2.9.1, (c) 2005-2010 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,22 +15,22 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 2.9.0, (c) 2005-2007 wxWidgets + 2.9.1, (c) 2005-2010 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.0 + 2.9.1 CFBundleSignature ???? CFBundleVersion - 2.9.0 + 2.9.1 CSResourcesFileMapped LSRequiresCarbon NSHumanReadableCopyright - Copyright 2005-2007 wxWidgets + Copyright 2005-2010 wxWidgets diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist index 9bf4d70624..19fdb0f31c 100755 --- a/samples/docview/Info.plist +++ b/samples/docview/Info.plist @@ -51,7 +51,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.0, (c) 2005-2008 wxWidgets + $(PRODUCT_NAME) version 2.9.1, (c) 2005-2010 wxWidgets CFBundleIconFile doc CFBundleIdentifier @@ -66,22 +66,22 @@ it CFBundleLongVersionString - 2.9.0, (c) 2005-2008 wxWidgets + 2.9.1, (c) 2005-2010 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.0 + 2.9.1 CFBundleSignature WXMA CFBundleVersion - 2.9.0 + 2.9.1 CSResourcesFileMapped LSRequiresCarbon NSHumanReadableCopyright - Copyright 2005-2008 wxWidgets + Copyright 2005-2010 wxWidgets