Remember the version selected and allow require to be called again as

[wxWidgets.git] / wxPython / distrib / all / build-osx

diff --git a/wxPython/distrib/all/build-osx b/wxPython/distrib/all/build-osx
index f34a0df5380e299d67f7ed9d10fd38291a749e67..91e56e72ebad4ba8c4cdbcf7ba3165613edae9e4 100755 (executable)
--- a/wxPython/distrib/all/build-osx
+++ b/wxPython/distrib/all/build-osx
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ---------------------------------------------------------------------------
 #!/bin/bash
 # ---------------------------------------------------------------------------

-# Build wxWidgets and wxPython on a OSX (Panther) box.  This is normally 
+# Build wxWidgets and wxPython on a OSX box.  This is normally 

 # called from build-all but it should be able to be used standalone too...
 # 
 # The command line must have the following parameters:
 # called from build-all but it should be able to be used standalone too...
 # 
 # The command line must have the following parameters:


@@ -9,7 +9,8 @@
 #    2. the path of where to put the resulting installers
 #    3. skipclean flag (yes|no)
 #    4. the VERSION
 #    2. the path of where to put the resulting installers
 #    3. skipclean flag (yes|no)
 #    4. the VERSION

-#    5. the remaining args are the versions of Python to build for
+#    5. the KIND (panther or jaguar)
+#    *. the remaining args are the versions of Python to build for

 #
 # ---------------------------------------------------------------------------
 
 #
 # ---------------------------------------------------------------------------
 


@@ -18,8 +19,8 @@ set -o errexit
 
 echo "-=-=-=-  Hello from $HOSTNAME  -=-=-=-"
 
 
 echo "-=-=-=-  Hello from $HOSTNAME  -=-=-=-"
 

-if [ $# -lt 5 ]; then
-    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION PYVER..."
+if [ $# -lt 6 ]; then
+    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION KIND PYVER..."

     exit 1
 fi
 
     exit 1
 fi
 


@@ -27,14 +28,32 @@ WXDIR=$1
 DESTDIR=$2
 SKIPCLEAN=$3
 VERSION=$4
 DESTDIR=$2
 SKIPCLEAN=$3
 VERSION=$4

-shift;shift;shift;shift
+KIND=$5
+shift;shift;shift;shift;shift

 PYVER=$@
 
 PYVER=$@
 

+
+#export PATH=/sw/bin:/usr/local/bin:$PATH
+export PATH=/sw/bin:/sw/sbin:/bin:/sbin:/usr/bin:/usr/sbin:.:/usr/local/bin:/usr/X11R6/bin
+echo "PATH =" $PATH
+echo "which gcc = " `which gcc`
+#exit 0
+
+# untar the source 
+echo "Unarchiving wxPython-src-$VERSION.tar.gz"
+cd $DESTDIR
+tar xzf wxPython-src-$VERSION.tar.gz 
+rm wxPython-src-$VERSION.tar.gz
+
+

 echo "Invoking wxPythonOSX build script..."
 cd $WXDIR/wxPython
 export TARBALLDIR=$DESTDIR
 mkdir -p dist
 echo "Invoking wxPythonOSX build script..."
 cd $WXDIR/wxPython
 export TARBALLDIR=$DESTDIR
 mkdir -p dist

-distrib/mac/wxPythonOSX/build panther inplace skipclean
+if [ $KIND = panther ]; then
+    distrib/mac/wxPythonOSX/build $KIND inplace unicode
+fi
+distrib/mac/wxPythonOSX/build $KIND inplace 

 
 
 echo "Copying installers to $DESTDIR..."
 
 
 echo "Copying installers to $DESTDIR..."


@@ -45,6 +64,8 @@ cd $DESTDIR
 if [ $SKIPCLEAN != yes ]; then 
     echo "Cleaning up..."
     rm -r $WXDIR || true
 if [ $SKIPCLEAN != yes ]; then 
     echo "Cleaning up..."
     rm -r $WXDIR || true

+    rm wxPython-docs-$VERSION.tar.gz
+    rm wxPython-demo-$VERSION.tar.gz

 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"
 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"