projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
document maxLenght and rectBounds ctor parameters; minor cleanup (use \arg, \NULL)
[wxWidgets.git]
/
wxPython
/
b
diff --git
a/wxPython/b
b/wxPython/b
index 588bac838f32197dfadaa2ae42fc83317c630941..78c8654efe031147b5020d3e11519f2416a51505 100755
(executable)
--- a/
wxPython/b
+++ b/
wxPython/b
@@
-6,6
+6,11
@@
if [ "$OSTYPE" = "cygwin" ]; then
exit
fi
exit
fi
+# make it easy to switch versions of SWIG
+if [ "$SWIG" = "" ]; then
+ SWIG=/opt/swig/bin/swig-1.3.29
+fi
+
function getpyver {
if [ "$1" = "15" ]; then
function getpyver {
if [ "$1" = "15" ]; then
@@
-18,6
+23,10
@@
function getpyver {
PYVER=2.2
elif [ "$1" = "23" ]; then
PYVER=2.3
PYVER=2.2
elif [ "$1" = "23" ]; then
PYVER=2.3
+ elif [ "$1" = "24" ]; then
+ PYVER=2.4
+ elif [ "$1" = "25" ]; then
+ PYVER=2.5
else
echo You must specify Python version as first parameter.
exit
else
echo You must specify Python version as first parameter.
exit
@@
-31,22
+40,31
@@
python$PYVER -c "import sys;print '\n', sys.version, '\n'"
SETUP="python$PYVER -u setup.py"
SETUP="python$PYVER -u setup.py"
-FLAGS="USE_SWIG=1 SWIG=
/opt/swig/bin/swig
"
+FLAGS="USE_SWIG=1 SWIG=
$SWIG
"
OTHERFLAGS=""
OTHERFLAGS=""
-PORTFLAGS="WXPORT=gtk2 UNICODE=1"
+PORTFLAGS=""
+UNIFLAG="UNICODE=1"
if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then
if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then
- PORTFLAGS="WXPORT=gtk UNICODE=0"
+ PORTFLAGS="WXPORT=gtk"
+ UNIFLAG="UNICODE=0"
shift
elif [ "$1" = "gtk2" ]; then
shift
elif [ "$1" = "gtk2" ]; then
- PORTFLAGS="WXPORT=gtk2 UNICODE=1"
+ PORTFLAGS="WXPORT=gtk2"
+ UNIFLAG="UNICODE=1"
shift
fi
shift
fi
-FLAGS="$FLAGS $PORTFLAGS"
+for p in $*; do
+ if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then
+ UNIFLAG=""
+ break
+ fi
+done
+FLAGS="$FLAGS $PORTFLAGS $UNIFLAG"