ignore warning 4535 for VC8 too as it still seems to be harmless

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

diff --git a/wxPython/distrib/all/build-osx b/wxPython/distrib/all/build-osx
index 3bbb287c2688b4cf338c104f47037c60f68b599c..b31c82c46105c9d759137ec041f753b6f23be5e3 100755 (executable)
--- a/wxPython/distrib/all/build-osx
+++ b/wxPython/distrib/all/build-osx
@@ -3,38 +3,49 @@
 
 set -o errexit
 
-# read the config variables from the file given on the command line
-. $1
+host=$1
+pyver=$2
+chartype=$3
+flags=$4
 
 
-host=$2
-flavor=$3
-
 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"
     
-    scp $STAGING_DIR/wxPython-src-$VERSION.tar.gz \
-       $STAGING_DIR/wxPython-docs-$VERSION.tar.gz \
-       $STAGING_DIR/wxPython-demo-$VERSION.tar.gz \
+    scp $STAGING_DIR/wxPython-src-$VERSION.tar.bz2 \
+       $STAGING_DIR/wxPython-docs-$VERSION.tar.bz2 \
+       $STAGING_DIR/wxPython-demo-$VERSION.tar.bz2 \
        distrib/all/do-build-osx \
        root@$host:$OSX_BUILD
 
     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
     ssh root@$host "rm $OSX_BUILD/wxPython*-osx*"
+
+    echo "Done!"
+    sleep 1
 fi