Replace 2.9.1 version with 2.9.2.

Also update the inc_release script to take src/wxWindows.xcodeproj into
account.

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

diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig
index 79ee2f98245521f970fa20f9eef5c8832fedd8ba..6c365506a471c7d948d2cc1fda61feb936963539 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.1
+DYLIB_CURRENT_VERSION = 2.9.2

diff --git a/configure b/configure
index fb4ea18826fb6211152c3b42c2270636f2d26a58..5ef7cfea918c612ae9831d34e24393eb23f4e4fd 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Id: configure.in 64869 2010-07-10 16:12:10Z JS .
+# From configure.in Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1.
+# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.2.
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
@@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.9.1'
-PACKAGE_STRING='wxWidgets 2.9.1'
+PACKAGE_VERSION='2.9.2'
+PACKAGE_STRING='wxWidgets 2.9.2'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 
 ac_unique_file="wx-config.in"
@@ -1596,7 +1596,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.1 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.9.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1665,7 +1665,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.9.1:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.9.2:";;
    esac
   cat <<\_ACEOF
 
@@ -2086,7 +2086,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-wxWidgets configure 2.9.1
+wxWidgets configure 2.9.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2100,7 +2100,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.1, which was
+It was created by wxWidgets $as_me 2.9.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2582,7 +2582,7 @@ fi
 
 wx_major_version_number=2
 wx_minor_version_number=9
-wx_release_number=1
+wx_release_number=2
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -16843,7 +16843,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_prog_gcc_traditional=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
@@ -16860,7 +16860,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "$ac_pattern" >/dev/null 2>&1; then
   ac_cv_prog_gcc_traditional=yes
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
 fi
@@ -19469,7 +19469,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -19490,7 +19490,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -24291,11 +24291,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -24335,11 +24337,13 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -24386,7 +24390,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 ;;
 esac
-rm -f -r conftest*
+rm -f conftest*
 
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
@@ -31100,7 +31104,7 @@ _ACEOF
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
+    for ac_extension in a so sl; do
       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
         test -f "$ac_im_libdir/libX11.$ac_extension"; then
        ac_im_usrlibdir=$ac_im_libdir; break
@@ -31253,7 +31257,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl dylib la dll; do
+  for ac_extension in a so sl; do
     if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
@@ -52856,7 +52860,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.1, which was
+This file was extended by wxWidgets $as_me 2.9.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -52909,7 +52913,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-wxWidgets config.status 2.9.1
+wxWidgets config.status 2.9.2
 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 8c56af04d7c56c3d1b017eeb3a8f6c7a4155eb6f..ab9b2170141a189d696acd9e9a9d1e11402d76c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
-AC_INIT([wxWidgets], [2.9.1], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.9.2], [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=1
+wx_release_number=2
 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 c0ae96e50c8e42a8c77d6353a981f3bea5774df7..95e8e323f9d35e78f052b9c25e9883a48707b5e5 100644 (file)
--- 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.1
+PROJECT_NUMBER         = 2.9.2
 OUTPUT_DIRECTORY       = out
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

diff --git a/docs/doxygen/latexdocstart.inc b/docs/doxygen/latexdocstart.inc
index 5f6108ce41cece9a1f00d42f2f53e1841ae56f36..0d11baf80253f4e1ac4be5e9abd7e1a4f9009c4b 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.1 }\\
+{\large Version 2.9.2 }\\
 \vspace*{1cm}
 {Generated on \today}\\
 \end{center}

diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index 08995c9a4f0aac5dfb76c7d4a2af954aeb3ae3f3..1da52bc6f1f1e148aaad57e9aaf9c4b04473ff10 100644 (file)
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -124,9 +124,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.1"
+#define PACKAGE_STRING "wxWidgets 2.9.2"
 #define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "2.9.1"
+#define PACKAGE_VERSION "2.9.2"
 
 // for regex
 #define WX_NO_REGEX_ADVANCED 1

diff --git a/include/wx/version.h b/include/wx/version.h
index 3ca52626b9b31f55d5df3676357cccca7ade8fff..e4ef79f0a4235ef25f9f7237e0428cf793d8e73d 100644 (file)
--- 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     1
+#define wxRELEASE_NUMBER     2
 #define wxSUBRELEASE_NUMBER  0
-#define wxVERSION_STRING   wxT("wxWidgets 2.9.1")
+#define wxVERSION_STRING   wxT("wxWidgets 2.9.2")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */

diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release
index b35b6951816eb5d4b8b396565a29a2f2020685e1..08564c01c7f87a0bac517a229707c0bcce1d30dd 100755 (executable)
--- a/misc/scripts/inc_release
+++ b/misc/scripts/inc_release
@@ -104,3 +104,6 @@ run_sed samples/Info.plist \
 run_sed samples/docview/Info.plist \
     "/versionon/s/$ver_for_sed/$ver_string_new/" \
     "/<string>/s/$ver_for_sed/$ver_string_new/"
+
+run_set src/wxWindows.xcodeproj/project.pbxproj \
+    "s/DYLIB_CURRENT_VERSION = $ver_for_sed/DYLIB_CURRENT_VERSION = $ver_string_new/"

diff --git a/samples/Info.plist b/samples/Info.plist
index daeb525d56f40d9af4bf9948c21ca57dab4662db..8a19de2aa234171b76eae4125a8a32e016eb3975 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.1, (c) 2005-2010 wxWidgets</string>
+       <string>$(PRODUCT_NAME) version 2.9.2, (c) 2005-2010 wxWidgets</string>
        <key>CFBundleIconFile</key>
        <string>wxmac.icns</string>
        <key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleLongVersionString</key>
-       <string>2.9.1, (c) 2005-2010 wxWidgets</string>
+       <string>2.9.2, (c) 2005-2010 wxWidgets</string>
        <key>CFBundleName</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.9.1</string>
+       <string>2.9.2</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>2.9.1</string>
+       <string>2.9.2</string>
        <key>CSResourcesFileMapped</key>
        <true/>
        <key>LSRequiresCarbon</key>

diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist
index 19fdb0f31c3a8a01af22a9e38e55613792783883..3c1955b7a778e05d44c4563fc045003833323eb5 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.1, (c) 2005-2010 wxWidgets</string>
+       <string>$(PRODUCT_NAME) version 2.9.2, (c) 2005-2010 wxWidgets</string>
        <key>CFBundleIconFile</key>
        <string>doc</string>
        <key>CFBundleIdentifier</key>
@@ -66,17 +66,17 @@
                <string>it</string>
        </array>
        <key>CFBundleLongVersionString</key>
-       <string>2.9.1, (c) 2005-2010 wxWidgets</string>
+       <string>2.9.2, (c) 2005-2010 wxWidgets</string>
        <key>CFBundleName</key>
        <string>$(PRODUCT_NAME)</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.9.1</string>
+       <string>2.9.2</string>
        <key>CFBundleSignature</key>
        <string>WXMA</string>
        <key>CFBundleVersion</key>
-       <string>2.9.1</string>
+       <string>2.9.2</string>
        <key>CSResourcesFileMapped</key>
        <true/>
        <key>LSRequiresCarbon</key>

diff --git a/src/wxWindows.xcodeproj/project.pbxproj b/src/wxWindows.xcodeproj/project.pbxproj
index ca57cdc098ff45369138e5cac2844011ad495775..c4ffef32c4952d72d2673df0dd7b4ef71326dcb6 100644 (file)
--- a/src/wxWindows.xcodeproj/project.pbxproj
+++ b/src/wxWindows.xcodeproj/project.pbxproj
@@ -5538,7 +5538,7 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                DYLIB_COMPATIBILITY_VERSION = 2.9;
-                               DYLIB_CURRENT_VERSION = 2.9.1;
+                               DYLIB_CURRENT_VERSION = 2.9.2;
                                GCC_INPUT_FILETYPE = automatic;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_PFE_FILE_C_DIALECTS = "c++";
@@ -5580,7 +5580,7 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                DYLIB_COMPATIBILITY_VERSION = 2.9;
-                               DYLIB_CURRENT_VERSION = 2.9.1;
+                               DYLIB_CURRENT_VERSION = 2.9.2;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_INPUT_FILETYPE = automatic;
                                GCC_PFE_FILE_C_DIALECTS = "c++";

diff --git a/wxBase.spec b/wxBase.spec
index f78d3f34eb06cc053000204baea400fa8b1e93b2..6da52b156b3253b4ba71e5bbbf1d2d408786709e 100644 (file)
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.9.1
+%define ver  2.9.2
 %define ver2 2.9
 %define rel  1
 

diff --git a/wxGTK.spec b/wxGTK.spec
index 477b0150ee87e3b990a535ad17e56f244ba0fb3f..b6484606b382469102a91611df70010eb55b6428 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,5 +1,5 @@
 %define _prefix /usr
-%define ver  2.9.1
+%define ver  2.9.2
 %define ver2 2.9
 %define rel  1
 

diff --git a/wxMGL.spec b/wxMGL.spec
index 8e79331dac4e68ea362f253b6d36f5054a4a4e2f..ba69bd97d429629f409e4e9e947a983fae5f637c 100644 (file)
--- a/wxMGL.spec
+++ b/wxMGL.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.9.1
+%define ver 2.9.2
 %define ver2 2.9
 %define rel 1
 

diff --git a/wxMotif.spec b/wxMotif.spec
index 6b03b7b87240899fa4751f9b56b3bc36432abad5..03bb33c022fa452cfc4a8190b361d9d4b8d505c1 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.9.1
+%define ver  2.9.2
 %define ver2 2.9
 %define rel  1
 

diff --git a/wxX11.spec b/wxX11.spec
index 6f73f7d3b4c7a734c2fd6e2126ba34b719c6d743..a57cb348119928994cfdc72df86b91972d650ba3 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.9.1
+%define ver  2.9.2
 %define ver2 2.9
 %define rel  1