Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forward port recent changes on the 2.8 branch to HEAD

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-05-16 23:39:42 +00:00
parent f6342fb5e6
commit 0b0849b5a5
87 changed files with 3807 additions and 1586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wxPython/distrib/DIRLIST
View File

@@ -123,6 +123,7 @@ wxPython/wx/lib/art
wxPython/wx/lib/colourchooser
wxPython/wx/lib/editor
wxPython/wx/lib/floatcanvas
wxPython/wx/lib/floatcanvas/Utilities
wxPython/wx/lib/masked
wxPython/wx/lib/mixins
wxPython/wx/lib/ogl

2
wxPython/distrib/README.win32.txt
View File

@@ -1,7 +1,7 @@
wxPython win32 README
---------------------
The self-installer pacakge you have just installed contains the Python
The self-installer package you have just installed contains the Python
extension modules, python modules and packages needed to run wxPython
applications. If you selected the "Make this install be the default
wxPython" option in the installer then this version will be the one

21
wxPython/distrib/all/build-all
View File

@@ -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
View 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

3
wxPython/distrib/make_installer.py
View File

@@ -121,6 +121,7 @@ Source: "wx\lib\mixins\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib
Source: "wx\lib\masked\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\masked"; Components: core
Source: "wx\lib\ogl\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\ogl"; Components: core
Source: "wx\lib\floatcanvas\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\floatcanvas"; Components: core
Source: "wx\lib\floatcanvas\Utilities\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\floatcanvas\Utilities"; Components: core
Source: "wx\py\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\py"; Components: core
Source: "wx\py\*.txt"; DestDir: "{app}\%(PKGDIR)s\wx\py"; Components: core
Source: "wx\py\*.ico"; DestDir: "{app}\%(PKGDIR)s\wx\py"; Components: core
@@ -216,6 +217,8 @@ Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\ogl\*.pyc";
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\ogl\*.pyo";
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\floatcanvas\*.pyc";
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\floatcanvas\*.pyo";
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\floatcanvas\Utilities\*.pyc";
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\floatcanvas\Utilities\*.pyo";
Type: files; Name: "{app}\%(PKGDIR)s\wx\py\*.pyc";
Type: files; Name: "{app}\%(PKGDIR)s\wx\py\*.pyo";