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

Merge recent changes from 2.8 branch.

Browse Source 
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:
Robin Dunn
2007-03-27 01:49:46 +00:00
parent fd4081aa33
commit cbfc9df676
131 changed files with 12811 additions and 4397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
wxPython/distrib/all/build-deb
View File

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

24
wxPython/distrib/makedev.bat
View File

@@ -6,6 +6,12 @@ rem or extensions that can share the same DLL.
setlocal
set BASE=_distrib_zip\wxPython-%1
set TYPE=h
if %2 == "debug" set TYPE=d
set DELTYPE=d
if %2 == "debug" set DELTYPE=h
rem **** Make a directory to build up a distribution tree
mkdir _distrib_zip
mkdir %BASE%
@@ -30,19 +36,19 @@ copy %WXWIN%\wxPython\src\*.py %BASE%\include\wx\wxPython\i_files
mkdir %BASE%\lib
mkdir %BASE%\lib\vc_dll
mkdir %BASE%\lib\vc_dll\mswh
mkdir %BASE%\lib\vc_dll\mswuh
mkdir %BASE%\lib\vc_dll\msw%TYPE%
mkdir %BASE%\lib\vc_dll\mswu%TYPE%
copy /s %WXWIN%\lib\vc_dll\mswh\* %BASE%\lib\vc_dll\mswh
copy /s %WXWIN%\lib\vc_dll\mswuh\* %BASE%\lib\vc_dll\mswuh
copy /s %WXWIN%\lib\vc_dll\msw%TYPE%\* %BASE%\lib\vc_dll\mswh
copy /s %WXWIN%\lib\vc_dll\mswu%TYPE%\* %BASE%\lib\vc_dll\mswuh
copy %WXWIN%\lib\vc_dll\* %BASE%\lib\vc_dll
rem *** remove unneeded files
cd _distrib_zip
ffind /SB wx*d_*.* > del-files
ffind /SB wx*d.* >> del-files
ffind /SB wx*%DELTYPE%_*.* > del-files
ffind /SB wx*%DELTYPE%.* >> del-files
ffind /SB .#* >> del-files
ffind /SB .cvsignore >> del-files
@@ -68,8 +74,10 @@ rm del-files
rm del-dirs
rem *** bundle it all up TODO: don't hard-code the 2.8
tar cvf ../dist/wxPython2.8-win32-devel-%1.tar wxPython-%1
bzip2 -9 ../dist/wxPython2.8-win32-devel-%1.tar
set EXT=
if %2 == "debug" set EXT="-debug"
tar cvf ../dist/wxPython2.8-win32-devel-%1%EXT%.tar wxPython-%1
bzip2 -9 ../dist/wxPython2.8-win32-devel-%1%EXT%.tar
rem *** cleanup
cd ..

3
wxPython/distrib/makerpm
View File

@@ -3,6 +3,7 @@
# Build an RPM containing both wxGTK and wxPython
##set -o xtrace
##set -o errexit
spectemplate=distrib/wxPythonFull.spec.in
@@ -236,7 +237,7 @@ fi
#----------------------------------------------------------------------
# build the RPM
if [ -z "${skiprpm}" ]; then
if [ "${skiprpm}" != "1" ]; then
echo "*** Building RPMs..."
cp ${distdir}/${tarver}.tar.bz2 ${rpmtop}/SOURCES