[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl,1.17,1.18 options.bkl,1.7,1.8

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/modules/build/bakefiles

Modified Files:
	modules.bkl options.bkl 
Log Message:
Added infrastructure to build custom wxbind

Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** options.bkl	27 Jan 2006 21:57:10 -0000	1.7
--- options.bkl	2 Feb 2006 23:02:29 -0000	1.8
***************
*** 61,74 ****
      </if>
  
- 
-     <option name="WXLUASETUP_DIR" category="path">
-         <default-value>$(WXLUASETUP_DIR_DEFAULT)</default-value>
-         <description>The folder where wxluasetup.h is searched</description>
-     </option>
- 
-     <option name="WXLUABINDLIB_DIR" category="path">
-         <default-value>$(WXLUABINDLIB_DIR_DEFAULT)</default-value>
-         <description>The folder where wxLuaBind library is sent</description>
-     </option>
- 
  </makefile>
--- 61,63 ----

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** modules.bkl	2 Feb 2006 18:46:44 -0000	1.17
--- modules.bkl	2 Feb 2006 23:02:29 -0000	1.18
***************
*** 13,166 ****
  <makefile>
  
!     <!-- This file contains the wxLua template -->
!     <include file="../../../build/bakefiles/wxluabase.bkl"/>
! 
! 
!     <!-- ================================================================== -->
!     <!--                     SOURCES and HEADERS LIST                       -->
!     <!-- ================================================================== -->
! 
!     <!-- All the source files & header files linked above are relative to our MODULE dir. -->
!     <set var="FILELISTDIR">../..</set>
!     <if cond="FORMAT!='autoconf'">
!         <set var="WXLUA_BASEDIR">../../..</set>
!         <set var="WXLUA_MODULEDIR">../..</set>
!         <set var="SRCDIR">$(WXLUA_MODULEDIR)</set>
! 
!         <set var="WXLUA_SOURCEDIR">$(WXLUA_MODULEDIR)</set>
!         <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
!         <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set>
!     </if>
!     <if cond="FORMAT=='autoconf'">
!         <set var="SRCDIR">.</set>
! 
!         <!-- In this way we support makefiles created from folders != root folder;
!              i.e. with this trick you can do:
!                    mkdir mybuild && cd mybuild && ../configure && make
!         -->
!         <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
!         <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set>
! 
!         <!-- top_builddir already ends with '/' -->
!         <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)$(WXLUA_LIBOUTPUT_FOLDER)</set>
!         <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)$(WXLUA_DLLOUTPUT_FOLDER)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set>
!     </if>
! 
!     <!-- the ldllmain.c file must be excluded ! -->
!     <set var="LUA_SRC">$(fileList('lua/src/*.c', '*dll*'))</set>
!     <set var="LUA_HDR">$(fileList('lua/include/*.h'))</set>
! 
!     <set var="LUALIB_SRC">$(fileList('lua/src/lib/*.c'))</set>
!     <set var="LUALIB_HDR">$(fileList('lua/src/lib/*.h'))</set>
! 
!     <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set>
!     <set var="WXBIND_HDR">$(fileList('wxbind/include/*.h'))</set>
! 
!     <set var="WXBINDSTC_SRC">$(fileList('wxbindstc/src/*.cpp'))</set>
!     <set var="WXBINDSTC_HDR">$(fileList('wxbindstc/include/*.h'))</set>
! 
!     <set var="WXLUA_SRC">$(fileList('wxlua/src/*.cpp'))</set>
!     <set var="WXLUA_HDR">$(fileList('wxlua/include/*.h'))</set>
! 
!     <set var="WXLUADEBUG_SRC">$(fileList('wxluadebug/src/*.cpp'))</set>
!     <set var="WXLUADEBUG_HDR">$(fileList('wxluadebug/include/*.h'))</set>
! 
!     <set var="WXLUASOCKET_SRC">$(fileList('wxluasocket/src/*.cpp'))</set>
!     <set var="WXLUASOCKET_HDR">$(fileList('wxluasocket/include/*.h'))</set>
! 
! 
! 
! 
!     <!-- ================================================================== -->
!     <!--                        The list of wxLua OPTIONS                   -->
!     <!-- ================================================================== -->
! 
!     <!-- modules-specific options -->
!     <include file="options.bkl"/>
! 
! 
!     <!-- ================================================================== -->
!     <!--                             NEW RULES                              -->
!     <!--  with these ones, each module/sample target takes few lines only   -->
!     <!-- ================================================================== -->
  
!     <define-rule name="wxlua_lib" extends="lib">
          <template>
!             <srcdir>$(WXLUA_SOURCEDIR)</srcdir>
!             <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname>
!             <install-to>$(LIBDIR)</install-to>
!             <headers-install-to>$(INCLUDEDIR)</headers-install-to>
! 
!             <set var="__modname"/>
          </template>
-         <define-tag name="module-name">
-             <set var="__modname">$(value)</set>
-             <set var="__modnamelow">$(__modname.lower())</set>
- 
-             <!--
-                 The library name will look something like:
-                      libwxlua_[gtk2|x11|...][u][d]_[modulename]-[wxversion].so      (or .a)
-                 on Unix; on win32 instead:
-                      wxlua_msw[u][d]_[modulename]-[wxversion without dots].dll      (or .lib)
-             -->
-             <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname>
-             <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources>
-             <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers>
- 
-             <!-- This is required because wxbind.h refers to wx contrib section, too -->
-             <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if>
- 
-             <!-- to make MSVC6PRJ output look better... -->
-             <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
-             <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
-         </define-tag>
      </define-rule>
! 
!     <define-rule name="wxlua_dll" extends="dll">
          <template>
!             <srcdir>$(WXLUA_SOURCEDIR)</srcdir>
!             <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname>
!             <install-to>$(LIBDIR)</install-to>
!             <headers-install-to>$(INCLUDEDIR)</headers-install-to>
! 
!             <!-- The DLL version -->
!             <version>$(WXLUA_VERSION)</version>
!             <so_version>$(WXLUA_SOVERSION)</so_version>
!             <mac_version>$(WXLUA_MACVERSION)</mac_version>
! 
!             <!-- Libraries must be put in the right order ! -->
!             <wxlua-req-libs/>
!             <wx-lib>xrc</wx-lib>
!             <wx-lib>html</wx-lib>
!             <wx-lib>media</wx-lib>
!             <wx-lib>adv</wx-lib>
!             <wx-lib>net</wx-lib>
!             <wx-lib>xml</wx-lib>
!             <wx-lib>core</wx-lib>
!             <wx-lib>base</wx-lib>
! 
!             <set var="__modname"/>
          </template>
!         <define-tag name="module-name">
!             <set var="__modname">$(value)</set>
!             <set var="__modnamelow">$(__modname.lower())</set>
! 
!             <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname>
!             <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources>
!             <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers>
! 
!             <!-- This is required because wxbind.h refers to wx contrib section, too -->
!             <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if>
  
-             <!-- to make MSVC6PRJ output look better... -->
-             <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
-             <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
  
-             <!-- now, shared stuff -->
-             <define>$(value)_MAKINGDLL</define>
-         </define-tag>
-     </define-rule>
  
  
--- 13,34 ----
  <makefile>
  
!     <!-- Contains stuff shared between this bakefile and the
!          wxLua/modules/wxbind/build/wxbindcustom.bkl one -->
!     <include file="common.bkl"/>
  
!     <define-rule name="wxlua_stdlib" extends="wxlua_lib">
          <template>
!             <!-- always use wxLua's official wxluasetup.h for standard wxLua modules -->
!             <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include>
          </template>
      </define-rule>
!     <define-rule name="wxlua_stddll" extends="wxlua_dll">
          <template>
!             <!-- always use wxLua's official wxluasetup.h for standard wxLua modules -->
!             <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include>
          </template>
!     </define-rule>
  
  
  
  
***************
*** 210,254 ****
  
      <!-- the wxLua lib & dll -->
!     <wxlua_lib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXLUA</module-name>
!     </wxlua_lib>
!     <wxlua_dll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXLUA</module-name>
!     </wxlua_dll>
  
      <!-- the wxBind lib & dll -->
!     <wxlua_lib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXBIND</module-name>
!     </wxlua_lib>
!     <wxlua_dll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXBIND</module-name>
!     </wxlua_dll>
  
      <!-- the wxBindSTC lib & dll -->
!     <wxlua_lib id="wxbindstc_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXBINDSTC</module-name>
!     </wxlua_lib>
!     <wxlua_dll id="wxbindstc_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXBINDSTC</module-name>
!     </wxlua_dll>
! 
! 
!     <!-- FIXME:  WXLUASETUP_DIR and WXLUABINDLIB_DIR -->
  
      <!-- the wxLuaDebug lib & dll -->
!     <wxlua_lib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXLUADEBUG</module-name>
!     </wxlua_lib>
!     <wxlua_dll id="wxluadebug_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXLUADEBUG</module-name>
!     </wxlua_dll>
  
      <!-- the wxLuaSocket lib & dll -->
!     <wxlua_lib id="wxluasocket_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXLUASOCKET</module-name>
!     </wxlua_lib>
!     <wxlua_dll id="wxluasocket_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXLUASOCKET</module-name>
!     </wxlua_dll>
  
  
--- 78,119 ----
  
      <!-- the wxLua lib & dll -->
!     <wxlua_stdlib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXLUA</module-name>
!     </wxlua_stdlib>
!     <wxlua_stddll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXLUA</module-name>
!     </wxlua_stddll>
  
      <!-- the wxBind lib & dll -->
!     <wxlua_stdlib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXBIND</module-name>
!     </wxlua_stdlib>
!     <wxlua_stddll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXBIND</module-name>
!     </wxlua_stddll>
  
      <!-- the wxBindSTC lib & dll -->
!     <wxlua_stdlib id="wxbindstc_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXBINDSTC</module-name>
!     </wxlua_stdlib>
!     <wxlua_stddll id="wxbindstc_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXBINDSTC</module-name>
!     </wxlua_stddll>
  
      <!-- the wxLuaDebug lib & dll -->
!     <wxlua_stdlib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXLUADEBUG</module-name>
!     </wxlua_stdlib>
!     <wxlua_stddll id="wxluadebug_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXLUADEBUG</module-name>
!     </wxlua_stddll>
  
      <!-- the wxLuaSocket lib & dll -->
!     <wxlua_stdlib id="wxluasocket_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
          <module-name>WXLUASOCKET</module-name>
!     </wxlua_stdlib>
!     <wxlua_stddll id="wxluasocket_dll" template="wxlua" cond="WX_SHARED=='1'">
          <module-name>WXLUASOCKET</module-name>
!     </wxlua_stddll>
  
  
***************
*** 261,264 ****
--- 126,130 ----
          mod_wxlua=wxlua_lib+wxlua_dll
          mod_wxbind=wxbind_lib+wxbind_dll
+         mod_wxbindstc=wxbindstc_lib+wxbindstc_dll
          mod_wxluadebug=wxluadebug_lib+wxluadebug_dll
          mod_wxluasocket=wxluasocket_lib+wxluasocket_dll