Merge recent changes from 2.8 branch.
Make updates for recent changes on CVS HEAD. Remove or workaround deprecated items. Fix compile errors. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -73,7 +73,7 @@ def getTasks(config_env):
|
||||
|
||||
|
||||
beastTask1 = Task(
|
||||
[ #Job("beast.23", "distrib/all/build-windows", ["2.3"], env=config_env),
|
||||
[ Job("beast.23", "distrib/all/build-windows", ["2.3"], env=config_env),
|
||||
# Job("co-rh9.23", "distrib/all/build-rpm", ["beast", "co-rh9", "rh9", "2.3"], env=config_env),
|
||||
Job("beast.24", "distrib/all/build-windows", ["2.4"], env=config_env),
|
||||
# Job("co-rh9.24", "distrib/all/build-rpm", ["beast", "co-rh9", "rh9", "2.4"], env=config_env),
|
||||
@@ -89,7 +89,8 @@ def getTasks(config_env):
|
||||
])
|
||||
|
||||
xavierTask = Task([
|
||||
Job("xavier", "distrib/all/build-deb", ["xavier", "/work/chroot/dapper", "dapper"], env=config_env),
|
||||
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),
|
||||
])
|
||||
|
||||
buildTasks = [ #jaguarTask,
|
||||
|
@@ -25,8 +25,8 @@ function TestOnline {
|
||||
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 /tmp, and then run do-build-deb in the
|
||||
# chroot.
|
||||
# and a build script to the build machine, and then run
|
||||
# do-build-deb in the chroot.
|
||||
|
||||
if TestOnline $host; then
|
||||
|
||||
@@ -37,7 +37,7 @@ if [ $skipdeb != yes ]; then
|
||||
scp $STAGING_DIR/wxPython-src* distrib/all/do-build-deb \
|
||||
root@$host:$chRootRoot/$LINUX_BUILD
|
||||
|
||||
ssh root@$host "dchroot --chroot $chRootName --directory $LINUX_BUILD \"do-build-deb $VERSION $VER2\""
|
||||
ssh root@$host "dchroot --chroot $chRootName --directory $LINUX_BUILD \"./do-build-deb $VERSION $VER2\""
|
||||
|
||||
echo "Fetching the results..."
|
||||
mkdir -p $STAGING_DIR/$chRootName
|
||||
|
Reference in New Issue
Block a user