more consistent naming

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

diff --git a/wxPython/distrib/all/build-osx b/wxPython/distrib/all/build-osx
index 04eff1e0163c7958b312897cf6195bb801f7e3da..932ca40c11382f8870d51295625e6c9c59fb24d7 100755 (executable)
--- a/wxPython/distrib/all/build-osx
+++ b/wxPython/distrib/all/build-osx
@@ -9,7 +9,7 @@
 #    2. the path of where to put the resulting installers
 #    3. skipclean flag (yes|no)
 #    4. the VERSION
-#    5. the FLAVOR (panther or jaguar)
+#    5. the KIND (panther or jaguar)
 #    *. the remaining args are the versions of Python to build for
 #
 # ---------------------------------------------------------------------------
@@ -20,7 +20,7 @@ set -o errexit
 echo "-=-=-=-  Hello from $HOSTNAME  -=-=-=-"
 
 if [ $# -lt 6 ]; then
-    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION FLAVOR PYVER..."
+    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION KIND PYVER..."
     exit 1
 fi
 
@@ -28,26 +28,29 @@ WXDIR=$1
 DESTDIR=$2
 SKIPCLEAN=$3
 VERSION=$4
-FLAVOR=$5
+KIND=$5
 shift;shift;shift;shift;shift
 PYVER=$@
 
 
-export PATH=/sw/bin:$PATH
-
+#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 wxPythonSrc-$VERSION.tar.gz"
+echo "Unarchiving wxPython-src-$VERSION.tar.gz"
 cd $DESTDIR
-tar xzf wxPythonSrc-$VERSION.tar.gz 
-rm wxPythonSrc-$VERSION.tar.gz
+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
-distrib/mac/wxPythonOSX/build $FLAVOR inplace skipclean
+distrib/mac/wxPythonOSX/build $KIND inplace skipclean
 
 
 echo "Copying installers to $DESTDIR..."
@@ -58,8 +61,8 @@ cd $DESTDIR
 if [ $SKIPCLEAN != yes ]; then 
     echo "Cleaning up..."
     rm -r $WXDIR || true
-    rm wxPythonDocs-$VERSION.tar.gz
-    rm wxPythonDemo-$VERSION.tar.gz
+    rm wxPython-docs-$VERSION.tar.gz
+    rm wxPython-demo-$VERSION.tar.gz
 fi
 
 echo "-=-=-=-  Goodbye!  -=-=-=-"