X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..a8cb1a4947bbbf5e18ce52448f4c3bb4cff4daee:/wxPython/b?ds=inline diff --git a/wxPython/b b/wxPython/b index b66448d124..ffa2477fb1 100755 --- a/wxPython/b +++ b/wxPython/b @@ -1,4 +1,11 @@ -#!/bin/sh +#!/bin/bash + +# Are we using bash on win32? If so source that file and then exit. +if [ "$OSTYPE" = "cygwin" ]; then + source b.win32 + exit +fi + function getpyver { if [ "$1" = "15" ]; then @@ -11,6 +18,8 @@ function getpyver { PYVER=2.2 elif [ "$1" = "23" ]; then PYVER=2.3 + elif [ "$1" = "24" ]; then + PYVER=2.4 else echo You must specify Python version as first parameter. exit @@ -24,8 +33,22 @@ python$PYVER -c "import sys;print '\n', sys.version, '\n'" SETUP="python$PYVER -u setup.py" -FLAGS="USE_SWIG=1 IN_CVS_TREE=1" # BUILD_GLCANVAS=0" +FLAGS="USE_SWIG=1 SWIG=/opt/swig/bin/swig" OTHERFLAGS="" +PORTFLAGS="" + + + +if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then + PORTFLAGS="WXPORT=gtk UNICODE=0" + shift +elif [ "$1" = "gtk2" ]; then + PORTFLAGS="WXPORT=gtk2 UNICODE=1" + shift +fi + +FLAGS="$FLAGS $PORTFLAGS" + @@ -33,17 +56,16 @@ OTHERFLAGS="" if [ "$1" = "c" ]; then shift CMD="$SETUP $FLAGS $OTHERFLAGS clean $*" - OTHERCMD="rm -f wxPython/*.so" + OTHERCMD="rm -f wx/*.so" # "d" --> clean extension modules only elif [ "$1" = "d" ]; then shift - CMD="rm -f wxPython/*.so" + CMD="rm -f wx/*.so" # "t" --> touch *.i files elif [ "$1" = "t" ]; then shift - #CMD="set CMD=touch src\*.i; touch contrib\glcanvas\*.i; touch contrib\ogl\*.i; touch contrib\stc\*.i" CMD='find . -name "*.i" | xargs touch' # "i" --> install @@ -114,10 +136,12 @@ fi echo $CMD eval $CMD +RC=$? - -if [ "$OTHERCMD" != "" ]; then +if [ "$RC" = "0" -a "$OTHERCMD" != "" ]; then echo $OTHERCMD $OTHERCMD + RC=$? fi +exit $RC