Forward port recent changes on the 2.8 branch to HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -57,7 +57,10 @@ def getTasks(config_env):
|
||||
[config.OSX_HOST_panther, "2.3", "both"], env=config_env),
|
||||
Job("bigmac.24",
|
||||
"distrib/all/build-osx",
|
||||
[config.OSX_HOST_panther, "2.4", "both"], env=config_env)
|
||||
[config.OSX_HOST_panther, "2.4", "both"], env=config_env),
|
||||
Job("bigmac.25",
|
||||
"distrib/all/build-osx",
|
||||
[config.OSX_HOST_panther, "2.5", "both"], env=config_env)
|
||||
])
|
||||
|
||||
tigerTask = Task([ #Job("smallfry.23",
|
||||
@@ -88,9 +91,16 @@ def getTasks(config_env):
|
||||
# Job("co-mdk2006.24","distrib/all/build-rpm", ["beast", "co-mdk2006", "mdk2006", "2.4"], env=config_env),
|
||||
])
|
||||
|
||||
xavierTask = Task([
|
||||
Job("xavier.d", "distrib/all/build-deb", ["xavier", "/work/chroot/dapper", "dapper"], env=config_env),
|
||||
Job("xavier.f", "distrib/all/build-deb", ["xavier", "/work/chroot/feisty", "feisty"], env=config_env),
|
||||
cyclopsTask1 = Task([
|
||||
Job("cyclops.d", "distrib/all/build-deb", ["cyclops", "/work/chroot/dapper", "dapper"], env=config_env),
|
||||
Job("cyclops.d64", "distrib/all/build-deb", ["cyclops", "/work/chroot/dapper64", "dapper64"], env=config_env),
|
||||
Job("cyclops.fc6", "distrib/all/build-chrpm",
|
||||
["cyclops", "/work/chroot/fc6", "fc6", "fc6", "2.4"], env=config_env),
|
||||
])
|
||||
|
||||
cyclopsTask2 = Task([
|
||||
Job("cyclops.f", "distrib/all/build-deb", ["cyclops", "/work/chroot/feisty", "feisty"], env=config_env),
|
||||
Job("cyclops.f64", "distrib/all/build-deb", ["cyclops", "/work/chroot/feisty64", "feisty64"], env=config_env),
|
||||
])
|
||||
|
||||
buildTasks = [ #jaguarTask,
|
||||
@@ -98,7 +108,8 @@ def getTasks(config_env):
|
||||
tigerTask,
|
||||
beastTask1,
|
||||
beastTask2,
|
||||
xavierTask,
|
||||
cyclopsTask1,
|
||||
cyclopsTask2,
|
||||
]
|
||||
|
||||
# Finalization. This is for things that must wait until all the
|
||||
|
61
wxPython/distrib/all/build-chrpm
Executable file
61
wxPython/distrib/all/build-chrpm
Executable file
@@ -0,0 +1,61 @@
|
||||
#!/bin/bash
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
set -o errexit
|
||||
#set -o xtrace
|
||||
|
||||
host=$1
|
||||
chRootRoot=$2
|
||||
chRootName=$3
|
||||
reltag=$4
|
||||
pyver=$5
|
||||
|
||||
|
||||
if [ $buildansi = yes ]; then
|
||||
CHARTYPE=both
|
||||
else
|
||||
CHARTYPE=unicode
|
||||
fi
|
||||
|
||||
|
||||
function TestOnline {
|
||||
local host=$1
|
||||
local message=$2
|
||||
|
||||
if ping -q -c1 -w1 $host > /dev/null; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
||||
if [ $skipdeb != yes ]; then
|
||||
# We use a chroot environment on the build machine for the debian
|
||||
# builds, so this build is pretty simple. Just copy the tarball
|
||||
# and a build script to the build machine, and then run
|
||||
# do-build-deb in the chroot.
|
||||
|
||||
if TestOnline $host; then
|
||||
|
||||
echo "The $host machine is online, build continuing..."
|
||||
|
||||
echo "Copying source files and build script..."
|
||||
ssh root@$host "mkdir -p $chRootRoot/$LINUX_BUILD && rm -rf $chRootRoot/$LINUX_BUILD/*"
|
||||
scp $STAGING_DIR/wxPython-src* distrib/all/do-build-rpm $STAGING_DIR/wxPython.spec \
|
||||
root@$host:$chRootRoot/$LINUX_BUILD
|
||||
|
||||
ssh root@$host "dchroot --chroot $chRootName --directory $LINUX_BUILD \"./do-build-rpm $reltag $skipclean $VERSION $pyver $CHARTYPE\""
|
||||
|
||||
echo "Fetching the results..."
|
||||
ssh root@$host "rm $chRootRoot/$LINUX_BUILD/do-build-rpm"
|
||||
scp "root@$host:$chRootRoot/$LINUX_BUILD/wxPython*.i[0-9]86.rpm" $STAGING_DIR
|
||||
ssh root@$host "rm $chRootRoot/$LINUX_BUILD/wxPython*.i[0-9]86.rpm"
|
||||
echo "Done!"
|
||||
else
|
||||
echo "The $host machine is **OFFLINE**, skipping the binary RPM build."
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
Reference in New Issue
Block a user