Francesco's wxpresets patch
Francesco Montorsi
f18m_cpp217828 at yahoo.it
Mon Feb 12 11:17:52 PST 2007
Hi Kevin,
I see you've committed the patch (thanks!) but there are few minor det=
ails:
1) the wxwin.m4 part was not committed...
2) now that bakefile 0.2.2 has been released with the "force" attribute =
support for the default values of options, I'm attaching a patch which:
- make bake 0.2.2 required (prev versions had a bug with <define-global-t=
ag>)
- removes the WX_PORT option definition from the top of wx_unix.bkl (it's =
later redefined by 'gnu' format and all option info are useless for the aut=
oconf =
format) - this is just a cosmetic change to make wxpresets more readable ;)
- another cosmetic change: the option defaults like
$(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
for the 'gnu' format are not added anymore to the option's listed value=
s and =
force=3D"1" is instead used to tell bakefile that it's a default which (hop=
efully) =
will evaluate to one of the other allowed (listed) values
Thanks,
Francesco
Kevin Ollivier ha scritto:
> Hi Vadim,
> =
> On Feb 4, 2007, at 5:39 AM, Vadim Zeitlin wrote:
> =
>> On Sun, 04 Feb 2007 10:45:48 +0100 Francesco Montorsi =
>> <f18m_cpp217828 at yahoo.it> wrote:
>>
>> FM> > Any objections to me committing this?
>>
>> What happened with the discussion of GNU format breakage? Has the patch
>> been changed since then to deal better with this?
> =
> Yes, that problem was fixed in the latest version of the patch.
> =
> Regards,
> =
> Kevin
> =
>> Thanks,
>> VZ
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: =
>> wx-dev-unsubscribe at lists.wxwidgets.org
>> For additional commands, e-mail: =
>> wx-dev-help at lists.wxwidgets.org
>>
-------------- next part --------------
Index: build/bakefiles/wxpresets/presets/wx.bkl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/build/bakefiles/wxpresets/pres=
ets/wx.bkl,v
retrieving revision 1.7
diff -u -r1.7 wx.bkl
--- build/bakefiles/wxpresets/presets/wx.bkl 2007/02/05 01:14:59 1.7
+++ build/bakefiles/wxpresets/presets/wx.bkl 2007/02/07 09:59:25
@@ -97,6 +97,9 @@
=
<makefile>
=
+ <requires version=3D"0.2.2"/>
+
+
<!-- this variable identifies the version of the wx presets.
this is changed only when major changes to wxpresets take place. =
-->
<set var=3D"WX_PRESETS_VERSION">4</set>
Index: build/bakefiles/wxpresets/presets/wx_unix.bkl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/build/bakefiles/wxpresets/pres=
ets/wx_unix.bkl,v
retrieving revision 1.9
diff -u -r1.9 wx_unix.bkl
--- build/bakefiles/wxpresets/presets/wx_unix.bkl 2007/02/05 01:14:59 1.9
+++ build/bakefiles/wxpresets/presets/wx_unix.bkl 2007/02/07 10:04:26
@@ -20,24 +20,8 @@
=
<makefile>
=
- <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
- <!-- Options -->
- <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
-
- <!-- on Unix the WX_PORT is not a fixed value but rather an option -->
- <if cond=3D"not isdefined('WX_PORT')">
- <set var=3D"WX_PORT_DEFAULT" overwrite=3D"0">auto</set>
- <option name=3D"WX_PORT">
- <values>auto,gtk1,gtk2,msw,x11,motif,mgl,mac</values>
- <default-value>$(WX_PORT_DEFAULT)</default-value>
- <description>
- Port of the wx library to build against
- </description>
- </option>
- </if>
=
=
-
<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
<!-- Autoconf -->
<!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
@@ -50,8 +34,9 @@
<option name=3D"WX_RESCOMP"/>
<option name=3D"WX_VERSION_MAJOR"/>
<option name=3D"WX_VERSION_MINOR"/>
+ <option name=3D"WX_PORT"/>
=
- <!-- wxpresets.m4 macros will detect all WX_* options defined abov=
e -->
+ <!-- wxwin.m4 macros will detect all WX_* options defined above -->
=
=
<!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib=
tag
@@ -62,7 +47,7 @@
<!-- all wx-dependent libraries should have been already l=
isted
thus we can now add WX_LIBS to the linker line -->
<ldlibs>$(WX_LIBS)</ldlibs>
- </if>
+ </if>
<if cond=3D"value not in ALLLIB_LIST.split()">
<error>Unknown wxWidgets library given in the wx-lib tag</=
error>
</if>
@@ -94,10 +79,8 @@
$(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f=
1)
</set>
<option name=3D"WX_PORT">
- <values>gtk1,gtk2,msw,x11,motif,mgl,mac,$(WX_PORT_DEFAULT)</va=
lues>
- <default-value>
- $(WX_PORT_DEFAULT)
- </default-value>
+ <values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values>
+ <default-value force=3D"1">$(WX_PORT_DEFAULT)</default-value>
<description>
Port of the wx library to build against
</description>
@@ -107,9 +90,9 @@
$(DOLLAR)(shell if test -z `$(WX_CONFIG) --selected-config | c=
ut -d '-' -f 5`; then echo 1; else echo 0; fi)
</set>
<option name=3D"WX_SHARED">
- <values>0,1,$(WX_SHARED_DEFAULT)</values>
- <values-description>Static,DLL,$(WX_SHARED_DEFAULT)</values-de=
scription>
- <default-value>$(WX_SHARED_DEFAULT)</default-value>
+ <values>0,1</values>
+ <values-description>Static,DLL</values-description>
+ <default-value force=3D"1">$(WX_SHARED_DEFAULT)</default-value>
<description>
Use DLL build of wx library to use?
</description>
@@ -119,9 +102,9 @@
$(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f=
2 | sed 's/unicode/1/;s/ansi/0/')
</set>
<option name=3D"WX_UNICODE">
- <values>0,1,$(WX_UNICODE_DEFAULT)</values>
- <values-description>ANSI,Unicode,$(WX_UNICODE_DEFAULT)</values=
-description>
- <default-value>$(WX_UNICODE_DEFAULT)</default-value>
+ <values>0,1</values>
+ <values-description>ANSI,Unicode</values-description>
+ <default-value force=3D"1">$(WX_UNICODE_DEFAULT)</default-valu=
e>
<description>
Compile Unicode build of wxWidgets?
</description>
@@ -131,9 +114,9 @@
$(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f=
3 | sed 's/debug/1/;s/release/0/')
</set>
<option name=3D"WX_DEBUG">
- <values>0,1,$(WX_DEBUG_DEFAULT)</values>
- <values-description>Release,Debug,$(WX_DEBUG_DEFAULT)</values-=
description>
- <default-value>$(WX_DEBUG_DEFAULT)</default-value>
+ <values>0,1</values>
+ <values-description>Release,Debug</values-description>
+ <default-value force=3D"1">$(WX_DEBUG_DEFAULT)</default-value>
<description>
Use debug build of wxWidgets (define __WXDEBUG__)?
</description>
Index: build/bakefiles/wxpresets/presets/wx_win32.bkl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/build/bakefiles/wxpresets/pres=
ets/wx_win32.bkl,v
retrieving revision 1.28
diff -u -r1.28 wx_win32.bkl
--- build/bakefiles/wxpresets/presets/wx_win32.bkl 2007/02/05 01:14:59 1.28
+++ build/bakefiles/wxpresets/presets/wx_win32.bkl 2007/02/07 09:59:10
@@ -12,7 +12,6 @@
=
<makefile>
=
- <requires version=3D"0.2.1"/>
=
<!-- OPTIONS -->
<!-- -->
More information about the wx-dev
mailing list