Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 80391 by Arwed von Merkatz for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 80391 by Arwed von Merkatz for review
  • Date: Thu, 8 Jun 2006 20:35:01 +0100 (BST)

Change 80391 by arwed_von_merkatz@arwed-Otherland on 2006/06/08 20:32:58

export WX_CONTRIB and persistent_read it instead of just sourcing a
foreign
config file in wxpython, removed swig option as it doesn't work

Affected files ...

... //sgl/grimoires/test/x11-toolkits/wxgtk/EXPORTS#1 branch
... //sgl/grimoires/test/x11-toolkits/wxgtk/HISTORY#26 integrate
... //sgl/grimoires/test/x11-toolkits/wxgtk/REPAIR^none^EXPORTS#1 branch
... //sgl/grimoires/test/x11-toolkits/wxpython/BUILD#4 integrate
... //sgl/grimoires/test/x11-toolkits/wxpython/DEPENDS#4 integrate
... //sgl/grimoires/test/x11-toolkits/wxpython/HISTORY#8 integrate

Differences ...

==== //sgl/grimoires/test/x11-toolkits/wxgtk/HISTORY#26 (text) ====

@@ -1,3 +1,7 @@
+2006-06-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * EXPORTS, REPAIR^none^EXPORTS: export the WX_CONTRIB variable, needed
+ by wxpython
+
2006-05-24 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: use -2 in patchfile name, rather than $PATCHLEVEL


==== //sgl/grimoires/test/x11-toolkits/wxpython/BUILD#4 (xtext) ====

@@ -1,10 +1,10 @@
-source $DEPENDS_CONFIG/wxgtk.p &&
+persistent_read wxgtk WX_CONTRIB WX_CONTRIB &&

PYOPTS='MONOLITHIC=0 UNICODE=1' &&
for COMPONENT in $WX_CONTRIB; do
PYOPTS="$PYOPTS BUILD_$(echo $COMPONENT | tr '[:lower:]' '[:upper:]')=1"
done &&
-if echo $OPTS | grep -q with-swig; then PYOPTS="$PYOPTS USE_SWIG=1"; fi &&
+#if echo $OPTS | grep -q with-swig; then PYOPTS="$PYOPTS USE_SWIG=1"; fi &&

cd wxPython &&
python setup.py $PYOPTS build

==== //sgl/grimoires/test/x11-toolkits/wxpython/DEPENDS#4 (xtext) ====

@@ -1,10 +1,10 @@
depends python &&
-# TODO need subdepends on Python bindings of libxml2 here
-depends libxml2 &&
-depends wxgtk &&
+depends -sub python libxml2 &&
+depends wxgtk

+# disabled, doesn't work with swig 1.3.28
# SWIG option is fake and is only used in our BUILD file
-optional_depends swig \
- '--with-swig' \
- '' \
- 'to regenerate wrappers from SWIG descriptors'
+#optional_depends swig \
+# '--with-swig' \
+# '' \
+# 'to regenerate wrappers from SWIG descriptors'

==== //sgl/grimoires/test/x11-toolkits/wxpython/HISTORY#8 (text) ====

@@ -1,3 +1,9 @@
+2006-06-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: use persistent_read instad of sourcing the wxgtk.p file
+ * DEPENDS: added sub_depends on libxml2 python bindings
+ * BUILD, DEPENDS: commented the swig option as it's broken with swig
+ 1.3.28
+
2006-04-13 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 2.6.3.2




  • [SM-Commit] PERFORCE change 80391 by Arwed von Merkatz for review, Perforce Review Daemon, 06/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page