centralize version info in one file, include it from all makefiles

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

diff --git a/src/makeg95.env b/src/makeg95.env
index 763cf395a1fc3e255e9eae1f6e1b8df281f785d9..1a9851fdaf0260c6d19c89796a84f2347cc11611 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -69,7 +69,8 @@ OSTYPE=msys
 endif
 
 # If building DLL, the version
-WXVERSION=250
+include version.mak
+WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE)
 
 ifndef UNICODE
   UNICODE=0

diff --git a/src/makevc.env b/src/makevc.env
index 01247c6b0b259b2d3d7839ce6217cdf68b7b1bcd..78ed7bb272a4323229249f1e48c3dd26143f4be7 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,12 +8,14 @@
 #
 !include <ntwin32.mak>
 
+# read version numbers
+!include "version.mak"
+WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE)
+
 !if "$(RM)" == ""
 RM= erase
 !endif
 
-WXVERSION=25
-
 # WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+
 WIN95=1
 

diff --git a/src/version.mak b/src/version.mak
new file mode 100644 (file)
index 0000000..34d7c11
--- /dev/null
+++ b/src/version.mak
@@ -0,0 +1,24 @@
+##############################################################################
+# Name:        src/version.mak
+# Purpose:     file defining wxWindows version used by all other makefiles
+# Author:      Vadim Zeitlin
+# Modified by:
+# Created:     25.02.03
+# RCS-ID:      $Id$
+# Copyright:   (c) 2003 Vadim Zeitlin
+# Licence:     wxWindows license
+##############################################################################
+
+wxMAJOR_VERSION=2
+wxMINOR_VERSION=5
+wxRELEASE_NUMBER=0
+
+# release number if used in the DLL file names only for the unstable branch as
+# for the stable branches the micro releases are supposed to be backwards
+# compatible and so should have the same name or otherwise it would be
+# impossible to use them without recompiling the applications (which is the
+# whole goal of keeping them backwards compatible in the first place)
+#
+# as 2.5 is an unstable branch, wxRELEASE_NUMBER_IFUNSTABLE should be set
+# (but when we go to 2.6, it should become empty)
+wxRELEASE_NUMBER_IFUNSTABLE=$(wxRELEASE_NUMBER)