[Wxlua-commit] wxLua/apps/build/bakefiles apps.bkl,1.6,1.7 options.bkl,1.1,1.2 sources.bkl,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	apps.bkl options.bkl sources.bkl 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/options.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** options.bkl	12 Jun 2005 21:21:10 -0000	1.1
--- options.bkl	24 Nov 2005 21:34:16 -0000	1.2
***************
*** 5,25 ****
  
  
! <!--                                                                -->
! <!--                   WXLUA-APPS OPTIONS BAKEFILE                  -->
! <!--                                                                -->
! <makefile>  
  
!     <!--                                                                     -->
!     <!--                The list of wxLua OPTIONS DEFAULTS                   -->
!     <!--                                                                     -->
  
!     
!     
!     
  
-     <!--                                                                     -->
-     <!--                        The list of wxArt2d OPTIONS                  -->
-     <!--                                                                     -->
  
-     
  </makefile>
--- 5,52 ----
  
  
! <!-- ====================================================================== -->
! <!--                   WXLUA-APPS OPTIONS BAKEFILE                          -->
! <!-- ====================================================================== -->
  
! <makefile>
  
!     <!-- ================================================================== -->
!     <!--                The list of wxLua App OPTIONS DEFAULTS              -->
!     <!-- ================================================================== -->
! 
!     <!-- module enable/disable option defaults -->
!     <set var="USE_WXLUAAPP_DEFAULT">1</set>
!     <set var="USE_WXLUAEDITAPP_DEFAULT">0</set>
! 
! 
!     <!-- ================================================================== -->
!     <!--                        The list of wxLua App OPTIONS               -->
!     <!-- ================================================================== -->
! 
!     <!-- module enable/disable options -->
!     <if cond="TARGETING_IDE=='0'">
!         <option name="USE_WXLUAAPP">
!             <values>0,1</values>
!             <default-value>$(USE_WXLUAAPP_DEFAULT)</default-value>
!             <description>Compile the wxLua app ?</description>
!         </option>
! 
!         <option name="USE_WXLUAEDITAPP">
!             <values>0,1</values>
!             <default-value>$(USE_WXLUAEDITAPP_DEFAULT)</default-value>
!             <description>Compile the wxLuaEditor app ?</description>
!         </option>
! 
!     </if>
!     <if cond="TARGETING_IDE=='1'">
! 
!         <!-- here we are forced to use all '1' because otherwise Bakefile would simply
!              skip some target and do not generate DSP files for that one.
!              We don't want this: we want to generate DSP for all modules: the choice
!              of the modules to compile will be left to the user... -->
!         <set var="USE_WXLUAAPP">1</set>
!         <set var="USE_WXLUAEDITAPP">1</set>
!     </if>
  
  
  </makefile>

Index: sources.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/sources.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sources.bkl	12 Jun 2005 21:21:10 -0000	1.1
--- sources.bkl	24 Nov 2005 21:34:16 -0000	1.2
***************
*** 4,23 ****
  <!-- RCS-ID: $Id$      -->
  
! <!--                                                                -->
! <!--                    WXLUA APPS SOURCES BAKEFILE                 -->
! <!--                                                                -->
  
! <makefile>  
  
!     <set var="WXLUA_SRC">
          wxlua/src/wxlua.cpp
          wxlua/src/lconsole.cpp
      </set>
!     <set var="WXLUA_HDR">
!         wxlua/include/editor.h
!         wxlua/include/lconsole.h
!         wxlua/include/wxlua.h
      </set>
  
-     
  </makefile>
--- 4,39 ----
  <!-- RCS-ID: $Id$      -->
  
! <!-- ====================================================================== -->
! <!--                    WXLUA APPS SOURCES BAKEFILE                         -->
! <!-- ====================================================================== -->
  
! <makefile>
  
!     <!-- ================================================================== -->
!     <!-- wxLua App : wxLua/apps/wxlua                                       -->
!     <!-- ================================================================== -->
! 
!     <set var="WXLUAAPP_SRC">
          wxlua/src/wxlua.cpp
          wxlua/src/lconsole.cpp
      </set>
!     <set var="WXLUAAPP_HDR">
!         wxlua/src/editor.h
!         wxlua/src/lconsole.h
!         wxlua/src/wxlua.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxLuaEditor App : wxLua/apps/wxluaedit                             -->
!     <!-- ================================================================== -->
! 
!     <set var="WXLUAEDITAPP_SRC">
!         wxluaedit/src/wxledit.cpp
!         wxluaedit/src/wxluaedit.cpp
!     </set>
!     <set var="WXLUAEDITAPP_HDR">
!         wxluaedit/src/wxledit.h
      </set>
  
  </makefile>

Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** apps.bkl	23 Nov 2005 20:33:14 -0000	1.6
--- apps.bkl	24 Nov 2005 21:34:16 -0000	1.7
***************
*** 4,16 ****
  <!-- RCS-ID: $Id$      -->
  
! <!--                                                                -->
! <!--                    WXLUA APPS BAKEFILE                         -->
! <!--                                                                -->
  
! <makefile>  
  
      <!-- This file contains the wxLua template                    -->
      <include file="../../../build/bakefiles/wxluabase.bkl"/>
  
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
--- 4,20 ----
  <!-- RCS-ID: $Id$      -->
  
! <!-- ====================================================================== -->
! <!--                    WXLUA APPS BAKEFILE                                 -->
! <!-- ====================================================================== -->
  
! <makefile>
  
      <!-- This file contains the wxLua template                    -->
      <include file="../../../build/bakefiles/wxluabase.bkl"/>
  
+     <!-- ================================================================== -->
+     <!--                               VARIABLES                            -->
+     <!-- ================================================================== -->
+ 
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
***************
*** 23,62 ****
          <set var="WXLUA_APPSDIR">.</set>
      </if>
!     
      <!-- Put all the objects files generated by         -->
      <!-- the compilation in a subfolder of BUILD        -->
!     <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if> 
!     
!     <!-- modules-specific options -->
!     <include file="../../../modules/build/bakefiles/options.bkl"/>
!     
      <!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir -->
      <set var="SRCDIR">$(WXLUA_APPSDIR)</set>
      <include file="sources.bkl"/>
!     
!   
!     
!     <!--                                                                     -->
!     <!--                        The WXLUA application target                 -->
!     <!--                                                                     -->
!     <!-- 
!     <action id="wrap">
!         <dependency-of>all</dependency-of>
!         <depends-on-file>..\..\..\bindings\wxwidgets\override.hpp</depends-on-file>
!         <command>..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua</command>
!         <command>copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c</command>
!     </action>
! 	-->
!     	
  	<!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use
  	           as a module target... this would lead to problems when creating global DSW file... -->
!     <exe id="app_wxlua" template="wxlua">
!       <!--  <depends>wrap</depends> -->
!         <sources>$(WXLUA_SRC)</sources>
!         <headers>$(WXLUA_HDR)</headers>        
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
  		<exename>wxlua</exename>
          <win32-res>wxlua/src/wxlua.rc</win32-res>
!         
          <!-- Libraries must be put in the right order ! -->
          <wxlua-lib>wxluadebug</wxlua-lib>
--- 27,67 ----
          <set var="WXLUA_APPSDIR">.</set>
      </if>
! 
      <!-- Put all the objects files generated by         -->
      <!-- the compilation in a subfolder of BUILD        -->
!     <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if>
! 
! 
!     <!-- ================================================================== -->
!     <!--                               SOURCE LIST                          -->
!     <!-- ================================================================== -->
! 
      <!-- all the sources listed into sources.bkl contain path relative to our wxLua\app dir -->
      <set var="SRCDIR">$(WXLUA_APPSDIR)</set>
      <include file="sources.bkl"/>
! 
! 
!     <!-- ================================================================== -->
!     <!--                        The list of wxLua OPTIONS                   -->
!     <!-- ================================================================== -->
! 
!     <!-- apps-specific options -->
!     <include file="options.bkl"/>
!     <!-- <include file="../../../modules/build/bakefiles/options.bkl"/> -->
! 
! 
!     <!-- ================================================================== -->
!     <!--                        The WXLUA application target                -->
!     <!-- ================================================================== -->
! 
  	<!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use
  	           as a module target... this would lead to problems when creating global DSW file... -->
!     <exe id="app_wxlua" template="wxlua" cond="USE_WXLUAAPP=='1'">
!         <sources>$(WXLUAAPP_SRC)</sources>
!         <headers>$(WXLUAAPP_HDR)</headers>
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
  		<exename>wxlua</exename>
          <win32-res>wxlua/src/wxlua.rc</win32-res>
! 
          <!-- Libraries must be put in the right order ! -->
          <wxlua-lib>wxluadebug</wxlua-lib>
***************
*** 67,75 ****
  
          <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>  
          <wx-lib>core</wx-lib>
!         <wx-lib>html</wx-lib>  
!         <wx-lib>media</wx-lib>  
!         <wx-lib>net</wx-lib>  
          <wx-lib>xml</wx-lib>
          <wx-lib>xrc</wx-lib>
--- 72,80 ----
  
          <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>
          <wx-lib>core</wx-lib>
!         <wx-lib>html</wx-lib>
!         <wx-lib>media</wx-lib>
!         <wx-lib>net</wx-lib>
          <wx-lib>xml</wx-lib>
          <wx-lib>xrc</wx-lib>
***************
*** 77,81 ****
          <wx-lib>stc</wx-lib>
      </exe>
!     
!     
  </makefile>
--- 82,116 ----
          <wx-lib>stc</wx-lib>
      </exe>
! 
!     <!-- ================================================================== -->
!     <!--                        The WXLUAEDIT application target            -->
!     <!-- ================================================================== -->
! 
!     <exe id="app_wxluaedit" template="wxlua" cond="USE_WXLUAEDITAPP=='1'">
!         <sources>$(WXLUAEDITAPP_SRC)</sources>
!         <headers>$(WXLUAEDITAPP_HDR)</headers>
!         <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
! 		<exename>wxluaedit</exename>
!         <win32-res>wxlua/src/wxluaedit.rc</win32-res>
! 
!         <!-- Libraries must be put in the right order ! -->
!         <wxlua-lib>wxluadebug</wxlua-lib>
!         <wxlua-lib>wxluasocket</wxlua-lib>
!         <wxlua-lib>wxlua</wxlua-lib>
!         <wxlua-lib>wxbind</wxlua-lib>
!         <wxlua-lib>lua</wxlua-lib>
! 
!         <wx-lib>adv</wx-lib>
!         <wx-lib>base</wx-lib>
!         <wx-lib>core</wx-lib>
!         <wx-lib>html</wx-lib>
!         <wx-lib>media</wx-lib>
!         <wx-lib>net</wx-lib>
!         <wx-lib>xml</wx-lib>
!         <wx-lib>xrc</wx-lib>
! 
!         <wx-lib>stc</wx-lib>
!     </exe>
! 
! 
  </makefile>