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
This commit is contained in:
@@ -22,7 +22,8 @@ WIN_BUILD=/c/BUILD
|
|||||||
|
|
||||||
|
|
||||||
# Just like the above
|
# Just like the above
|
||||||
OSX_HOST=bigmac
|
OSX_HOST_panther=bigmac
|
||||||
|
OSX_HOST_jaguar=whopper
|
||||||
OSX_BUILD=/tmp/BUILD
|
OSX_BUILD=/tmp/BUILD
|
||||||
|
|
||||||
|
|
||||||
@@ -210,25 +211,49 @@ fi
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# OSX build
|
# OSX build
|
||||||
|
|
||||||
if [ $skiposx != yes ]; then
|
function DoOSXBuild {
|
||||||
echo "-=-=- Starting OSX build..."
|
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..."
|
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 \
|
scp $STAGING_DIR/wxPythonSrc-$VERSION.tar.gz \
|
||||||
$STAGING_DIR/wxPythonDocs-$VERSION.tar.gz \
|
$STAGING_DIR/wxPythonDocs-$VERSION.tar.gz \
|
||||||
$STAGING_DIR/wxPythonDemo-$VERSION.tar.gz \
|
$STAGING_DIR/wxPythonDemo-$VERSION.tar.gz \
|
||||||
distrib/all/build-osx \
|
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
|
wxdir=$OSX_BUILD/wxPythonSrc-$VERSION
|
||||||
cmd=./build-osx
|
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..."
|
echo "Fetching the results..."
|
||||||
scp "$OSX_HOST:$OSX_BUILD/wxPythonOSX*" $STAGING_DIR
|
scp "$host:$OSX_BUILD/wxPythonOSX*" $STAGING_DIR
|
||||||
ssh $OSX_HOST "rm $OSX_BUILD/wxPythonOSX*"
|
ssh $host "rm $OSX_BUILD/wxPythonOSX*"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if [ $skiposx != yes ]; then
|
||||||
|
|
||||||
|
DoOSXBuild $OSX_HOST_panther panther
|
||||||
|
DoOSXBuild $OSX_HOST_jaguar jaguar
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -274,10 +299,12 @@ function DoLinuxBuild {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if [ $skiplinux != yes ]; then
|
||||||
|
|
||||||
DoLinuxBuild co-rh9 RH9 $PYVER
|
DoLinuxBuild co-rh9 RH9 $PYVER
|
||||||
DoLinuxBuild co-fc2 FC2 2.3
|
DoLinuxBuild co-fc2 FC2 2.3
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/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...
|
# called from build-all but it should be able to be used standalone too...
|
||||||
#
|
#
|
||||||
# The command line must have the following parameters:
|
# The command line must have the following parameters:
|
||||||
@@ -9,7 +9,8 @@
|
|||||||
# 2. the path of where to put the resulting installers
|
# 2. the path of where to put the resulting installers
|
||||||
# 3. skipclean flag (yes|no)
|
# 3. skipclean flag (yes|no)
|
||||||
# 4. the VERSION
|
# 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 -=-=-=-"
|
echo "-=-=-=- Hello from $HOSTNAME -=-=-=-"
|
||||||
|
|
||||||
if [ $# -lt 5 ]; then
|
if [ $# -lt 6 ]; then
|
||||||
echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION PYVER..."
|
echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION FLAVOR PYVER..."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -27,7 +28,8 @@ WXDIR=$1
|
|||||||
DESTDIR=$2
|
DESTDIR=$2
|
||||||
SKIPCLEAN=$3
|
SKIPCLEAN=$3
|
||||||
VERSION=$4
|
VERSION=$4
|
||||||
shift;shift;shift;shift
|
FLAVOR=$5
|
||||||
|
shift;shift;shift;shift;shift
|
||||||
PYVER=$@
|
PYVER=$@
|
||||||
|
|
||||||
|
|
||||||
@@ -45,7 +47,7 @@ echo "Invoking wxPythonOSX build script..."
|
|||||||
cd $WXDIR/wxPython
|
cd $WXDIR/wxPython
|
||||||
export TARBALLDIR=$DESTDIR
|
export TARBALLDIR=$DESTDIR
|
||||||
mkdir -p dist
|
mkdir -p dist
|
||||||
distrib/mac/wxPythonOSX/build panther inplace skipclean
|
distrib/mac/wxPythonOSX/build $FLAVOR inplace skipclean
|
||||||
|
|
||||||
|
|
||||||
echo "Copying installers to $DESTDIR..."
|
echo "Copying installers to $DESTDIR..."
|
||||||
|
Reference in New Issue
Block a user