Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Replace 2.9.1 version with 2.9.2.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-07-22 12:09:04 +00:00
parent ecdbd5b037
commit f203de0cc4
16 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/osx/wxvers.xcconfig
View File

@@ -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

48
configure vendored
View File

@@ -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'`\\"

4
configure.in
View File

@@ -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

2
docs/doxygen/Doxyfile_inc
View File

@@ -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

2
docs/doxygen/latexdocstart.inc
View File

@@ -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}

4
include/wx/osx/config_xcode.h
View File

@@ -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

4
include/wx/version.h
View File

@@ -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 */
/* ---------------------------------------------------------------------------- */

3
misc/scripts/inc_release
View File

@@ -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/"

8
samples/Info.plist
View File

@@ -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>

8
samples/docview/Info.plist
View File

@@ -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>

4
src/wxWindows.xcodeproj/project.pbxproj
View File

@@ -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++";

2
wxBase.spec
View File

@@ -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
wxGTK.spec
View File

@@ -1,5 +1,5 @@
%define _prefix /usr
%define ver 2.9.1
%define ver 2.9.2
%define ver2 2.9
%define rel 1

2
wxMGL.spec
View File

@@ -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
wxMotif.spec
View File

@@ -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
wxX11.spec
View File

@@ -1,5 +1,5 @@
%define pref /usr
%define ver 2.9.1
%define ver 2.9.2
%define ver2 2.9
%define rel 1