Update of /cvsroot/wxlua/wxLua/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3425/build/bakefiles
Modified Files:
wxluabase.bkl
Log Message:
fixed versioning
Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxluabase.bkl 28 Jan 2006 21:01:07 -0000 1.8
--- wxluabase.bkl 29 Jan 2006 15:45:40 -0000 1.9
***************
*** 15,23 ****
<using module="datafiles"/>
! <!-- The default version of wxWidgets which is used by wxLua is 2.6;
if you want to use other versions, you'll have to specify it
using the WX_VERSION option -->
<set var="WX_VERSION_DEFAULT">26</set>
<!-- This file contains the declaration of the WX & WX-LIB templates -->
<include file="wxhacks.bkl"/>
--- 15,51 ----
<using module="datafiles"/>
!
! <!-- ================================================================== -->
! <!-- VERSION -->
! <!-- ================================================================== -->
!
! <!--
! wxLua version is strictly tied to the wxWidgets version: the first
! stable release of wxLua wrappers for wx 2.6.2 is named 2.6.2.1;
! other releases which would eventually follow will be named 2.6.2.2,
! 2.6.2.3, etc.
!
! So, only the fourth digit of the wxLua version number is defined here.
! The first three are taken from wxWidgets' version number.
!
! NOTE: wxLua version is stored in the following variable, WXLUA_RELEASE,
! and in the configure.ac file. Remember to update both !
! -->
!
! <set var="WXLUA_RELEASE">0</set>
!
! <!-- The default version of wxWidgets which is used by wxLua;
if you want to use other versions, you'll have to specify it
using the WX_VERSION option -->
<set var="WX_VERSION_DEFAULT">26</set>
+ <!-- these variables needs to be carefully set by someone who
+ knows how binary compatibility works ! -->
+ <set var="WXLUA_VERSION">$(WX_VERSION_DEFAULT[:1]).$(WX_VERSION_DEFAULT[1:]).$(WXLUA_RELEASE)</set>
+ <set var="WXLUA_SOVERSION">0.0.$(WXLUA_RELEASE)</set>
+ <set var="WXLUA_MACVERSION">$(int(WXLUA_RELEASE)+1)</set> <!-- must be > 0 -->
+
+
+
<!-- This file contains the declaration of the WX & WX-LIB templates -->
<include file="wxhacks.bkl"/>
***************
*** 27,47 ****
<!-- ================================================================== -->
<!-- VARIABLES -->
<!-- ================================================================== -->
- <!-- Some infos on the version. -->
- <set var="WXLUA_MAJOR">2</set>
- <set var="WXLUA_MINOR">6</set>
- <set var="WXLUA_RELEASE">1</set>
- <set var="WXLUA_VERSION">$(WXLUA_MAJOR).$(WXLUA_MINOR).$(WXLUA_RELEASE)</set>
-
- <!-- 0.0.0 must be used for stable releases; 1.0.0, 2.0.0 ...
- are used for development releases. -->
- <set var="WXLUA_SOVERSION">0.0.0</set>
-
- <!-- Same as WXLUA_SOVERSION just without dots -->
- <set var="WXLUA_MACVERSION">0</set>
-
<!-- Use same naming conventions as for wxWidgets. -->
<set var="WXLUA_LIBPOSTFIX">
--- 55,64 ----
+
+
<!-- ================================================================== -->
<!-- VARIABLES -->
<!-- ================================================================== -->
<!-- Use same naming conventions as for wxWidgets. -->
<set var="WXLUA_LIBPOSTFIX">
***************
*** 143,146 ****
--- 160,166 ----
installed the library yet ! -->
<include>$(WXLUA_BASEDIR)/modules</include>
+
+ <!-- this is for art/* files; the ./ is a little hack to avoid formatIfEmpty errors -->
+ <include>./$(WXLUA_BASEDIR)</include>
</template>
|
