Added ability to also do a remote build on the Jaguar machine

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index ea8290be535080c050cc0af0b5dea2f0ed623d9c..e224ebce19571f4808c240b85604a7e5fd50fe24 100755 (executable)
--- a/wxPython/distrib/all/build-all
+++ b/wxPython/distrib/all/build-all
@@ -22,7 +22,8 @@ WIN_BUILD=/c/BUILD
 
 
 # Just like the above
-OSX_HOST=bigmac
+OSX_HOST_panther=bigmac
+OSX_HOST_jaguar=whopper
 OSX_BUILD=/tmp/BUILD
 
 
@@ -210,25 +211,49 @@ fi
 # ---------------------------------------------------------------------------
 # OSX build
 
-if [ $skiposx != yes ]; then
-    echo "-=-=- Starting OSX build..."
+function DoOSXBuild {
+    local host=$1
+    local flavor=$2
+
+    # test if the target machine is online
+    if ping -q -c1 -w1 $host > /dev/null; then
+       echo "-----------------------------------------------------------------"
+       echo " The $host machine is online, build continuing..."
+       echo "-----------------------------------------------------------------"
+    else
+       echo "-----------------------------------------------------------------"
+       echo "The $host machine is offline, skipping the OSX $flavor build."
+       echo "-----------------------------------------------------------------"
+       return 0
+    fi
+
+    echo "-=-=- Starting OSX-$flavor build on $host..."
 
     echo "Copying source files and build script..."
-    ssh $OSX_HOST "mkdir -p $OSX_BUILD && rm -rf $OSX_BUILD/*"
+    ssh $host "mkdir -p $OSX_BUILD && rm -rf $OSX_BUILD/*"
     scp $STAGING_DIR/wxPythonSrc-$VERSION.tar.gz \
        $STAGING_DIR/wxPythonDocs-$VERSION.tar.gz \
        $STAGING_DIR/wxPythonDemo-$VERSION.tar.gz \
        distrib/all/build-osx \
-       $OSX_HOST:$OSX_BUILD
+       $host:$OSX_BUILD
 
-     echo "Running build script on $OSX_HOST..."
+     echo "Running build script on $host..."
      wxdir=$OSX_BUILD/wxPythonSrc-$VERSION
      cmd=./build-osx
-     ssh root@$OSX_HOST "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $PYVER && rm $cmd"
+     ssh root@$host "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $flavor $PYVER && rm $cmd"
 
      echo "Fetching the results..."
-     scp "$OSX_HOST:$OSX_BUILD/wxPythonOSX*"  $STAGING_DIR
-     ssh $OSX_HOST "rm $OSX_BUILD/wxPythonOSX*"
+     scp "$host:$OSX_BUILD/wxPythonOSX*"  $STAGING_DIR
+     ssh $host "rm $OSX_BUILD/wxPythonOSX*"
+
+}
+
+
+if [ $skiposx != yes ]; then
+
+    DoOSXBuild $OSX_HOST_panther panther
+    DoOSXBuild $OSX_HOST_jaguar jaguar
+
 fi
 
 
@@ -274,10 +299,12 @@ function DoLinuxBuild {
 
 }
 
+if [ $skiplinux != yes ]; then
 
-DoLinuxBuild co-rh9 RH9 $PYVER
-DoLinuxBuild co-fc2 FC2 2.3
+    DoLinuxBuild co-rh9 RH9 $PYVER
+    DoLinuxBuild co-fc2 FC2 2.3
 
+fi
 
 
 # ---------------------------------------------------------------------------

diff --git a/wxPython/distrib/all/build-osx b/wxPython/distrib/all/build-osx
index 77fc27d89a747842702d60743b190ddf672ac1a3..04eff1e0163c7958b312897cf6195bb801f7e3da 100755 (executable)
--- a/wxPython/distrib/all/build-osx
+++ b/wxPython/distrib/all/build-osx
@@ -1,6 +1,6 @@
 #!/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:
@@ -9,7 +9,8 @@
 #    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 FLAVOR (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  -=-=-=-"
 
-if [ $# -lt 5 ]; then
-    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION PYVER..."
+if [ $# -lt 6 ]; then
+    echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION FLAVOR PYVER..."
     exit 1
 fi
 
@@ -27,7 +28,8 @@ WXDIR=$1
 DESTDIR=$2
 SKIPCLEAN=$3
 VERSION=$4
-shift;shift;shift;shift
+FLAVOR=$5
+shift;shift;shift;shift;shift
 PYVER=$@
 
 
@@ -45,7 +47,7 @@ echo "Invoking wxPythonOSX build script..."
 cd $WXDIR/wxPython
 export TARBALLDIR=$DESTDIR
 mkdir -p dist
-distrib/mac/wxPythonOSX/build panther inplace skipclean
+distrib/mac/wxPythonOSX/build $FLAVOR inplace skipclean
 
 
 echo "Copying installers to $DESTDIR..."