Update of /cvsroot/wxlua/wxLua/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32251/build/bakefiles
Modified Files:
wxlua.bkl
Added Files:
options.bkl wxhacks.bkl
Log Message:
fixed install/uninstall under linux
--- NEW FILE: options.bkl ---
<?xml version="1.0" ?>
<!-- Author: Francesco Montorsi <fr...@us...> -->
<!-- RCS-ID: $Id: options.bkl,v 1.1 2006/01/23 21:20:29 frm Exp $ -->
<!-- ====================================================================== -->
<!-- WXLUA GLOBAL OPTIONS BAKEFILE -->
<!-- ====================================================================== -->
<makefile>
<!-- ================================================================== -->
<!-- The list of wxLua global OPTIONS DEFAULTS -->
<!-- ================================================================== -->
<set var="USE_UTIL_DEFAULT">1</set>
<set var="USE_APPS_DEFAULT">1</set>
<!-- ================================================================== -->
<!-- The list of wxLua global OPTIONS -->
<!-- ================================================================== -->
<!-- options not tied to a specific module -->
<if cond="TARGETING_IDE=='0'">
<option name="USE_UTIL">
<values>0,1</values>
<default-value>$(USE_UTIL_DEFAULT)</default-value>
<description>Should the wxLua utilities should be compiled ?</description>
</option>
<option name="USE_APPS">
<values>0,1</values>
<default-value>$(USE_APPS_DEFAULT)</default-value>
<description>Should the wxLua applications be compiled ?</description>
</option>
</if>
<if cond="TARGETING_IDE=='1'">
<!-- IDEs are less flexible; we have to set these as variables with the default
values -->
<set var="USE_UTIL">$(USE_UTIL_DEFAULT)</set>
<set var="USE_APPS">$(USE_APPS_DEFAULT)</set>
</if>
</makefile>
--- NEW FILE: wxhacks.bkl ---
<?xml version="1.0" ?>
<!-- Created by: Francesco Montorsi <fr...@us...> -->
<!-- Creation date: 29/10/2005 -->
<!-- RCS-ID: $Id: wxhacks.bkl,v 1.1 2006/01/23 21:20:29 frm Exp $ -->
<makefile>
<requires version="0.2.0"/>
<!-- -->
<!-- WXPRESETS HACKS: provide a uniform and flexible build system -->
<!-- based over the WX_* options on Windows and over wx-config on -->
<!-- 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 -->
<include file="presets/wx.bkl" once="1"/>
<!-- A simple variable used to understand if we are -->
<!-- creating a makefile for a Win32 target or a more -->
<!-- generic linux/GNU-based system. -->
<set var="TARGETING_WIN32">
<if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if>
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if>
</set>
<set var="TARGETING_UNIX">
<if cond="FORMAT=='autoconf' or FORMAT=='gnu'">1</if>
<if cond="FORMAT!='autoconf' and FORMAT!='gnu'">0</if>
</set>
<set var="TARGETING_IDE">
<if cond="FORMAT=='msvc6prj' or FORMAT=='cbuilderx'">1</if>
<if cond="FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">0</if>
</set>
<set var="TARGETING_MAKEFILE">
<if cond="FORMAT=='msvc6prj' or FORMAT=='cbuilderx'">0</if>
<if cond="FORMAT!='msvc6prj' and FORMAT!='cbuilderx'">1</if>
</set>
<if cond="TARGETING_WIN32=='0'">
<set var="WX_SHAREDDEFINE"/>
<set var="WXLIBPOSTFIX"></set>
<set var="WX3RDPARTLIBPOSTFIX"></set>
<!--
These options definitions are missing from wx_unix.bkl for all UNIX formats;
for more info about this see:
http://sourceforge.net/tracker/index.php?func=detail&aid=1254557&group_id=9863&atid=309863
wxCode bakefiles don't use its own options (BUILD,UNICODE,SHARED) and then sets WX_* options from
their values; since wxCode components are "wx addons" we will use directly the WX_* options.
Thus we need them also on Unix formats and thus we declare them here.
All these options are set (for 'autoconf' format) by the AM_WXPRESETS macro
(see wxpresets.m4 and wxcode.m4 macro files).
-->
<option name="WX_DEBUG"/>
<option name="WX_UNICODE"/>
<option name="WX_SHARED"/>
<option name="WX_DIR"/>
<option name="WX_VERSION"/>
<option name="WX_PORT"/>
</if>
<if cond="TARGETING_WIN32=='1'">
<set var="WX_PORT">$(WXPORT)</set>
</if>
<!--
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">
<if cond="TARGETING_WIN32=='1'">
<!-- WXSHARED-dependent -->
<define>
$(substituteFromDict(WX_SHARED,{'1':'WXUSINGDLL','0':''}))
</define>
<!-- WX_DEBUG-dependent -->
<warnings>
$(substituteFromDict(WX_DEBUG,{'1':'max','0':'no'}))
</warnings>
<optimize>
$(substituteFromDict(WX_DEBUG,{'1':'off','0':'speed'}))
</optimize>
<debug-info>
$(substituteFromDict(WX_DEBUG,{'1':'on','0':'off'}))
</debug-info>
</if>
<!-- On Unix the m4 macros in wxpresets.m4 will set all the options above -->
</template>
</makefile>
Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxlua.bkl 23 Jan 2006 19:38:29 -0000 1.6
--- wxlua.bkl 23 Jan 2006 21:20:29 -0000 1.7
***************
*** 64,67 ****
--- 64,68 ----
<subproject id="utils" cond="USE_UTIL=='1'">
+ <installable>yes</installable>
<dependency-of>all</dependency-of>
<dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
***************
*** 75,78 ****
--- 76,80 ----
<subproject id="modules">
+ <installable>yes</installable>
<dependency-of>all</dependency-of>
<dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
***************
*** 86,89 ****
--- 88,92 ----
<subproject id="apps" cond="USE_APPS=='1'">
+ <installable>yes</installable>
<dependency-of>all</dependency-of>
<dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir>
|
