Change wxBoxSizer::AddSpacer() to only add space in sizer direction.

[wxWidgets.git] / build / bakefiles / version.bkl

diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl
index 18e7dc3c8e9632964fe2650871ebf4048223e176..b2e39fcc97fd9ef3c51318a80bfb9fb6d858293e 100644 (file)
--- a/build/bakefiles/version.bkl
+++ b/build/bakefiles/version.bkl
@@ -2,37 +2,30 @@
 <!-- $Id$ -->
 
 <makefile>
 <!-- $Id$ -->
 
 <makefile>

-    
+

     <!-- ================================================================== -->
     <!--                      Handling of binary compatiblity:              -->
     <!-- ================================================================== -->
 
     <!--
     <!-- ================================================================== -->
     <!--                      Handling of binary compatiblity:              -->
     <!-- ================================================================== -->
 
     <!--

-       We use libtool CURRENT:REVISION:AGE versioning scheme. Quoting libtool
-       documentation on how to handle the values:
-        
-       1. Start with version information of `0:0:0' for each libtool library.
-     
-       2. Update the version information only immediately before a public
-          release of your software.  More frequent updates are unnecessary,
-          and only guarantee that the current interface number gets larger
-          faster.
-     
-       3. If the library source code has changed at all since the last
-          update, then increment REVISION (`C:R:A' becomes `C:r+1:A').
-     
-       4. If any interfaces have been added, removed, or changed since the
-          last update, increment CURRENT, and set REVISION to 0.
-     
-       5. If any interfaces have been added since the last public release,
-          then increment AGE.
-     
-       6. If any interfaces have been removed since the last public release,
-          then set AGE to 0.
+       We use libtool CURRENT:REVISION:AGE versioning scheme. Here are the
+       rules for updating the values below, this should be done whenever wx
+       version (wx/version.h) changes (we abbreviate WX_CURRENT:REVISION:AGE
+       as C:R:A respectively):
+
+       0. Set C:R:A = 0:0:0 if major or minor version has changed.
+
+       1. If any API has been removed or otherwise changed in backwards
+          incompatible way, then change C:R:A to C+1:0:0
+
+       2. Else, if any API has been added, change C:R:A to C+1:0:A+1
+
+       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">2</set>
+    <set var="WX_CURRENT">1</set>

     <set var="WX_REVISION">0</set>
     <set var="WX_REVISION">0</set>

-    <set var="WX_AGE">2</set>
+    <set var="WX_AGE">0</set>

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


@@ -79,7 +72,8 @@
     <!-- FIXME: until libtool scheme is implemented in bakefile -->
     <set var="WXMACVERSION_CMD">
         <if cond="PLATFORM_MACOSX=='1'">
     <!-- FIXME: until libtool scheme is implemented in bakefile -->
     <set var="WXMACVERSION_CMD">
         <if cond="PLATFORM_MACOSX=='1'">

-            -compatibility_version $(WX_AGE).0 -current_version $(WX_AGE).$(WX_REVISION)
+           <!-- Version can't be 0, so add 1 to it to force it to be non null -->
+            -compatibility_version $(int(WX_AGE)+1).0 -current_version $(int(WX_AGE)+1).$(WX_REVISION)

         </if>
     </set>
 
         </if>
     </set>