X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afbe4a552405f3c93ed8505d1377fa142ce42c1a..ae177b45b258b4985ee8c9ce7848bcb4f1266f80:/wxPython/distrib/all/build-all

diff --git a/wxPython/distrib/all/build-all b/wxPython/distrib/all/build-all
index ea8290be53..b0e0c2504b 100755
--- 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, OSX-$flavor 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 root@$host "mkdir -p $OSX_BUILD && rm -rf $OSX_BUILD/* || true"
     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
+	root@$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 "root@$host:$OSX_BUILD/wxPythonOSX*"  $STAGING_DIR
+     ssh root@$host "rm $OSX_BUILD/wxPythonOSX*"
+
+}
+
+
+if [ $skiposx != yes ]; then
+
+    DoOSXBuild $OSX_HOST_panther panther
+    DoOSXBuild $OSX_HOST_jaguar jaguar
+
 fi
 
 
@@ -237,8 +262,8 @@ fi
 
 # The remote Linux builds are different than those above.  The source
 # RPMs were already built in the source step, and so building the
-# binary RPMs is a very simple followup step.  Add to that the fact
-# that we need to build on more than one distro...
+# binary RPMs is a very simple followup step.  But then add to that
+# the fact that we need to build on more than one distro...
 
 function DoLinuxBuild {
     local host=$1
@@ -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
 
 
 # ---------------------------------------------------------------------------
@@ -315,7 +342,7 @@ if [ $KIND = daily ]; then
     cat <<EOF  | /usr/sbin/sendmail  $TO
 From: R'bot <rbot@wxpython.org>
 To: $TO
-Subject: New test build uploaded
+Subject: $DAILY test build uploaded
 Date: $DATE
 
 Hi,
@@ -323,8 +350,8 @@ Hi,
 A new test build of wxPython has been uploaded to starship.  
 
    Version: $VERSION
-   Pythons: $PYVER
    URL:     http://starship.python.net/crew/robind/wxPython/daily/$DAILY
+   Changes: http://starship.python.net/crew/robind/wxPython/daily/$DAILY/CHANGES.html
 
 Have fun!
 R'bot
@@ -359,7 +386,7 @@ if [ $KIND = release ]; then
     cat <<EOF  | /usr/sbin/sendmail  $TO
 From: R'bot <rbot@wxpython.org>
 To: $TO
-Subject: New release candidate build uploaded
+Subject: $VERSION release candidate build uploaded
 Date: $DATE
 
 Hi,
@@ -367,8 +394,8 @@ Hi,
 A new RC build of wxPython has been uploaded to starship.  
 
    Version: $VERSION
-   Pythons: $PYVER
    URL:     http://starship.python.net/crew/robind/wxPython/preview/$VERSION
+   Changes: http://starship.python.net/crew/robind/wxPython/preview/$VERSION/CHANGES.html
 
 Have fun!
 R'bot