Menu
▾
▴
[Wxdevcenter-cvs] StdPlugin/build install.bkl,1.1,1.2 wx.bkl,1.2,1.3 StdPlugin.bkl,1.2,1.3
|
From: Emilien K. <cur...@us...> - 2005-08-22 17:52:30
|
Update of /cvsroot/wxdevcenter/StdPlugin/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9144/build Modified Files: install.bkl wx.bkl StdPlugin.bkl Log Message: Error in bakefiles. protect file names containing spaces with ". Index: wx.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/wx.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wx.bkl 14 May 2005 12:45:32 -0000 1.2 --- wx.bkl 22 Aug 2005 17:52:23 -0000 1.3 *************** *** 9,13 **** <values>0,1</values> <values-description>LIB,DLL</values-description> ! <default-value>0</default-value> <description> What type of library to build ? --- 9,13 ---- <values>0,1</values> <values-description>LIB,DLL</values-description> ! <default-value>1</default-value> <description> What type of library to build ? *************** *** 29,33 **** <values>debug,release</values> <values-description>Debug,Release</values-description> ! <default-value>debug</default-value> <description> Type of compiled binaries. --- 29,33 ---- <values>debug,release</values> <values-description>Debug,Release</values-description> ! <default-value>release</default-value> <description> Type of compiled binaries. *************** *** 39,43 **** <values>25, 26</values> <values-description>wx2.5.x, wx2.6.x</values-description> ! <default-value>25</default-value> <description> Version of wxWidgets. --- 39,43 ---- <values>25, 26</values> <values-description>wx2.5.x, wx2.6.x</values-description> ! <default-value>26</default-value> <description> Version of wxWidgets. *************** *** 45,52 **** </option> <!-- wxWidgets port. --> <option name="WXPORTNAME"> ! <values>msw,gtk,x11,mac,os2</values> ! <default-value>msw</default-value> <description>Port to use for wxWidgets library.</description> </option> --- 45,60 ---- </option> + + <set var="WXPORTNAME_DEFAULT"> + <if cond="PLATFORM_WIN32=='1'">msw</if> + <if cond="PLATFORM_UNIX=='1'">gtk2</if> + <if cond="PLATFORM_MAC=='1'">mac</if> + <if cond="PLATFORM_OS2=='1'">os2</if> + </set> + <!-- wxWidgets port. --> <option name="WXPORTNAME"> ! <values>msw,gtk,gtk2,x11,mac,os2</values> ! <default-value>$(WXPORTNAME_DEFAULT)</default-value> <description>Port to use for wxWidgets library.</description> </option> *************** *** 106,112 **** <set var="WXDEF_PLATEFORM"> <if cond="PLATFORM_WIN32=='1'">__WINDOWS__</if> ! <if cond="PLATFORM_UNIX=='1'">__UNIX_LIKE__</if> <if cond="PLATFORM_MAC=='1'">__WXMAC__ </if> ! <if cond="PLATFORM_OS2=='1'">__WXOS2__ </if> </set> --- 114,126 ---- <set var="WXDEF_PLATEFORM"> <if cond="PLATFORM_WIN32=='1'">__WINDOWS__</if> ! <!-- <if cond="PLATFORM_UNIX=='1'">__UNIX_LIKE__</if> <if cond="PLATFORM_MAC=='1'">__WXMAC__ </if> ! <if cond="PLATFORM_OS2=='1'">__WXOS2__ </if>--> ! </set> ! ! ! <set var="TARGETING_WIN32"> ! <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if> ! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if> </set> *************** *** 122,142 **** <set var="WXVERSIONTAG"> ! <if cond="WXVER=='25'">25</if> ! <if cond="WXVER=='26'">26</if> ! </set> ! ! <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="WXNAMEPREFIX"> <if cond="TARGETING_WIN32=='1'">wxbase$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> ! <if cond="TARGETING_WIN32=='0'">wx_base</if> </set> <set var="WXNAMEPREFIXGUI"> <if cond="TARGETING_WIN32=='1'">wx$(WXPORTNAME)$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> ! <if cond="TARGETING_WIN32=='0'">wx_$(WXPORTNAME)</if> </set> --- 136,153 ---- <set var="WXVERSIONTAG"> ! <if cond="TARGETING_WIN32=='1' and WXVER=='25'">25</if> ! <if cond="TARGETING_WIN32=='1' and WXVER=='26'">26</if> ! <if cond="TARGETING_WIN32=='0' and WXVER=='25'">2.5</if> ! <if cond="TARGETING_WIN32=='0' and WXVER=='26'">2.6</if> </set> <set var="WXNAMEPREFIX"> <if cond="TARGETING_WIN32=='1'">wxbase$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> ! <if cond="TARGETING_WIN32=='0'">wx_base$(WXLIBPOSTFIX)</if> </set> <set var="WXNAMEPREFIXGUI"> <if cond="TARGETING_WIN32=='1'">wx$(WXPORTNAME)$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> ! <if cond="TARGETING_WIN32=='0'">wx_$(WXPORTNAME)$(WXLIBPOSTFIX)</if> </set> *************** *** 150,154 **** </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>lib$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> </if> </define-tag> --- 161,165 ---- </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>$(WXNAMEPREFIX)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> *************** *** 160,164 **** </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>lib$(WXNAMEPREFIX)_$(value)$(WXVERSIONTAG)</sys-lib> </if> </define-tag> --- 171,175 ---- </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>$(WXNAMEPREFIX)_$(value)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> *************** *** 170,174 **** </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>lib$(WXNAMEPREFIXGUI)_$(value)$(WXVERSIONTAG)</sys-lib> </if> </define-tag> --- 181,185 ---- </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>$(WXNAMEPREFIXGUI)_$(value)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> *************** *** 180,184 **** </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>lib$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> <!-- Already in wxlib. --> </if> </define-tag> --- 191,195 ---- </if> <if cond="TARGETING_WIN32=='0'"> ! <sys-lib>$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> <!-- Already in wxlib. --> </if> </define-tag> *************** *** 201,204 **** --- 212,221 ---- <define>$(WXUSINGDLL)</define> <define>$(WXDEF_PLATEFORM)</define> + <if cond="PLATFORM_UNIX=='1'"> + <cppflags>`wx-config --cppflags`</cppflags> + </if> + <if cond="PLATFORM_UNIX=='1'"> + <ldflags>`wx-config --libs`</ldflags> + </if> </template> Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/install.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install.bkl 25 Apr 2005 15:40:14 -0000 1.1 --- install.bkl 22 Aug 2005 17:52:23 -0000 1.2 *************** *** 52,56 **** </data-files-tree> ! <!-- Install data. --> <data-files-tree > <srcdir>conf</srcdir> --- 52,75 ---- </data-files-tree> ! <!-- Install feature descriptor. --> ! <data-files-tree > ! <srcdir>features</srcdir> ! <install-to>$(DATADIR)/wxDevCenter/features</install-to> ! <files> ! StdPlugin/feature.xml ! </files> ! </data-files-tree> ! ! <!-- Install plugin descriptors. --> ! <data-files-tree > ! <srcdir>plugins</srcdir> ! <install-to>$(DATADIR)/wxDevCenter/plugins</install-to> ! <files> ! StdPlugin.Bitmap/plugin.xml ! StdPlugin.Text/plugin.xml ! </files> ! </data-files-tree> ! ! <!-- Install config. --> <data-files-tree > <srcdir>conf</srcdir> *************** *** 69,76 **** Text/Batch.conf Text/Bullant.conf ! Text/CLW no case.conf Text/CLW.conf Text/Config.conf ! Text/CPP no case.conf Text/CPP.conf Text/CSS.conf --- 88,95 ---- Text/Batch.conf Text/Bullant.conf ! "Text/CLW no case.conf" Text/CLW.conf Text/Config.conf ! "Text/CPP no case.conf" Text/CPP.conf Text/CSS.conf *************** *** 97,101 **** Text/MMIXAL.conf Text/MS-SQL.conf ! Text/NN Cron Table.conf Text/NSIS.conf Text/Octave.conf --- 116,120 ---- Text/MMIXAL.conf Text/MS-SQL.conf ! "Text/NN Cron Table.conf" Text/NSIS.conf Text/Octave.conf *************** *** 104,108 **** Text/PHP.conf Text/POV.conf ! Text/Power Basic.conf Text/Properties.conf Text/PS.conf --- 123,127 ---- Text/PHP.conf Text/POV.conf ! "Text/Power Basic.conf" Text/Properties.conf Text/PS.conf *************** *** 116,121 **** Text/Text.conf Text/Verilog.conf ! Text/Visual Basic Script.conf ! Text/Visual Basic.conf Text/XCode.conf Text/XML.conf --- 135,140 ---- Text/Text.conf Text/Verilog.conf ! "Text/Visual Basic Script.conf" ! "Text/Visual Basic.conf" Text/XCode.conf Text/XML.conf Index: StdPlugin.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/StdPlugin.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StdPlugin.bkl 14 May 2005 12:45:29 -0000 1.2 --- StdPlugin.bkl 22 Aug 2005 17:52:23 -0000 1.3 *************** *** 4,8 **** <set var="BUILDDIR">./build/$(BUILD)</set> ! <option name="WXDCINCLUDE"> --- 4,9 ---- <set var="BUILDDIR">./build/$(BUILD)</set> ! ! <set var="STDPLUGIN_VERSION">0.3.0</set> <option name="WXDCINCLUDE"> *************** *** 12,28 **** <option name="WXDCLIB"> <description>Additional path to find wxDevCenter include directory.</description> ! <values>../wxDevCenter/bin</values> ! </option> ! <option name="EXPORTBIN"> ! <description>Additional path prefix to export plugins.</description> ! <values>../wxDevCenter, .</values> ! <default-value>.</default-value> </option> - <dll id="Text" template="wxDLL"> ! <libname>StdPlugin.Text$(SUFFIX)</libname> ! <dirname>$(EXPORTBIN)/plugins/StdPlugin.Text</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> --- 13,23 ---- <option name="WXDCLIB"> <description>Additional path to find wxDevCenter include directory.</description> ! <values>../wxDevCenter/lib</values> </option> <dll id="Text" template="wxDLL"> ! <libname>Text-$(STDPLUGIN_VERSION)</libname> ! <dirname>./plugins/StdPlugin.Text</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> *************** *** 36,39 **** --- 31,35 ---- <wxlib-gui>adv</wxlib-gui> <wxlib-gui>stc</wxlib-gui> + <lib-path>$(WXDCLIB)</lib-path> <sys-lib>wxDevCenterLib</sys-lib> *************** *** 43,48 **** <dll id="Bitmap" template="wxDLL"> ! <libname>StdPlugin.Bitmap$(SUFFIX)</libname> ! <dirname>$(EXPORTBIN)/plugins/StdPlugin.Bitmap</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> --- 39,44 ---- <dll id="Bitmap" template="wxDLL"> ! <libname>Bitmap-$(STDPLUGIN_VERSION)</libname> ! <dirname>./plugins/StdPlugin.Bitmap</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> *************** *** 51,55 **** src/BitmapDocView.cpp src/Controls.cpp ! src/extMouse.cpp </sources> --- 47,51 ---- src/BitmapDocView.cpp src/Controls.cpp ! src/extmouse.cpp </sources> *************** *** 57,60 **** --- 53,57 ---- <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> + <lib-path>$(WXDCLIB)</lib-path> <sys-lib>wxDevCenterLib</sys-lib> |
