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 04eff1e0163c7958b312897cf6195bb801f7e3da..b31c82c46105c9d759137ec041f753b6f23be5e3 100755 (executable)
--- a/wxPython/distrib/all/build-osx
+++ b/wxPython/distrib/all/build-osx
@@ -1,65 +1,51 @@
 #!/bin/bash
-# ---------------------------------------------------------------------------
-# 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:
-#
-#    1. the path to the base of the wx source tree
-#    2. the path of where to put the resulting installers
-#    3. skipclean flag (yes|no)
-#    4. the VERSION
-#    5. the FLAVOR (panther or jaguar)
-#    *. the remaining args are the versions of Python to build for
-#
-# ---------------------------------------------------------------------------
+#----------------------------------------------------------------------
 
 set -o errexit
-#set -o xtrace
 
-echo "-=-=-=-  Hello from $HOSTNAME  -=-=-=-"
-
-if [ $# -lt 6 ]; then
-    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION FLAVOR PYVER..."
-    exit 1
-fi
-
-WXDIR=$1
-DESTDIR=$2
-SKIPCLEAN=$3
-VERSION=$4
-FLAVOR=$5
-shift;shift;shift;shift;shift
-PYVER=$@
-
-
-export PATH=/sw/bin:$PATH
-
-
-# untar the source 
-echo "Unarchiving wxPythonSrc-$VERSION.tar.gz"
-cd $DESTDIR
-tar xzf wxPythonSrc-$VERSION.tar.gz 
-rm wxPythonSrc-$VERSION.tar.gz
-
-
-echo "Invoking wxPythonOSX build script..."
-cd $WXDIR/wxPython
-export TARBALLDIR=$DESTDIR
-mkdir -p dist
-distrib/mac/wxPythonOSX/build $FLAVOR inplace skipclean
-
-
-echo "Copying installers to $DESTDIR..."
-cp dist/*.dmg $DESTDIR
-cd $DESTDIR
-
-
-if [ $SKIPCLEAN != yes ]; then 
-    echo "Cleaning up..."
-    rm -r $WXDIR || true
-    rm wxPythonDocs-$VERSION.tar.gz
-    rm wxPythonDemo-$VERSION.tar.gz
+host=$1
+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 build continuing..."
+    else
+       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.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 $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
 
-echo "-=-=-=-  Goodbye!  -=-=-=-"