Version number change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@66958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-18 23:42:58 +00:00
parent 9f9d468ca0
commit a966515016
11 changed files with 41 additions and 41 deletions
--- a/build/bakefiles/version.bkl
+++ b/build/bakefiles/version.bkl
@@ -23,9 +23,9 @@
       3. Else, i.e. if there were no changes at all to API but only internal
          changes, change C:R:A to C:R+1:A
    -->
-    <set var="WX_CURRENT">7</set>
+    <set var="WX_CURRENT">8</set>
    <set var="WX_REVISION">0</set>
-    <set var="WX_AGE">7</set>
+    <set var="WX_AGE">8</set>


    <!-- ================================================================== -->
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,12 +1,12 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-SET WXW_VER=2.8.11
+SET WXW_VER=2.8.12


 if (%WXW_VER%)==() SET WXW_VER=CVS

 echo docs building for %WXW_VER%

-rem  This builds the docs in %WXWIN% in a number of formats 
+rem  This builds the docs in %WXWIN% in a number of formats
 rem  and a clean inno setup in a second tree
 rem  it uses a number of tools nmake, gnuwin32 zip & dos2unix, ghostscript, MS word, cvsNT
 rem  cvs is in the path already from CVSNT install
@@ -23,14 +23,14 @@ echo %PATH% >> c:\temp.log
 rem update wxw28b (holds docs) and inno (cvs wxMSW setup.exe only)
 c:
 cd %WXWIN%
-svn up 
+svn up

 rem now inno
 cd \wx\inno\wxw28b
 del c*.*
 if exist include\wx\msw\setup.h del include\wx\msw\setup.h
 if exist include\wx\univ\setup.h del include\wx\univ\setup.h
-svn up 
+svn up
 dos2unix configure
 dos2unix config.guess
 dos2unix config.sub
@@ -87,8 +87,8 @@ cd %WXWIN%
 del %DAILY%\*.zip
 zip %DAILY%\wxWidgets-%WXW_VER%-CHM.zip docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm
 zip %DAILY%\wxWidgets-%WXW_VER%-HLP.zip docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt
-zip %DAILY%\wxWidgets-%WXW_VER%-HTB.zip docs\htb\*.htb utils/tex2rtf/docs/*.htb 
-zip %DAILY%\wxWidgets-%WXW_VER%-HTML.zip docs\mshtml\wx\*.* utils/tex2rtf/docs/*.html utils/tex2rtf/docs/*.gif 
+zip %DAILY%\wxWidgets-%WXW_VER%-HTB.zip docs\htb\*.htb utils/tex2rtf/docs/*.htb
+zip %DAILY%\wxWidgets-%WXW_VER%-HTML.zip docs\mshtml\wx\*.* utils/tex2rtf/docs/*.html utils/tex2rtf/docs/*.gif

 cd %DAILY%\
 mkdir docs
--- a/20
+++ b/20
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.11.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.12.
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.8.11'
-PACKAGE_STRING='wxWidgets 2.8.11'
+PACKAGE_VERSION='2.8.12'
+PACKAGE_STRING='wxWidgets 2.8.12'
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'

 ac_unique_file="wx-config.in"
@@ -866,7 +866,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.8.11 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.8.12 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -932,7 +932,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.8.11:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.8.12:";;
   esac
  cat <<\_ACEOF

@@ -1338,7 +1338,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
  cat <<\_ACEOF
-wxWidgets configure 2.8.11
+wxWidgets configure 2.8.12
 generated by GNU Autoconf 2.59

 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1352,7 +1352,7 @@ cat >&5 <<_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.8.11, which was
+It was created by wxWidgets $as_me 2.8.12, which was
 generated by GNU Autoconf 2.59.  Invocation command line was

  $ $0 $@
@@ -1803,7 +1803,7 @@ test -n "$target_alias" &&

 wx_major_version_number=2
 wx_minor_version_number=8
-wx_release_number=11
+wx_release_number=12
 wx_subrelease_number=0

 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -51385,7 +51385,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF

-This file was extended by wxWidgets $as_me 2.8.11, which was
+This file was extended by wxWidgets $as_me 2.8.12, which was
 generated by GNU Autoconf 2.59.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -51448,7 +51448,7 @@ _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-wxWidgets config.status 2.8.11
+wxWidgets config.status 2.8.12
 configured by $0, generated by GNU Autoconf 2.59,
  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------

-AC_INIT([wxWidgets], [2.8.11], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.8.12], [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])
@@ -34,7 +34,7 @@ dnl wx_release_number += 1

 wx_major_version_number=2
 wx_minor_version_number=8
-wx_release_number=11
+wx_release_number=12
 wx_subrelease_number=0

 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -1517,7 +1517,7 @@ AC_PROG_RANLIB

 dnl ar command
 dnl   defines AR with the appropriate command
-dnl 
+dnl
 dnl For Sun CC AC_BAKEFILE below sets AR to the compiler itself.
 if test "x$SUNCXX" != xyes; then
    AC_CHECK_TOOL(AR, ar)
@@ -5272,7 +5272,7 @@ fi
 dnl check for uname (POSIX) and gethostname (BSD)
 WX_CHECK_FUNCS(uname,,,[#include <sys/utsname.h>])
 if test "$wx_cv_func_uname" != yes; then
-    WX_CHECK_FUNCS(gethostname)  
+    WX_CHECK_FUNCS(gethostname)
 fi

 WX_CHECK_FUNCS(strtok_r, [], [], [#define _REENTRANT])
@@ -6715,7 +6715,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                    wx_cv_type_getsockopt5=socklen_t,
                    [
                        dnl Note that the rules for compatibility of pointers
-                        dnl are somewhat different between C and C++, so code 
+                        dnl are somewhat different between C and C++, so code
                        dnl that fails in C++ may not even give a warning about
                        dnl converting between incompatible pointer types in C.
                        dnl So this test needs to be done in C++ mode.
--- a/distrib/scripts/build-environ.cfg
+++ b/distrib/scripts/build-environ.cfg
@@ -3,7 +3,7 @@
 # you should create your own settings file and specify that to create-release.sh.


-# the local spot that we put everything when done, before possibly copying 
+# the local spot that we put everything when done, before possibly copying
 # to remote hosts
 STAGING_DIR=./BUILD

@@ -18,7 +18,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
 CURDATE=`date -I`

 # build info
-BUILD_VERSION=2.8.11
+BUILD_VERSION=2.8.12
 BUILD_TAG=HEAD


@@ -31,7 +31,7 @@ else
 fi

 echo "Building for ${BUILD_VERSION}"
-		
+
 # Default build settings
 skipwin=no
 skipmac=no
--- a/include/wx/mac/carbon/config_xcode.h
+++ b/include/wx/mac/carbon/config_xcode.h
@@ -2,7 +2,7 @@
 // Name:        config_xcode.pch
 // Purpose:     configurations for xcode builds
 // Author:      Stefan Csomor
-// Modified by: 
+// Modified by:
 // Created:     29.04.04
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
@@ -25,9 +25,9 @@

 #define HAVE_BOOL 1
 #define HAVE_EXPLICIT 1
-#define HAVE_CONST_CAST 
-#define HAVE_REINTERPRET_CAST 
-#define HAVE_STATIC_CAST 
+#define HAVE_CONST_CAST
+#define HAVE_REINTERPRET_CAST
+#define HAVE_STATIC_CAST
 #define HAVE_VA_COPY 1
 #define HAVE_VARIADIC_MACROS 1
 #define CONST_COMPATIBILITY 0
@@ -117,9 +117,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.8.10"
+// #define PACKAGE_STRING "wxWidgets 2.8.12"
 // #define PACKAGE_TARNAME "wxwidgets"
-// #define PACKAGE_VERSION "2.8.10"
+// #define PACKAGE_VERSION "2.8.12"

 // for regex
 #define WX_NO_REGEX_ADVANCED 1
@@ -129,7 +129,7 @@
 #define HAVE_STDLIB_H 1

 // OBSOLETE ?
- 
+
 #define HAVE_COS 1
 #define HAVE_FLOOR 1
 #define HAVE_INTTYPES_H 1
--- a/wxBase.spec
+++ b/wxBase.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.8.11
+%define ver  2.8.12
 %define ver2 2.8
 %define rel  0

@@ -123,7 +123,7 @@ ln -sf %{_libdir}/wx/config/%{wxconfig} %{_bindir}/%{wxconfiglink}
 %preun devel
 if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then
    SUM1=`md5sum %{_libdir}/wx/config/%{wxconfig} | cut -c 0-32`
-    SUM2=`md5sum %{_bindir}/wx-config | cut -c 0-32`  
+    SUM2=`md5sum %{_bindir}/wx-config | cut -c 0-32`
    if test "x$SUM1" = "x$SUM2" ; then
        rm -f %{_bindir}/wx-config
    fi
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,5 +1,5 @@
 %define _prefix /usr
-%define ver  2.8.11
+%define ver  2.8.12
 %define ver2 2.8
 %define rel  0

@@ -116,7 +116,7 @@ wxBase is a collection of C++ classes providing basic data structures (strings,
 lists, arrays), portable wrappers around many OS-specific funstions (file
 operations, time/date manipulations, threads, processes, sockets, shared
 library loading) as well as other utility classes (streams, archive and
-compression). wxBase currently supports Win32, most Unix variants (Linux, 
+compression). wxBase currently supports Win32, most Unix variants (Linux,
 FreeBSD, Solaris, HP-UX) and MacOS X (Carbon and Mach-0).

 %package -n %{wxbasename}-devel
--- a/wxMGL.spec
+++ b/wxMGL.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.8.11
+%define ver  2.8.12
 %define ver2 2.8
 %define rel  0

--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.8.11
+%define ver  2.8.12
 %define ver2 2.8
 %define rel  0

@@ -97,7 +97,7 @@ cd ../../..

 mkdir obj-static
 cd obj-static
-../configure --prefix=%{pref} --with-motif --disable-shared --with-odbc --with-opengl 
+../configure --prefix=%{pref} --with-motif --disable-shared --with-odbc --with-opengl
 $MAKE
 cd ..

--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver  2.8.11
+%define ver  2.8.12
 %define ver2 2.8
 %define rel  0