X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf158fe6c6e0e8c4879c6ac45ba47e8eaacce128..f5ed42f875325bbadce5e43fe7131e295724359d:/wxPython/distrib/all/build-osx

diff --git a/wxPython/distrib/all/build-osx b/wxPython/distrib/all/build-osx
index 1e667e335c..b31c82c461 100755
--- a/wxPython/distrib/all/build-osx
+++ b/wxPython/distrib/all/build-osx
@@ -3,23 +3,30 @@
 
 set -o errexit
 
-# read the config variables from the file given on the command line
-# . $1
-
-
 host=$1
-flavor=$2
-pyver=$3
+pyver=$2
+chartype=$3
+flags=$4
+
 
 if [ $skiposx != yes ]; then
     # test if the target machine is online
     if ping -q -c1 -w1 $host > /dev/null; then
-	echo " The $host machine is online, OSX-$flavor build continuing..."
+	echo "The $host machine is online, OSX build continuing..."
     else
-	echo "The $host machine is **OFFLINE**, skipping the OSX-$flavor build."
+	echo "The $host machine is **OFFLINE**, skipping the OSX build."
+	exit 0
+    fi
+
+    if [ $chartype == ansi -a $buildansi == no ]; then
+	echo "Skipping ansi-only build host"
 	exit 0
     fi
 
+    if [ $chartype == both -a $buildansi == no ]; then
+	chartype=unicode
+    fi
+
     echo "Copying source files and build script..."
     ssh root@$host "mkdir -p $OSX_BUILD && rm -rf $OSX_BUILD/* || true"
     
@@ -32,7 +39,7 @@ if [ $skiposx != yes ]; then
     echo "Running build script on $host..."
     wxdir=$OSX_BUILD/wxPython-src-$VERSION
     cmd=./do-build-osx
-    ssh root@$host "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $flavor $pyver && rm $cmd"
+    ssh root@$host "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $pyver $chartype $flags && rm $cmd"
     
     echo "Fetching the results..."
     scp "root@$host:$OSX_BUILD/wxPython*-osx*"  $STAGING_DIR