From f203de0cc435ab836505ad32b88cda5dc318db68 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Jul 2010 12:09:04 +0000 Subject: [PATCH] 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 --- build/osx/wxvers.xcconfig | 2 +- configure | 48 +++++++++++++------------ configure.in | 4 +-- docs/doxygen/Doxyfile_inc | 2 +- docs/doxygen/latexdocstart.inc | 2 +- include/wx/osx/config_xcode.h | 4 +-- include/wx/version.h | 4 +-- misc/scripts/inc_release | 3 ++ samples/Info.plist | 8 ++--- samples/docview/Info.plist | 8 ++--- src/wxWindows.xcodeproj/project.pbxproj | 4 +-- wxBase.spec | 2 +- wxGTK.spec | 2 +- wxMGL.spec | 2 +- wxMotif.spec | 2 +- wxX11.spec | 2 +- 16 files changed, 53 insertions(+), 46 deletions(-) diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig index 79ee2f9824..6c365506a4 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.1 +DYLIB_CURRENT_VERSION = 2.9.2 diff --git a/configure b/configure index fb4ea18826..5ef7cfea91 100755 --- 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 . # @@ -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 +#include /* for off_t */ + #include 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 +#include /* for off_t */ + #include 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 ." _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 8c56af04d7..ab9b217014 100644 --- 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 c0ae96e50c..95e8e323f9 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.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 5f6108ce41..0d11baf802 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.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 08995c9a4f..1da52bc6f1 100644 --- 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 3ca52626b9..e4ef79f0a4 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 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 b35b695181..08564c01c7 100755 --- 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/" \ "//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 daeb525d56..8a19de2aa2 100755 --- a/samples/Info.plist +++ b/samples/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.1, (c) 2005-2010 wxWidgets + $(PRODUCT_NAME) version 2.9.2, (c) 2005-2010 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -15,17 +15,17 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 2.9.1, (c) 2005-2010 wxWidgets + 2.9.2, (c) 2005-2010 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.1 + 2.9.2 CFBundleSignature ???? CFBundleVersion - 2.9.1 + 2.9.2 CSResourcesFileMapped LSRequiresCarbon diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist index 19fdb0f31c..3c1955b7a7 100755 --- a/samples/docview/Info.plist +++ b/samples/docview/Info.plist @@ -51,7 +51,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 2.9.1, (c) 2005-2010 wxWidgets + $(PRODUCT_NAME) version 2.9.2, (c) 2005-2010 wxWidgets CFBundleIconFile doc CFBundleIdentifier @@ -66,17 +66,17 @@ it CFBundleLongVersionString - 2.9.1, (c) 2005-2010 wxWidgets + 2.9.2, (c) 2005-2010 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 2.9.1 + 2.9.2 CFBundleSignature WXMA CFBundleVersion - 2.9.1 + 2.9.2 CSResourcesFileMapped LSRequiresCarbon diff --git a/src/wxWindows.xcodeproj/project.pbxproj b/src/wxWindows.xcodeproj/project.pbxproj index ca57cdc098..c4ffef32c4 100644 --- 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 f78d3f34eb..6da52b156b 100644 --- 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 477b0150ee..b6484606b3 100644 --- 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 8e79331dac..ba69bd97d4 100644 --- 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 6b03b7b872..03bb33c022 100644 --- 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 6f73f7d3b4..a57cb34811 100644 --- 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 -- 2.45.2