From c05b000c711ab72055c90f99cd22e0eff28992eb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 16 Dec 2011 22:12:49 +0000 Subject: [PATCH] Incremented the version number to 2.9.4 everywhere. The misc/scripts/inc_release script was used to update the versions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/osx/wxvers.xcconfig | 2 +- build/tools/bld_chm_exe.bat | 2 +- configure | 20 ++++++++++---------- configure.in | 4 ++-- docs/doxygen/Doxyfile_inc | 2 +- docs/doxygen/latexdocstart.inc | 2 +- docs/readme.txt | 12 ++++++------ include/wx/osx/config_xcode.h | 4 ++-- include/wx/version.h | 4 ++-- samples/Info.plist | 8 ++++---- samples/docview/Info.plist | 8 ++++---- samples/minimal/Info_carbon.plist | 8 ++++---- samples/minimal/Info_cocoa.plist | 8 ++++---- wxBase.spec | 2 +- wxGTK.spec | 2 +- wxMGL.spec | 2 +- wxMotif.spec | 2 +- wxX11.spec | 2 +- 18 files changed, 47 insertions(+), 47 deletions(-) diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig index 28855542c7..b460ad2e23 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.3 +DYLIB_CURRENT_VERSION = 2.9.4 diff --git a/build/tools/bld_chm_exe.bat b/build/tools/bld_chm_exe.bat index 4b634f9a98..59c70e3d60 100644 --- a/build/tools/bld_chm_exe.bat +++ b/build/tools/bld_chm_exe.bat @@ -1,5 +1,5 @@ rem Uncomment the next line to set the version; used also in wxWidgets.iss -SET WXW_VER=2.9.3 +SET WXW_VER=2.9.4 if (%WXW_VER%)==() SET WXW_VER=SVN echo docs building for %WXW_VER% diff --git a/configure b/configure index a986af452d..596bcf2519 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.3. +# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.4. # # Report bugs to . # @@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.9.3' -PACKAGE_STRING='wxWidgets 2.9.3' +PACKAGE_VERSION='2.9.4' +PACKAGE_STRING='wxWidgets 2.9.4' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' ac_unique_file="wx-config.in" @@ -1623,7 +1623,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 2.9.3 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.9.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1692,7 +1692,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.9.3:";; + short | recursive ) echo "Configuration of wxWidgets 2.9.4:";; esac cat <<\_ACEOF @@ -2146,7 +2146,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.9.3 +wxWidgets configure 2.9.4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2160,7 +2160,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 2.9.3, which was +It was created by wxWidgets $as_me 2.9.4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2642,7 +2642,7 @@ fi wx_major_version_number=2 wx_minor_version_number=9 -wx_release_number=3 +wx_release_number=4 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -56254,7 +56254,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 2.9.3, which was +This file was extended by wxWidgets $as_me 2.9.4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -56307,7 +56307,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.9.3 +wxWidgets config.status 2.9.4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index ac5b8c5a5f..8c16e20472 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.9.3], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.9.4], [wx-dev@lists.wxwidgets.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -43,7 +43,7 @@ dnl wx_release_number += 1 wx_major_version_number=2 wx_minor_version_number=9 -wx_release_number=3 +wx_release_number=4 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number diff --git a/docs/doxygen/Doxyfile_inc b/docs/doxygen/Doxyfile_inc index 796a80d479..8e99bb77de 100644 --- a/docs/doxygen/Doxyfile_inc +++ b/docs/doxygen/Doxyfile_inc @@ -12,7 +12,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets -PROJECT_NUMBER = 2.9.3 +PROJECT_NUMBER = 2.9.4 PROJECT_BRIEF = PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = out diff --git a/docs/doxygen/latexdocstart.inc b/docs/doxygen/latexdocstart.inc index 9e509b46ce..4c6e369063 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.3 }\\ +{\large Version 2.9.4 }\\ \vspace*{1cm} {Generated on \today}\\ \end{center} diff --git a/docs/readme.txt b/docs/readme.txt index 304c63acc1..5923ca34c1 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ - wxWidgets 2.9.3 Release Notes + wxWidgets 2.9.4 Release Notes ============================= Welcome to the latest release of wxWidgets, a free cross-platform C++ @@ -16,11 +16,11 @@ thread handling, and so on. You can learn more about wxWidgets at wxWidgets sources are available for download from - https://sourceforge.net/projects/wxwindows/files/2.9.3/ + https://sourceforge.net/projects/wxwindows/files/2.9.4/ or - ftp://ftp.wxwidgets.org/pub/2.9.3/ + ftp://ftp.wxwidgets.org/pub/2.9.4/ Please see the "Files" section below for the description of various files available at these locations. @@ -29,10 +29,10 @@ files available at these locations. A detailed reference manual including in-depth overviews for various topics is supplied in various formats and can be accessed online at - http://docs.wxwidgets.org/2.9.3/ + http://docs.wxwidgets.org/2.9.4/ -Note about naming: while 2.9.3 is called a "development" release, +Note about naming: while 2.9.4 is called a "development" release, this only means that API is not guaranteed to remain unchanged in the subsequent 2.9.x releases (although it is still likely that it will), unlike in the stable 2.8.x branch. We believe the current version is @@ -160,7 +160,7 @@ Documentation ------------- wxWidgets documentation is available online at -http://docs.wxwidgets.org/2.9.3/ and can also be downloaded in HTML +http://docs.wxwidgets.org/2.9.4/ and can also be downloaded in HTML format. To generate documentation in other formats (PDF, CHM, ...) please use the scripts in docs/doxygen directory. diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 6b12608433..67f02e7137 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -133,9 +133,9 @@ #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh" #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org" #define PACKAGE_NAME "wxWidgets" -#define PACKAGE_STRING "wxWidgets 2.9.3" +#define PACKAGE_STRING "wxWidgets 2.9.4" #define PACKAGE_TARNAME "wxwidgets" -#define PACKAGE_VERSION "2.9.3" +#define PACKAGE_VERSION "2.9.4" // for regex #define WX_NO_REGEX_ADVANCED 1 diff --git a/include/wx/version.h b/include/wx/version.h index 70b0da8008..438ce94590 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -28,9 +28,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 2 #define wxMINOR_VERSION 9 -#define wxRELEASE_NUMBER 3 +#define wxRELEASE_NUMBER 4 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 2.9.3") +#define wxVERSION_STRING wxT("wxWidgets 2.9.4") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/samples/Info.plist b/samples/Info.plist index 6c4091dfeb..91f1474eb7 100644 --- a/samples/Info.plist +++ b/samples/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets + $(PRODUCT_NAME) version 2.9.4, (c) 2005-2011 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 2.9.3, (c) 2005-2011 wxWidgets + 2.9.4, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.3 + 2.9.4 CFBundleSignature ???? CFBundleVersion - 2.9.3 + 2.9.4 CSResourcesFileMapped LSRequiresCarbon diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist index b196d7564f..cf709698d9 100644 --- a/samples/docview/Info.plist +++ b/samples/docview/Info.plist @@ -51,7 +51,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets + $(PRODUCT_NAME) version 2.9.4, (c) 2005-2011 wxWidgets CFBundleIconFile doc CFBundleIdentifier @@ -66,17 +66,17 @@ it CFBundleLongVersionString - 2.9.3, (c) 2005-2011 wxWidgets + 2.9.4, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.3 + 2.9.4 CFBundleSignature WXMA CFBundleVersion - 2.9.3 + 2.9.4 CSResourcesFileMapped LSRequiresCarbon diff --git a/samples/minimal/Info_carbon.plist b/samples/minimal/Info_carbon.plist index 46cabbc52f..a2df2b4601 100644 --- a/samples/minimal/Info_carbon.plist +++ b/samples/minimal/Info_carbon.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets + $(PRODUCT_NAME) version 2.9.4, (c) 2005-2011 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -22,17 +22,17 @@ it CFBundleLongVersionString - 2.9.3, (c) 2005-2011 wxWidgets + 2.9.4, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.3 + 2.9.4 CFBundleSignature ???? CFBundleVersion - 2.9.3 + 2.9.4 NSHumanReadableCopyright Copyright 2005-2011 wxWidgets diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist index 46cabbc52f..a2df2b4601 100644 --- a/samples/minimal/Info_cocoa.plist +++ b/samples/minimal/Info_cocoa.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.3, (c) 2005-2011 wxWidgets + $(PRODUCT_NAME) version 2.9.4, (c) 2005-2011 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -22,17 +22,17 @@ it CFBundleLongVersionString - 2.9.3, (c) 2005-2011 wxWidgets + 2.9.4, (c) 2005-2011 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.3 + 2.9.4 CFBundleSignature ???? CFBundleVersion - 2.9.3 + 2.9.4 NSHumanReadableCopyright Copyright 2005-2011 wxWidgets diff --git a/wxBase.spec b/wxBase.spec index eeaaca38c2..16ce9f8aa0 100644 --- a/wxBase.spec +++ b/wxBase.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.3 +%define ver 2.9.4 %define ver2 2.9 %define rel 1 diff --git a/wxGTK.spec b/wxGTK.spec index ac8b684162..0300819cd5 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,5 +1,5 @@ %define _prefix /usr -%define ver 2.9.3 +%define ver 2.9.4 %define ver2 2.9 %define rel 1 diff --git a/wxMGL.spec b/wxMGL.spec index f75efd6c9e..f48f2aa806 100644 --- a/wxMGL.spec +++ b/wxMGL.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.3 +%define ver 2.9.4 %define ver2 2.9 %define rel 1 diff --git a/wxMotif.spec b/wxMotif.spec index 3f0fc55331..db4d569d2b 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.3 +%define ver 2.9.4 %define ver2 2.9 %define rel 1 diff --git a/wxX11.spec b/wxX11.spec index f9e2c8540e..a76794a979 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.3 +%define ver 2.9.4 %define ver2 2.9 %define rel 1 -- 2.45.2