moved version-related variables to separate file in preparation for sonames fix ...

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 8baf4d4a96dd7d7aa70581fb815d9c0bf782cfda..a6fe824348a549c61f44beb111e1313ba65b6857 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -29,42 +29,9 @@
 
     <include file="plugins_deps.bkl"/>
 
 
     <include file="plugins_deps.bkl"/>
 

-    <!-- ================================================================== -->
-    <!--                     wxWidgets version numbers:                     -->
-    <!-- ================================================================== -->
-
-    <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
-    <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
-    <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
-    <set var="WX_RELEASE" make_var="1">
-        $(WXVER_MAJOR).$(WXVER_MINOR)
-    </set>
-    <set var="WX_RELEASE_NODOT" make_var="1">
-        $(WXVER_MAJOR)$(WXVER_MINOR)
-    </set>
-    <set var="WX_VERSION" make_var="1">
-        $(WX_RELEASE).$(WXVER_RELEASE)
-    </set>
-    <set var="WX_VERSION_NODOT" make_var="1">
-        $(WX_RELEASE_NODOT)$(WXVER_RELEASE)
-    </set>
-
-    <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>

 
 

-    <!-- this needs to be reset to 0 on beginning of stable series and
-         increment by one 1 every time binary incompatible change is made
-         (i.e. preferably never) -->
-    <set var="WX_BINARY_VERSION">1</set>
-    
-    <set var="WXSOVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WX_BINARY_VERSION).0.0</if>
-        <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
-    </set>
-    <set var="WXMACVERSION">$(WX_VERSION)</set>
-    <set var="WXWIN32DLLVERSION">
-        <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
-        <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
-    </set>
+    <!-- wxWidgets version numbers logic: -->
+    <include file="version.bkl"/>

 
 
     <!-- ================================================================== -->
 
 
     <!-- ================================================================== -->

diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl
new file mode 100644 (file)
index 0000000..3e03078
--- /dev/null
+++ b/build/bakefiles/version.bkl
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+    
+    <!-- ================================================================== -->
+    <!--                      Handling of binary compatiblity:              -->
+    <!-- ================================================================== -->
+
+    <!-- this needs to be reset to 0 on beginning of stable series and
+         increment by one 1 every time binary incompatible change is made
+         (i.e. preferably never) -->
+    <set var="WX_BINARY_VERSION">0</set>
+    
+
+
+    <!-- ================================================================== -->
+    <!--                        Library version number:                     -->
+    <!-- ================================================================== -->
+
+    <!-- extract wx version number from wx/version.h: -->
+    <set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
+    <set var="WXVER_MINOR">$(wxwin.getVersionMinor())</set>
+    <set var="WXVER_RELEASE">$(wxwin.getVersionRelease())</set>
+
+
+
+    <!-- ================================================================== -->
+    <!--                          Derived variables:                        -->
+    <!-- ================================================================== -->
+
+    <!-- set misc helper variables: -->
+
+    <set var="WX_RELEASE" make_var="1">
+        $(WXVER_MAJOR).$(WXVER_MINOR)
+    </set>
+    <set var="WX_RELEASE_NODOT" make_var="1">
+        $(WXVER_MAJOR)$(WXVER_MINOR)
+    </set>
+    <set var="WX_VERSION" make_var="1">
+        $(WX_RELEASE).$(WXVER_RELEASE)
+    </set>
+    <set var="WX_VERSION_NODOT" make_var="1">
+        $(WX_RELEASE_NODOT)$(WXVER_RELEASE)
+    </set>
+
+    <set var="WX_STABLE_BRANCH">$(int(int(WXVER_MINOR) % 2 == 0))</set>
+    
+    <set var="WXSOVERSION">
+        <if cond="WX_STABLE_BRANCH=='1'">$(WX_BINARY_VERSION).0.0</if>
+        <if cond="WX_STABLE_BRANCH=='0'">$(WXVER_RELEASE).0.0</if>
+    </set>
+    <set var="WXMACVERSION">$(WX_VERSION)</set>
+    <set var="WXWIN32DLLVERSION">
+        <if cond="WX_STABLE_BRANCH=='1'">$(WX_RELEASE_NODOT)</if>
+        <if cond="WX_STABLE_BRANCH=='0'">$(WX_VERSION_NODOT)</if>
+    </set>
+
+</makefile>