Set version number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -208,7 +208,7 @@
|
|||||||
</if>
|
</if>
|
||||||
|
|
||||||
<if cond="not isdefined('WX_VERSION')">
|
<if cond="not isdefined('WX_VERSION')">
|
||||||
<set var="WX_VERSION_DEFAULT" overwrite="0">28</set>
|
<set var="WX_VERSION_DEFAULT" overwrite="0">290</set>
|
||||||
<option name="WX_VERSION">
|
<option name="WX_VERSION">
|
||||||
<default-value>$(WX_VERSION_DEFAULT)</default-value>
|
<default-value>$(WX_VERSION_DEFAULT)</default-value>
|
||||||
<description>
|
<description>
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
rem Uncomment the next line to set the version; used also in wxWidgets.iss
|
rem Uncomment the next line to set the version; used also in wxWidgets.iss
|
||||||
SET WXW_VER=2.8.1
|
SET WXW_VER=2.9.0
|
||||||
if (%WXW_VER%)==() SET WXW_VER=CVS
|
if (%WXW_VER%)==() SET WXW_VER=CVS
|
||||||
|
|
||||||
echo docs building for %WXW_VER%
|
echo docs building for %WXW_VER%
|
||||||
|
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
|
|||||||
dnl initialization
|
dnl initialization
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
AC_INIT([wxWidgets], [2.8.1], [wx-dev@lists.wxwidgets.org])
|
AC_INIT([wxWidgets], [2.9.0], [wx-dev@lists.wxwidgets.org])
|
||||||
|
|
||||||
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
|
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
|
||||||
AC_CONFIG_SRCDIR([wx-config.in])
|
AC_CONFIG_SRCDIR([wx-config.in])
|
||||||
@@ -33,9 +33,9 @@ dnl
|
|||||||
dnl wx_release_number += 1
|
dnl wx_release_number += 1
|
||||||
|
|
||||||
wx_major_version_number=2
|
wx_major_version_number=2
|
||||||
wx_minor_version_number=8
|
wx_minor_version_number=9
|
||||||
wx_release_number=1
|
wx_release_number=0
|
||||||
wx_subrelease_number=1
|
wx_subrelease_number=0
|
||||||
|
|
||||||
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
|
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
|
||||||
WX_VERSION=$WX_RELEASE.$wx_release_number
|
WX_VERSION=$WX_RELEASE.$wx_release_number
|
||||||
|
@@ -17,7 +17,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
|
|||||||
CURDATE=`date -I`
|
CURDATE=`date -I`
|
||||||
|
|
||||||
# build info
|
# build info
|
||||||
BUILD_VERSION=2.8.2
|
BUILD_VERSION=2.9.0
|
||||||
BUILD_TAG=HEAD
|
BUILD_TAG=HEAD
|
||||||
|
|
||||||
|
|
||||||
|
@@ -30,9 +30,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
#pragma comment(lib,"wxbase28ud")
|
#pragma comment(lib,"wxbase290ud")
|
||||||
#pragma comment(lib,"wxbase28ud_net")
|
#pragma comment(lib,"wxbase290ud_net")
|
||||||
#pragma comment(lib,"wxbase28ud_xml")
|
#pragma comment(lib,"wxbase290ud_xml")
|
||||||
#if wxUSE_REGEX
|
#if wxUSE_REGEX
|
||||||
#pragma comment(lib,"wxregexud")
|
#pragma comment(lib,"wxregexud")
|
||||||
#endif
|
#endif
|
||||||
@@ -53,35 +53,35 @@
|
|||||||
#if wxUSE_ZLIB
|
#if wxUSE_ZLIB
|
||||||
#pragma comment(lib,"wxzlibd")
|
#pragma comment(lib,"wxzlibd")
|
||||||
#endif
|
#endif
|
||||||
#pragma comment(lib,"wxmsw28ud_adv")
|
#pragma comment(lib,"wxmsw290ud_adv")
|
||||||
#pragma comment(lib,"wxmsw28ud_core")
|
#pragma comment(lib,"wxmsw290ud_core")
|
||||||
#pragma comment(lib,"wxmsw28ud_html")
|
#pragma comment(lib,"wxmsw290ud_html")
|
||||||
#if wxUSE_GLCANVAS
|
#if wxUSE_GLCANVAS
|
||||||
#pragma comment(lib,"wxmsw28ud_gl")
|
#pragma comment(lib,"wxmsw290ud_gl")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_DEBUGREPORT
|
#if wxUSE_DEBUGREPORT
|
||||||
#pragma comment(lib,"wxmsw28ud_qa")
|
#pragma comment(lib,"wxmsw290ud_qa")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_XRC
|
#if wxUSE_XRC
|
||||||
#pragma comment(lib,"wxmsw28ud_xrc")
|
#pragma comment(lib,"wxmsw290ud_xrc")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_AUI
|
#if wxUSE_AUI
|
||||||
#pragma comment(lib,"wxmsw28ud_aui")
|
#pragma comment(lib,"wxmsw290ud_aui")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_RICHTEXT
|
#if wxUSE_RICHTEXT
|
||||||
#pragma comment(lib,"wxmsw28ud_richtext")
|
#pragma comment(lib,"wxmsw290ud_richtext")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_MEDIACTRL
|
#if wxUSE_MEDIACTRL
|
||||||
#pragma comment(lib,"wxmsw28ud_media")
|
#pragma comment(lib,"wxmsw290ud_media")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_ODBC
|
#if wxUSE_ODBC
|
||||||
#pragma comment(lib,"wxbase28ud_odbc")
|
#pragma comment(lib,"wxbase290ud_odbc")
|
||||||
#endif
|
#endif
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
#else // release
|
#else // release
|
||||||
#pragma comment(lib,"wxbase28u")
|
#pragma comment(lib,"wxbase290u")
|
||||||
#pragma comment(lib,"wxbase28u_net")
|
#pragma comment(lib,"wxbase290u_net")
|
||||||
#pragma comment(lib,"wxbase28u_xml")
|
#pragma comment(lib,"wxbase290u_xml")
|
||||||
#if wxUSE_REGEX
|
#if wxUSE_REGEX
|
||||||
#pragma comment(lib,"wxregexu")
|
#pragma comment(lib,"wxregexu")
|
||||||
#endif
|
#endif
|
||||||
@@ -102,29 +102,29 @@
|
|||||||
#if wxUSE_ZLIB
|
#if wxUSE_ZLIB
|
||||||
#pragma comment(lib,"wxzlib")
|
#pragma comment(lib,"wxzlib")
|
||||||
#endif
|
#endif
|
||||||
#pragma comment(lib,"wxmsw28u_adv")
|
#pragma comment(lib,"wxmsw290u_adv")
|
||||||
#pragma comment(lib,"wxmsw28u_core")
|
#pragma comment(lib,"wxmsw290u_core")
|
||||||
#pragma comment(lib,"wxmsw28u_html")
|
#pragma comment(lib,"wxmsw290u_html")
|
||||||
#if wxUSE_GLCANVAS
|
#if wxUSE_GLCANVAS
|
||||||
#pragma comment(lib,"wxmsw28u_gl")
|
#pragma comment(lib,"wxmsw290u_gl")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_DEBUGREPORT
|
#if wxUSE_DEBUGREPORT
|
||||||
#pragma comment(lib,"wxmsw28u_qa")
|
#pragma comment(lib,"wxmsw290u_qa")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_XRC
|
#if wxUSE_XRC
|
||||||
#pragma comment(lib,"wxmsw28u_xrc")
|
#pragma comment(lib,"wxmsw290u_xrc")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_AUI
|
#if wxUSE_AUI
|
||||||
#pragma comment(lib,"wxmsw28u_aui")
|
#pragma comment(lib,"wxmsw290u_aui")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_RICHTEXT
|
#if wxUSE_RICHTEXT
|
||||||
#pragma comment(lib,"wxmsw28u_richtext")
|
#pragma comment(lib,"wxmsw290u_richtext")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_MEDIACTRL
|
#if wxUSE_MEDIACTRL
|
||||||
#pragma comment(lib,"wxmsw28u_media")
|
#pragma comment(lib,"wxmsw290u_media")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_ODBC
|
#if wxUSE_ODBC
|
||||||
#pragma comment(lib,"wxbase28u_odbc")
|
#pragma comment(lib,"wxbase290u_odbc")
|
||||||
#endif
|
#endif
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
#endif // debug/release
|
#endif // debug/release
|
||||||
@@ -144,9 +144,9 @@
|
|||||||
#endif // shared/static
|
#endif // shared/static
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
#pragma comment(lib,"wxbase28d")
|
#pragma comment(lib,"wxbase290d")
|
||||||
#pragma comment(lib,"wxbase28d_net")
|
#pragma comment(lib,"wxbase290d_net")
|
||||||
#pragma comment(lib,"wxbase28d_xml")
|
#pragma comment(lib,"wxbase290d_xml")
|
||||||
#if wxUSE_REGEX
|
#if wxUSE_REGEX
|
||||||
#pragma comment(lib,"wxregexd")
|
#pragma comment(lib,"wxregexd")
|
||||||
#endif
|
#endif
|
||||||
@@ -167,35 +167,35 @@
|
|||||||
#if wxUSE_ZLIB
|
#if wxUSE_ZLIB
|
||||||
#pragma comment(lib,"wxzlibd")
|
#pragma comment(lib,"wxzlibd")
|
||||||
#endif
|
#endif
|
||||||
#pragma comment(lib,"wxmsw28d_adv")
|
#pragma comment(lib,"wxmsw290d_adv")
|
||||||
#pragma comment(lib,"wxmsw28d_core")
|
#pragma comment(lib,"wxmsw290d_core")
|
||||||
#pragma comment(lib,"wxmsw28d_html")
|
#pragma comment(lib,"wxmsw290d_html")
|
||||||
#if wxUSE_GLCANVAS
|
#if wxUSE_GLCANVAS
|
||||||
#pragma comment(lib,"wxmsw28d_gl")
|
#pragma comment(lib,"wxmsw290d_gl")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_DEBUGREPORT
|
#if wxUSE_DEBUGREPORT
|
||||||
#pragma comment(lib,"wxmsw28d_qa")
|
#pragma comment(lib,"wxmsw290d_qa")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_XRC
|
#if wxUSE_XRC
|
||||||
#pragma comment(lib,"wxmsw28d_xrc")
|
#pragma comment(lib,"wxmsw290d_xrc")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_AUI
|
#if wxUSE_AUI
|
||||||
#pragma comment(lib,"wxmsw28d_aui")
|
#pragma comment(lib,"wxmsw290d_aui")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_RICHTEXT
|
#if wxUSE_RICHTEXT
|
||||||
#pragma comment(lib,"wxmsw28d_richtext")
|
#pragma comment(lib,"wxmsw290d_richtext")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_MEDIACTRL
|
#if wxUSE_MEDIACTRL
|
||||||
#pragma comment(lib,"wxmsw28d_media")
|
#pragma comment(lib,"wxmsw290d_media")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_ODBC
|
#if wxUSE_ODBC
|
||||||
#pragma comment(lib,"wxbase28d_odbc")
|
#pragma comment(lib,"wxbase290d_odbc")
|
||||||
#endif
|
#endif
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
#else // release
|
#else // release
|
||||||
#pragma comment(lib,"wxbase28")
|
#pragma comment(lib,"wxbase290")
|
||||||
#pragma comment(lib,"wxbase28_net")
|
#pragma comment(lib,"wxbase290_net")
|
||||||
#pragma comment(lib,"wxbase28_xml")
|
#pragma comment(lib,"wxbase290_xml")
|
||||||
#if wxUSE_REGEX
|
#if wxUSE_REGEX
|
||||||
#pragma comment(lib,"wxregex")
|
#pragma comment(lib,"wxregex")
|
||||||
#endif
|
#endif
|
||||||
@@ -216,29 +216,29 @@
|
|||||||
#if wxUSE_ZLIB
|
#if wxUSE_ZLIB
|
||||||
#pragma comment(lib,"wxzlib")
|
#pragma comment(lib,"wxzlib")
|
||||||
#endif
|
#endif
|
||||||
#pragma comment(lib,"wxmsw28_adv")
|
#pragma comment(lib,"wxmsw290_adv")
|
||||||
#pragma comment(lib,"wxmsw28_core")
|
#pragma comment(lib,"wxmsw290_core")
|
||||||
#pragma comment(lib,"wxmsw28_html")
|
#pragma comment(lib,"wxmsw290_html")
|
||||||
#if wxUSE_GLCANVAS
|
#if wxUSE_GLCANVAS
|
||||||
#pragma comment(lib,"wxmsw28_gl")
|
#pragma comment(lib,"wxmsw290_gl")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_DEBUGREPORT
|
#if wxUSE_DEBUGREPORT
|
||||||
#pragma comment(lib,"wxmsw28_qa")
|
#pragma comment(lib,"wxmsw290_qa")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_XRC
|
#if wxUSE_XRC
|
||||||
#pragma comment(lib,"wxmsw28_xrc")
|
#pragma comment(lib,"wxmsw290_xrc")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_AUI
|
#if wxUSE_AUI
|
||||||
#pragma comment(lib,"wxmsw28_aui")
|
#pragma comment(lib,"wxmsw290_aui")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_RICHTEXT
|
#if wxUSE_RICHTEXT
|
||||||
#pragma comment(lib,"wxmsw28_richtext")
|
#pragma comment(lib,"wxmsw290_richtext")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_MEDIACTRL
|
#if wxUSE_MEDIACTRL
|
||||||
#pragma comment(lib,"wxmsw28_media")
|
#pragma comment(lib,"wxmsw290_media")
|
||||||
#endif
|
#endif
|
||||||
#if wxUSE_ODBC
|
#if wxUSE_ODBC
|
||||||
#pragma comment(lib,"wxbase28_odbc")
|
#pragma comment(lib,"wxbase290_odbc")
|
||||||
#endif
|
#endif
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
#endif // debug/release
|
#endif // debug/release
|
||||||
|
@@ -27,10 +27,10 @@
|
|||||||
|
|
||||||
/* NB: this file is parsed by automatic tools so don't change its format! */
|
/* NB: this file is parsed by automatic tools so don't change its format! */
|
||||||
#define wxMAJOR_VERSION 2
|
#define wxMAJOR_VERSION 2
|
||||||
#define wxMINOR_VERSION 8
|
#define wxMINOR_VERSION 9
|
||||||
#define wxRELEASE_NUMBER 1
|
#define wxRELEASE_NUMBER 0
|
||||||
#define wxSUBRELEASE_NUMBER 1
|
#define wxSUBRELEASE_NUMBER 0
|
||||||
#define wxVERSION_STRING _T("wxWidgets 2.8.1")
|
#define wxVERSION_STRING _T("wxWidgets 2.9.0")
|
||||||
|
|
||||||
/* nothing to update below this line when updating the version */
|
/* nothing to update below this line when updating the version */
|
||||||
/* ---------------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------------- */
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
%define pref /usr
|
%define pref /usr
|
||||||
%define ver 2.8.1
|
%define ver 2.9.0
|
||||||
%define ver2 2.8
|
%define ver2 2.9
|
||||||
%define rel 1
|
%define rel 1
|
||||||
|
|
||||||
# Configurable settings (use --with(out) unicode on rpmbuild command line):
|
# Configurable settings (use --with(out) unicode on rpmbuild command line):
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
%define _prefix /usr
|
%define _prefix /usr
|
||||||
%define ver 2.8.1
|
%define ver 2.9.0
|
||||||
%define ver2 2.8
|
%define ver2 2.9
|
||||||
%define rel 1
|
%define rel 1
|
||||||
|
|
||||||
# Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line):
|
# Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line):
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
%define pref /usr
|
%define pref /usr
|
||||||
%define ver 2.8.1
|
%define ver 2.9.0
|
||||||
%define ver2 2.8
|
%define ver2 2.9
|
||||||
%define rel 1
|
%define rel 1
|
||||||
|
|
||||||
Summary: The SciTech MGL port of the wxWindows library
|
Summary: The SciTech MGL port of the wxWindows library
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
%define pref /usr
|
%define pref /usr
|
||||||
%define ver 2.8.1
|
%define ver 2.9.0
|
||||||
%define ver2 2.8
|
%define ver2 2.9
|
||||||
%define rel 1
|
%define rel 1
|
||||||
|
|
||||||
%define portname motif
|
%define portname motif
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
%define pref /usr
|
%define pref /usr
|
||||||
%define ver 2.8.1
|
%define ver 2.9.0
|
||||||
%define ver2 2.8
|
%define ver2 2.9
|
||||||
%define rel 1
|
%define rel 1
|
||||||
|
|
||||||
# Configurable settings (use --with(out) unicode on rpmbuild cmd line):
|
# Configurable settings (use --with(out) unicode on rpmbuild cmd line):
|
||||||
|
Reference in New Issue
Block a user