wxlua-commit

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

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

Modified Files:
	wxhacks.bkl wxlua.bkl wxluabase.bkl 
Log Message:
fixed top_builddir problems

Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxluabase.bkl	25 Jan 2006 18:35:58 -0000	1.6
--- wxluabase.bkl	27 Jan 2006 21:57:07 -0000	1.7
***************
*** 54,58 ****
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
!         <set var="WXLUA_BASEDIR">..$(DIRSEP)..</set>
      </if>
      <if cond="TARGETING_WIN32=='0'">
--- 54,58 ----
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
!         <set var="WXLUA_BASEDIR">../..</set>
      </if>
      <if cond="TARGETING_WIN32=='0'">
***************
*** 64,71 ****
          <if cond="TARGETING_WIN32=='1'">
              <!-- in this case, the COMPILER variable is defined -->
!             lib$(DIRSEP)$(COMPILER)_lib$(WXLUA_LIBPOSTFIX)
          </if>
          <if cond="TARGETING_WIN32=='0'">
!            lib
          </if>
      </set>
--- 64,71 ----
          <if cond="TARGETING_WIN32=='1'">
              <!-- in this case, the COMPILER variable is defined -->
!             lib/$(COMPILER)_lib$(WXLUA_LIBPOSTFIX)
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             lib
          </if>
      </set>
***************
*** 73,77 ****
          <if cond="TARGETING_WIN32=='1'">
              <!-- in this case, the COMPILER variable is defined -->
!             lib$(DIRSEP)$(COMPILER)_dll$(WXLUA_LIBPOSTFIX)
          </if>
          <if cond="TARGETING_WIN32=='0'">
--- 73,77 ----
          <if cond="TARGETING_WIN32=='1'">
              <!-- in this case, the COMPILER variable is defined -->
!             lib/$(COMPILER)_dll$(WXLUA_LIBPOSTFIX)
          </if>
          <if cond="TARGETING_WIN32=='0'">
***************
*** 86,90 ****
  
      <if cond="TARGETING_WIN32=='1'">
!         <set var="SUBPROJECT_POSTFIX_PATH">build$(DIRSEP)msw</set>
      </if>
      <if cond="TARGETING_WIN32=='0'">
--- 86,90 ----
  
      <if cond="TARGETING_WIN32=='1'">
!         <set var="SUBPROJECT_POSTFIX_PATH">build/msw</set>
      </if>
      <if cond="TARGETING_WIN32=='0'">
***************
*** 129,133 ****
               on *nix: when compiling the samples or the library the user has not
               installed the library yet ! -->
!         <include>$(WXLUA_BASEDIR)$(DIRSEP)modules</include>
      </template>
  
--- 129,133 ----
               on *nix: when compiling the samples or the library the user has not
               installed the library yet ! -->
!         <include>$(WXLUA_BASEDIR)/modules</include>
      </template>
  
***************
*** 139,143 ****
      <!-- a template for wxLua-based exe/dll targets -->
      <template id="wxlua" template="wx,wxlua-base">
!         <lib-path>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_OUTPUT_FOLDER)</lib-path>
  
          <!-- same technique used by wx_win32.bkl: this is a placeholder
--- 139,143 ----
      <!-- a template for wxLua-based exe/dll targets -->
      <template id="wxlua" template="wx,wxlua-base">
!         <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path>
  
          <!-- same technique used by wx_win32.bkl: this is a placeholder

Index: wxhacks.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxhacks.bkl	23 Jan 2006 21:20:29 -0000	1.1
--- wxhacks.bkl	27 Jan 2006 21:57:06 -0000	1.2
***************
*** 14,22 ****
      <!--     Unix. To use it you just need to use the 'wxbase' template         -->
      <!--     together with the 'wx' or 'wx-lib' templates.                      -->
!     <!--                                                           -->
!     <!--                                                           -->
!     <!--                                                           -->
!     <!--                                                           -->
!     <!--                                                           -->
  
      <!-- This bakefile provides a lot of wxWidgets-specific settings -->
--- 14,20 ----
      <!--     Unix. To use it you just need to use the 'wxbase' template         -->
      <!--     together with the 'wx' or 'wx-lib' templates.                      -->
!     <!--     For 'autoconf' format this file should be used together with       -->
!     <!--     wxpresets.m4 macro file which contains a lot of useful macros      -->
!     <!--     for wx-based projects. See wxpresets.m4 comments for more info.    -->
  
      <!-- This bakefile provides a lot of wxWidgets-specific settings -->
***************
*** 66,69 ****
--- 64,72 ----
          <option name="WX_VERSION"/>
          <option name="WX_PORT"/>
+ 
+         <!-- these option values are available only with autoconf (and using wxpresets.m4) -->
+         <option name="WX_VERSION_MAJOR"/>
+         <option name="WX_VERSION_MINOR"/>
+         <option name="WX_GTKPORT_VERSION"/>
      </if>
      <if cond="TARGETING_WIN32=='1'">
***************
*** 72,78 ****
  
  
!     <!--
!          Set the build directory in a common way which makes us possible to keep separed builds
!          done with different settings. User can safely override BUILDDIR in his bakefiles
      -->
      <template id="wxbase">
--- 75,80 ----
  
  
!     <!-- Combine with 'wx' or 'wx-lib' templates (which are defined in wxpresets)
!          to create a perfectly wx-integrated project.
      -->
      <template id="wxbase">
***************
*** 95,100 ****
          </if>
  
!         <!-- On Unix the m4 macros in wxpresets.m4 will set all the options above -->
      </template>
  
  </makefile>
--- 97,126 ----
          </if>
  
!         <!-- On Unix the m4 macros in wxpresets.m4 will set all the options above.
!              Look into wxpresets.m4 for more info. -->
      </template>
  
+ 
+     <!--
+          Sets the build directory in a common way which makes us possible to keep separed builds
+          done with different settings. User can safely override BUILDDIR in his bakefiles.
+     -->
+     <if cond="TARGETING_WIN32=='1'">
+         <set var="BUILDDIR">
+             $(COMPILER)$(WXLIBPOSTFIX)
+         </set>
+     </if>
+ 
+ 
+     <!-- A simple tag which helps you to define a library name using the same rules used
+          by wxWidgets. -->
+     <define-tag name="wxlike-libname" rules="lib,dll,module">
+         <if cond="TARGETING_WIN32=='1'">
+             <libname>wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</libname>
+         </if>
+         <if cond="TARGETING_WIN32=='0'">
+             <libname>wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</libname>
+         </if>
+     </define-tag>
+ 
  </makefile>

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxlua.bkl	23 Jan 2006 21:20:29 -0000	1.7
--- wxlua.bkl	27 Jan 2006 21:57:07 -0000	1.8
***************
*** 30,53 ****
  
  
-     <!-- some dummy vars so that unused vars are not removed from the output:
-          in fact, we do not use WX_DIR/WX_VERSION/... vars directly in this
-          bakefile and so Bakefile would remove them from the final
-          makefiles but this must be avoid !
-          In fact, the generated makefile would then contain something like:
- 
-     MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
- 	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
- 	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
- 	WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \
- 	USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \
- 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)"
- 
- 
-          where $(WX_DIR), $(WX_VERSION), ... expand to nothing since they are
-          undeclared variables from MAKE's point of view...
- 
-     -->
- 
      <if cond="TARGETING_WIN32=='1'">
          <set var="VARS_DONT_ELIMINATE" append="1">
              WX_DIR WX_VERSION WX_SHARED USE_WXLUASOCKETLIB USE_WXLUADEBUGLIB
--- 30,36 ----
  
  
      <if cond="TARGETING_WIN32=='1'">
+ 
+         <!-- We need to have these variables defined when calling the subproject makefiles ! -->
          <set var="VARS_DONT_ELIMINATE" append="1">
              WX_DIR WX_VERSION WX_SHARED USE_WXLUASOCKETLIB USE_WXLUADEBUGLIB
***************
*** 60,63 ****
--- 43,84 ----
  
      <!-- ================================================================== -->
+     <!--                            AUXILIARY TARGETS                       -->
+     <!-- ================================================================== -->
+ 
+     <if cond="FORMAT!='autoconf'">
+         <set var="WXLUA_BASEDIR">../../..</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'">
+         <!-- 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>
+ 
+     <if cond="TARGETING_IDE=='0'">
+         <if cond="TARGETING_WIN32=='1'">
+             <!-- on linux we don't need this because WXLUA_LIBOUTPUT_PATH == WXLUA_DLLOUTPUT_PATH -->
+             <mkdir id="setuplibdir">
+                 <dependency-of>all</dependency-of>
+                 <dir>$(WXLUA_LIBOUTPUT_PATH)</dir>
+             </mkdir>
+         </if>
+ 
+         <!-- the folders where output will be stored -->
+         <mkdir id="setupdlldir">
+             <dependency-of>all</dependency-of>
+             <dir>$(WXLUA_DLLOUTPUT_PATH)</dir>
+         </mkdir>
+         <mkdir id="setupbindir">
+             <dependency-of>all</dependency-of>
+             <dir>$(WXLUA_BINOUTPUT_PATH)</dir>
+         </mkdir>
+     </if>
+ 
+ 
+     <!-- ================================================================== -->
      <!--                         The utils                                  -->
      <!-- ================================================================== -->
***************
*** 66,70 ****
          <installable>yes</installable>
          <dependency-of>all</dependency-of>
!         <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
      </subproject>
--- 87,91 ----
          <installable>yes</installable>
          <dependency-of>all</dependency-of>
!         <dir>$(WXLUA_BASEDIR)/util/$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
      </subproject>
***************
*** 78,82 ****
          <installable>yes</installable>
          <dependency-of>all</dependency-of>
!         <dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
      </subproject>
--- 99,103 ----
          <installable>yes</installable>
          <dependency-of>all</dependency-of>
!         <dir>$(WXLUA_BASEDIR)/modules/$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
      </subproject>
***************
*** 90,94 ****
          <installable>yes</installable>
          <dependency-of>all</dependency-of>
!         <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
      </subproject>
--- 111,115 ----
          <installable>yes</installable>
          <dependency-of>all</dependency-of>
!         <dir>$(WXLUA_BASEDIR)/apps/$(SUBPROJECT_POSTFIX_PATH)</dir>
          <target/>
      </subproject>
***************
*** 103,115 ****
      </pkgconfig>
  
!     <!--
      <action id="docs">
          <command>@echo =============================================</command>
!         <command>@echo Creating wxArt2d docs using doxygen...       </command>
          <command>@echo =============================================</command>
!         <command>cd ..\..\doc</command>
!         <command>doxygen doxygen.inc</command>
      </action>
-     -->
  
  </makefile>
--- 124,146 ----
      </pkgconfig>
  
!     <!-- This is not an 'all' dependency; it's a separed target to be called explicitely -->
      <action id="docs">
          <command>@echo =============================================</command>
!         <command>@echo Creating wxLua documentation using doxygen...</command>
          <command>@echo =============================================</command>
! 
!         <if cond="TARGETING_WIN32=='1'">
!             <command>cd $(WXLUA_BASEDIR)\docs</command>
!             <command>doxygen doxygen.cfg</command>
!         </if>
!         <if cond="TARGETING_WIN32=='0'">
!             <!--
!                  The DOC tree is not copied by configure when using a
!                  build folder different from the root folder of the project !
!                  Thus we need to build docs directly in the source tree...
!             -->
!             <command>( cd $(top_srcdir)/docs &amp;&amp; doxygen doxygen.cfg )</command>
!         </if>
      </action>
  
  </makefile>