AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt to new file naming scheme, new Installer structures, and other

Browse Source 
build tweaks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-10-15 01:13:02 +00:00
parent 7093495299
commit 28d1454aff
5 changed files with 140 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ WIN_BUILD=/c/BUILD
# Just like the above # Just like the above
OSX_HOST_panther=bigmac OSX_HOST_panther=bigmac
OSX_HOST_jaguar=whopper OSX_HOST_jaguar=whopper
OSX_BUILD=/tmp/BUILD OSX_BUILD=/BUILD
# Alsmost the same... See below for hosts and other info # Alsmost the same... See below for hosts and other info
@ -58,6 +58,7 @@ function usage {
echo " skipsource Don't build the source archives, use the ones" echo " skipsource Don't build the source archives, use the ones"
echo " already in the staging dir." echo " already in the staging dir."
echo " onlysource Exit after building the source archives" echo " onlysource Exit after building the source archives"
echo " skipdocs Don't rebuild the docs"
echo " skipwin Don't do the remote Windows build" echo " skipwin Don't do the remote Windows build"
echo " skiposx Don't do the remote OSX build" echo " skiposx Don't do the remote OSX build"
echo " skiplinux Don't do the remote Linux build" echo " skiplinux Don't do the remote Linux build"
@ -84,6 +85,7 @@ KIND=dryrun
PYVER=2.3 PYVER=2.3
skipsource=no skipsource=no
onlysource=no onlysource=no
skipdocs=no
skipwin=no skipwin=no
skiposx=no skiposx=no
skiplinux=no skiplinux=no
@ -101,6 +103,7 @@ for flag in $*; do
skipsource) skipsource=yes ;; skipsource) skipsource=yes ;;
onlysource) onlysource=yes ;; onlysource) onlysource=yes ;;
skipdocs) skipdocs=yes ;;
skipwin) skipwin=yes ;; skipwin) skipwin=yes ;;
skiposx) skiposx=yes ;; skiposx) skiposx=yes ;;
skiplinux) skiplinux=yes ;; skiplinux) skiplinux=yes ;;
@ -140,42 +143,39 @@ if [ $skipsource != yes -o $onlysource = yes ]; then
# clean out the local dist dir # clean out the local dist dir
rm -f dist/* rm -f dist/*
# Regenerate the reST docs if [ $skipdocs != yes ]; then
echo "Regenerating the reST docs..." # Regenerate the reST docs
cd docs echo "Regenerating the reST docs..."
for x in *.txt; do cd docs
docutils-html $x `basename $x .txt`.html for x in *.txt; do
done docutils-html $x `basename $x .txt`.html
cd - done
cd -
# build the doc and demo tarballs
distrib/makedemo # build the doc and demo tarballs
distrib/makedocs distrib/makedemo
distrib/makedocs
# build the new docs too # build the new docs too
docs/bin/everything docs/bin/everything
fi
# make the source tarball # make the source tarball and srpm
distrib/makerpm 2.3 skipclean skiprpm gtk2 distrib/makerpm 2.3 srpm
# make the source RPMs
for ver in $PYVER; do
distrib/makerpm $ver skipclean skipcopy skiptar srpm
distrib/makerpm $ver skipclean skipcopy skiptar srpm gtk2
done
# Copy everything to the staging dir # Copy everything to the staging dir
echo "Moving stuff to $STAGING_DIR..." echo "Moving stuff to $STAGING_DIR..."
rm -f dist/*.spec
mv dist/* $STAGING_DIR mv dist/* $STAGING_DIR
for doc in CHANGES BUILD INSTALL MigrationGuide default; do
cp docs/$doc.* $STAGING_DIR if [ $skipdocs != yes ]; then
done for doc in CHANGES BUILD INSTALL MigrationGuide default; do
cp docs/$doc.* $STAGING_DIR
done
fi
# cleanup # cleanup
echo "Cleaning up..." echo "Cleaning up..."
rm -f dist/* rm -f dist/*
rm -rf _build_rpm
fi fi
if [ $KIND = daily ]; then if [ $KIND = daily ]; then
@ -193,18 +193,18 @@ if [ $skipwin != yes ]; then
echo "-=-=- Starting Windows build..." echo "-=-=- Starting Windows build..."
echo "Copying source file and build script..." echo "Copying source file and build script..."
scp $STAGING_DIR/wxPythonSrc-$VERSION.tar.gz \ scp $STAGING_DIR/wxPython-src-$VERSION.tar.gz \
distrib/all/build-windows \ distrib/all/build-windows \
$WIN_HOST:$WIN_BUILD $WIN_HOST:$WIN_BUILD
echo "Running build script on $WIN_HOST..." echo "Running build script on $WIN_HOST..."
wxdir=$WIN_BUILD/wxPythonSrc-$VERSION wxdir=$WIN_BUILD/wxPython-src-$VERSION
cmd=./build-windows cmd=./build-windows
ssh $WIN_HOST "cd $WIN_BUILD && $cmd $wxdir $WIN_BUILD $skipclean $VERSION $PYVER && rm $cmd" ssh $WIN_HOST "cd $WIN_BUILD && $cmd $wxdir $WIN_BUILD $skipclean $VERSION $PYVER && rm $cmd"
echo "Fetching the results..." echo "Fetching the results..."
scp $WIN_HOST:$WIN_BUILD/wxPythonWIN32* $STAGING_DIR scp $WIN_HOST:$WIN_BUILD/wxPython*-win32* $STAGING_DIR
ssh $WIN_HOST "rm $WIN_BUILD/wxPythonWIN32*" ssh $WIN_HOST "rm $WIN_BUILD/wxPython*-win32*"
fi fi
@ -231,20 +231,21 @@ function DoOSXBuild {
echo "Copying source files and build script..." echo "Copying source files and build script..."
ssh root@$host "mkdir -p $OSX_BUILD && rm -rf $OSX_BUILD/* || true" ssh root@$host "mkdir -p $OSX_BUILD && rm -rf $OSX_BUILD/* || true"
scp $STAGING_DIR/wxPythonSrc-$VERSION.tar.gz \ #ssh root@$host "mkdir -p $OSX_BUILD || true"
$STAGING_DIR/wxPythonDocs-$VERSION.tar.gz \ scp $STAGING_DIR/wxPython-src-$VERSION.tar.gz \
$STAGING_DIR/wxPythonDemo-$VERSION.tar.gz \ $STAGING_DIR/wxPython-docs-$VERSION.tar.gz \
$STAGING_DIR/wxPython-demo-$VERSION.tar.gz \
distrib/all/build-osx \ distrib/all/build-osx \
root@$host:$OSX_BUILD root@$host:$OSX_BUILD
echo "Running build script on $host..." echo "Running build script on $host..."
wxdir=$OSX_BUILD/wxPythonSrc-$VERSION wxdir=$OSX_BUILD/wxPython-src-$VERSION
cmd=./build-osx cmd=./build-osx
ssh root@$host "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $flavor $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 "root@$host:$OSX_BUILD/wxPythonOSX*" $STAGING_DIR scp "root@$host:$OSX_BUILD/wxPython*-osx*" $STAGING_DIR
ssh root@$host "rm $OSX_BUILD/wxPythonOSX*" ssh root@$host "rm $OSX_BUILD/wxPython*-osx*"
} }
@ -285,7 +286,7 @@ function DoLinuxBuild {
echo "Copying source files and build script..." echo "Copying source files and build script..."
ssh root@$host "mkdir -p $LINUX_BUILD && rm -rf $LINUX_BUILD/*" ssh root@$host "mkdir -p $LINUX_BUILD && rm -rf $LINUX_BUILD/*"
scp $STAGING_DIR/wxPython*.src.rpm \ scp $STAGING_DIR/wxPython-src* $STAGING_DIR/wxPython.spec\
distrib/all/build-linux \ distrib/all/build-linux \
root@$host:$LINUX_BUILD root@$host:$LINUX_BUILD
@ -294,15 +295,15 @@ function DoLinuxBuild {
ssh root@$host "cd $LINUX_BUILD && ./build-linux $reltag $skipclean $VERSION $pyver" ssh root@$host "cd $LINUX_BUILD && ./build-linux $reltag $skipclean $VERSION $pyver"
echo "Fetching the results..." echo "Fetching the results..."
scp "root@$host:$LINUX_BUILD/wxPythonGTK*.i[0-9]86.rpm" $STAGING_DIR scp "root@$host:$LINUX_BUILD/wxPython*.i[0-9]86.rpm" $STAGING_DIR
ssh root@$host "rm $LINUX_BUILD/wxPythonGTK*.i[0-9]86.rpm" ssh root@$host "rm $LINUX_BUILD/wxPython*.i[0-9]86.rpm"
} }
if [ $skiplinux != yes ]; then 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 fi

58
wxPython/distrib/all/build-linux
View File

@ -32,51 +32,53 @@ PYVER=$@
rpmtop=_rpm_top rpmtop=_rpm_top
function DoRPMBuild { function DoRPMBuild {
echo "*** Setting up RPM build dirs" # $1 : python version
for dir in SPECS BUILD RPMS SRPMS tmp; do # $2 : port
if [ ! -d $rpmtop/$dir ]; then # $3 : unicode
mkdir -p $rpmtop/$dir
fi
done
if [ ! -e $rpmtop/SOURCES ]; then
ln -s $PWD $rpmtop/SOURCES
fi
rpmbuild --define "_topdir $PWD/$rpmtop" \ rpmbuild --define "_topdir $PWD/$rpmtop" \
--define "_tmppath $PWD/$rpmtop/tmp" \ --define "_tmppath $PWD/$rpmtop/tmp" \
--define "release $RELEASE" \ --define "release ${RELEASE}_py$1" \
$@ --define "pyver $1" \
--define "port $2" \
--define "unicode $3" \
-bb wxPython.spec
if [ $? != 0 ]; then if [ $? != 0 ]; then
return $? return $?
fi fi
echo "*** Moving RPMs to ."
find $rpmtop -name "*.rpm"
mv -f `find $rpmtop -name "*.rpm"` .
echo "*** Cleaning up $rpmtop"
rm -rf $rpmtop
} }
echo "*** Setting up RPM build dirs"
for dir in SPECS BUILD RPMS SOURCES SRPMS tmp; do
if [ ! -d $rpmtop/$dir ]; then
mkdir -p $rpmtop/$dir
fi
done
cp wxPython-src-$VERSION.tar.gz $rpmtop/SOURCES
echo "******************** PYVER = " $PYVER
for ver in $PYVER; do for ver in $PYVER; do
echo "Building the RPMs for Python $ver..." echo "Building the RPMs for Python $ver..."
for port in GTK GTK2; do DoRPMBuild $ver gtk 0
rpm2cpio wxPython$port-py$ver-$VERSION-1.src.rpm | \ DoRPMBuild $ver gtk2 1
cpio --extract -R root. DoRPMBuild $ver gtk2 0
DoRPMBuild -ba wxPython$port.spec
done
done done
echo "*** Moving RPMs to ."
find $rpmtop -name "*.rpm"
mv -f `find $rpmtop -name "*.rpm"` .
if [ $SKIPCLEAN != yes ]; then if [ $SKIPCLEAN != yes ]; then
echo "*** Cleaning up $rpmtop"
rm -rf $rpmtop
echo "Cleaning up..." echo "Cleaning up..."
for ver in $PYVER; do
rm wxPythonGTK-py$ver-$VERSION-*.src.rpm
rm wxPythonGTK2-py$ver-$VERSION-*.src.rpm
done
rm *.spec *.tar.gz rm *.spec *.tar.gz
fi fi

25
wxPython/distrib/all/build-osx
View File

@ -9,7 +9,7 @@
# 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 FLAVOR (panther or jaguar) # 5. the KIND (panther or jaguar)
# *. the remaining args are the versions of Python to build for # *. the remaining args are the versions of Python to build for
# #
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@ -20,7 +20,7 @@ set -o errexit
echo "-=-=-=- Hello from $HOSTNAME -=-=-=-" echo "-=-=-=- Hello from $HOSTNAME -=-=-=-"
if [ $# -lt 6 ]; then if [ $# -lt 6 ]; then
echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION FLAVOR PYVER..." echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION KIND PYVER..."
exit 1 exit 1
fi fi
@ -28,26 +28,29 @@ WXDIR=$1
DESTDIR=$2 DESTDIR=$2
SKIPCLEAN=$3 SKIPCLEAN=$3
VERSION=$4 VERSION=$4
FLAVOR=$5 KIND=$5
shift;shift;shift;shift;shift shift;shift;shift;shift;shift
PYVER=$@ PYVER=$@
export PATH=/sw/bin:/usr/local/bin:$PATH #export PATH=/sw/bin:/usr/local/bin:$PATH
export PATH=/sw/bin:/sw/sbin:/bin:/sbin:/usr/bin:/usr/sbin:.:/usr/local/bin:/usr/X11R6/bin
echo "PATH =" $PATH
echo "which gcc = " `which gcc`
#exit 0
# untar the source # untar the source
echo "Unarchiving wxPythonSrc-$VERSION.tar.gz" echo "Unarchiving wxPython-src-$VERSION.tar.gz"
cd $DESTDIR cd $DESTDIR
tar xzf wxPythonSrc-$VERSION.tar.gz tar xzf wxPython-src-$VERSION.tar.gz
rm wxPythonSrc-$VERSION.tar.gz rm wxPython-src-$VERSION.tar.gz
echo "Invoking wxPythonOSX build script..." 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 $FLAVOR inplace skipclean distrib/mac/wxPythonOSX/build $KIND inplace skipclean
echo "Copying installers to $DESTDIR..." echo "Copying installers to $DESTDIR..."
@ -58,8 +61,8 @@ cd $DESTDIR
if [ $SKIPCLEAN != yes ]; then if [ $SKIPCLEAN != yes ]; then
echo "Cleaning up..." echo "Cleaning up..."
rm -r $WXDIR || true rm -r $WXDIR || true
rm wxPythonDocs-$VERSION.tar.gz rm wxPython-docs-$VERSION.tar.gz
rm wxPythonDemo-$VERSION.tar.gz rm wxPython-demo-$VERSION.tar.gz
fi fi
echo "-=-=-=- Goodbye! -=-=-=-" echo "-=-=-=- Goodbye! -=-=-=-"

22
wxPython/distrib/all/build-windows
View File

@ -33,7 +33,7 @@ PYVER=$@
# WXDIR is the cygwin path, WXWIN is the DOS path # WXDIR is the cygwin path, WXWIN is the DOS path
WXWIN_OLD=$WXWIN WXWIN_OLD=$WXWIN
WXWIN=`cygpath -m $WXDIR` WXWIN=`cygpath -w $WXDIR`
export WXWIN export WXWIN
@ -47,16 +47,16 @@ export WXWIN
# untar the source # untar the source
echo "Unarchiving wxPythonSrc-$VERSION.tar.gz" echo "Unarchiving wxPython-src-$VERSION.tar.gz"
cd $DESTDIR cd $DESTDIR
tar xzf wxPythonSrc-$VERSION.tar.gz tar xzf wxPython-src-$VERSION.tar.gz
rm wxPythonSrc-$VERSION.tar.gz rm wxPython-src-$VERSION.tar.gz
# Fix line endings # Fix line endings
echo "Converting wxPython line endings to CRLF..." echo "Converting wxPython line endings to CRLF..."
cd $WXDIR cd $WXDIR
names=`find wxPython -name "*.py" -o -name "*.txt" -o -name "*.htm*" -o -name "*.css" -o -name "*.h" -o -name "*.cpp" -o -name "*.c" -o -name "*.xml" ` names=`find wxPython -name "*.py" -o -name "*.txt" -o -name "*.htm*" -o -name "*.css" -o -name "*.xml" `
unix2dos -D $names unix2dos -D $names
@ -86,11 +86,11 @@ echo "Building the wx DLLs..."
.make hybrid-uni .make hybrid-uni
echo "Building the wx tools..." #echo "Building the wx tools..."
.make_tools #.make_tools
# cheat and just copy the .CHM files from the regular project dir # cheat and just copy the .CHM files from the regular project dir
# TODO: Copy over the wxPythonDocs fle and run hhc on the contents of that. # TODO: Copy over the wxPython-docs fle and run hhc on the contents of that.
mkdir -p $WXDIR/docs/htmlhelp mkdir -p $WXDIR/docs/htmlhelp
cp `cygpath $WXWIN_OLD/docs/htmlhelp`/*.chm $WXDIR/docs/htmlhelp cp `cygpath $WXWIN_OLD/docs/htmlhelp`/*.chm $WXDIR/docs/htmlhelp
@ -102,10 +102,10 @@ mkdir -p dist
for ver in $PYVER; do for ver in $PYVER; do
echo $ver echo $ver
b $ver d USE_SWIG=0 b $ver d USE_SWIG=0
b $ver h USE_SWIG=0 b $ver h USE_SWIG=0 EP_ADD_OPTS=1
b $ver r USE_SWIG=0 b $ver r USE_SWIG=0
b $ver d UNICODE=1 USE_SWIG=0 b $ver d UNICODE=1 USE_SWIG=0
b $ver h UNICODE=1 USE_SWIG=0 b $ver h UNICODE=1 USE_SWIG=0 EP_ADD_OPTS=1
b $ver r UNICODE=1 USE_SWIG=0 b $ver r UNICODE=1 USE_SWIG=0
done done
@ -116,7 +116,7 @@ export WXWIN
echo "Copying installers to $DESTDIR..." echo "Copying installers to $DESTDIR..."
mv dist/wxPythonWIN32* $DESTDIR mv dist/wxPython* $DESTDIR
cd $DESTDIR cd $DESTDIR

86
wxPython/distrib/mac/wxPythonOSX/build
View File

@ -84,7 +84,7 @@ PYVER=`$PYTHON -c "import sys; print sys.version[:3]"`
PYPREFIX=`$PYTHON -c "import sys; print sys.exec_prefix"` PYPREFIX=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYLIB=$PYPREFIX/lib/python$PYVER PYLIB=$PYPREFIX/lib/python$PYVER
SITEPACKAGES=$PYLIB/site-packages SITEPACKAGES=$PYLIB/site-packages
SHORTVER=`echo $VERSION | cut -c 1,2,3`
if [ -z "$TARBALLDIR" ]; then if [ -z "$TARBALLDIR" ]; then
@ -93,21 +93,21 @@ if [ -z "$TARBALLDIR" ]; then
# TARBALLDIR before invoking this script... # TARBALLDIR before invoking this script...
TARBALLDIR=/stuff/Development/wxPython/dist/$VERSION TARBALLDIR=/stuff/Development/wxPython/dist/$VERSION
fi fi
TARBALL=$TARBALLDIR/wxPythonSrc-$VERSION.tar.gz TARBALL=$TARBALLDIR/wxPython-src-$VERSION.tar.gz
if [ ! -e $TARBALLDIR/wxPythonDemo-$VERSION.tar.gz ]; then if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then
echo "-------------------------------------------------------" echo "-------------------------------------------------------"
echo " WARNING: Demo tarball not found, will skip building " echo " WARNING: Demo tarball not found, will skip building "
echo " the Demo app bundle and etc." echo " the Demo app bundle and etc."
echo " $TARBALLDIR/wxPythonDemo-$VERSION.tar.gz" echo " $TARBALLDIR/wxPython-demo-$VERSION.tar.gz"
echo "-------------------------------------------------------" echo "-------------------------------------------------------"
fi fi
if [ ! -e $TARBALLDIR/wxPythonDocs-$VERSION.tar.gz ]; then if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.gz ]; then
echo "-------------------------------------------------------" echo "-------------------------------------------------------"
echo " WARNING: Docs tarball not found, will skip building " echo " WARNING: Docs tarball not found, will skip building "
echo " the the wxDocsViewer app bundle and etc." echo " the the wxDocsViewer app bundle and etc."
echo " $TARBALLDIR/wxPythonDocs-$VERSION.tar.gz" echo " $TARBALLDIR/wxPython-docs-$VERSION.tar.gz"
echo "-------------------------------------------------------" echo "-------------------------------------------------------"
fi fi
@ -127,7 +127,7 @@ INSTALLDEVEL=$TMPDIR/install-devel
DMGDIR=$TMPDIR/dmg DMGDIR=$TMPDIR/dmg
RESOURCEDIR=$PROGDIR/resources RESOURCEDIR=$PROGDIR/resources
DESTDIR=$PWD/dist DESTDIR=$PWD/dist
SRCROOT=$BUILDROOT/wxPythonSrc-$VERSION SRCROOT=$BUILDROOT/wxPython-src-$VERSION
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -155,7 +155,7 @@ fi
if [ $inplace = no ]; then if [ $inplace = no ]; then
# make a build dir and cd to it. # make a build dir and cd to it.
cd wxPythonSrc-$VERSION cd wxPython-src-$VERSION
WXDIR=`pwd` WXDIR=`pwd`
mkdir -p $WXDIR/bld mkdir -p $WXDIR/bld
cd $WXDIR/bld cd $WXDIR/bld
@ -184,10 +184,10 @@ if [ $skipconfig != yes ]; then
--enable-sound \ --enable-sound \
--enable-display \ --enable-display \
--enable-geometry \ --enable-geometry \
--enable-debug_flag \
--enable-precomp=no \ --enable-precomp=no \
--enable-debug_flag --enable-optimise \
## --enable-optimise \
## --with-libjpeg=builtin \ ## --with-libjpeg=builtin \
## --with-libpng=builtin \ ## --with-libpng=builtin \
## --with-libtiff=builtin \ ## --with-libtiff=builtin \
@ -199,26 +199,24 @@ fi
if [ $skipbuild != yes ]; then if [ $skipbuild != yes ]; then
# Make wxWidgets and some contribs # Make wxWidgets and some contribs
# For some reason Rez and DeRez have started locking up if run as root...
chmod a+w lib
su robind -c "make lib/libwx_macd-2.5.3.r"
make make
make -C contrib/src/gizmos make -C contrib/src/gizmos
make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
make -C contrib/src/stc make -C contrib/src/stc
make -C contrib/src/xrc
# Build wxPython # Build wxPython
cd $WXDIR/wxPython cd $WXDIR/wxPython
$PYTHON setup.py \ $PYTHON setup.py \
NO_SCRIPTS=1 \ NO_SCRIPTS=1 \
EP_ADD_OPTS=1 \
WX_CONFIG="$WXBLD/wx-config --inplace" \ WX_CONFIG="$WXBLD/wx-config --inplace" \
BUILD_BASE=$WXBLD/wxPython \ BUILD_BASE=$WXBLD/wxPython \
build build
# Build wxrc (XRC resource tool)
cd $WXBLD/contrib/utils/wxrc
make
strip wxrc
fi fi
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -230,13 +228,18 @@ if [ $skipinstall != yes ]; then
make -C contrib/src/gizmos prefix=$INSTALLROOT$PREFIX install make -C contrib/src/gizmos prefix=$INSTALLROOT$PREFIX install
make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$INSTALLROOT/$PREFIX install make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$INSTALLROOT/$PREFIX install
make -C contrib/src/stc prefix=$INSTALLROOT$PREFIX install make -C contrib/src/stc prefix=$INSTALLROOT$PREFIX install
make -C contrib/src/xrc prefix=$INSTALLROOT$PREFIX install
# relink wx-config with a relative link
cd $INSTALLROOT$PREFIX/bin
rm wx-config
ln -s ../lib/wx/config/* wx-config
# and wxPython # and wxPython
cd $WXDIR/wxPython cd $WXDIR/wxPython
$PYTHON setup.py \ $PYTHON setup.py \
NO_SCRIPTS=1 \ NO_SCRIPTS=1 \
EP_ADD_OPTS=1 \
WX_CONFIG="$INSTALLROOT/$PREFIX/bin/wx-config --prefix=$INSTALLROOT/$PREFIX" \ WX_CONFIG="$INSTALLROOT/$PREFIX/bin/wx-config --prefix=$INSTALLROOT/$PREFIX" \
BUILD_BASE=$WXBLD/wxPython \ BUILD_BASE=$WXBLD/wxPython \
install \ install \
@ -263,10 +266,6 @@ if [ $skipinstall != yes ]; then
python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX
# Install wxrc
cp $WXBLD/contrib/utils/wxrc/wxrc $INSTALLROOT$BINPREFIX
# Set premissions for files in $INSTALLROOT # Set premissions for files in $INSTALLROOT
if [ "$UID" = "0" ]; then if [ "$UID" = "0" ]; then
chown -R root:admin $INSTALLROOT chown -R root:admin $INSTALLROOT
@ -274,6 +273,8 @@ if [ $skipinstall != yes ]; then
fi fi
fi fi
PKGDIR=`cat $INSTALLROOT/Library/Python/$PYVER/wx.pth`
popd popd
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -307,6 +308,7 @@ EOF
# Cleanup any old install of the wxPython package # Cleanup any old install of the wxPython package
rm -rf \$2$SITEPACKAGES/wxPython rm -rf \$2$SITEPACKAGES/wxPython
rm -rf \$2$SITEPACKAGES/wx rm -rf \$2$SITEPACKAGES/wx
rm -rf \$2$SITEPACKAGES/$PKGDIR
exit 0 exit 0
EOF EOF
chmod +x $RESOURCEDIR/preflight chmod +x $RESOURCEDIR/preflight
@ -315,17 +317,13 @@ EOF
cat > $RESOURCEDIR/postflight <<EOF cat > $RESOURCEDIR/postflight <<EOF
#!/bin/sh -e #!/bin/sh -e
# Compile the .py files in the wxPython pacakge # Compile the .py files in the wxPython pacakge
$PYTHON \$2$PYLIB/compileall.py \$2$SITEPACKAGES/wxPython $PYTHON \$2$PYLIB/compileall.py \$2$SITEPACKAGES/$PKGDIR
$PYTHON \$2$PYLIB/compileall.py \$2$SITEPACKAGES/wx $PYTHON -O \$2$PYLIB/compileall.py \$2$SITEPACKAGES/$PKGDIR
$PYTHON -O \$2$PYLIB/compileall.py \$2$SITEPACKAGES/wxPython
$PYTHON -O \$2$PYLIB/compileall.py \$2$SITEPACKAGES/wx
# and all of the wxPython pacakge should be group writable # and all of the wxPython pacakge should be group writable
chgrp -R admin \$2$SITEPACKAGES/wxPython chgrp -R admin \$2$SITEPACKAGES/$PKGDIR
chmod -R g+w \$2$SITEPACKAGES/wxPython chmod -R g+w \$2$SITEPACKAGES/$PKGDIR
chgrp -R admin \$2$SITEPACKAGES/wx
chmod -R g+w \$2$SITEPACKAGES/wx
exit 0 exit 0
EOF EOF
@ -334,9 +332,9 @@ EOF
# Build the main Installer Package... # Build the main Installer Package...
rm -rf wxPythonOSX-$KIND.pkg rm -rf wxPython${SHORTVER}-osx-$KIND.pkg
python $PROGDIR/../buildpkg.py \ python $PROGDIR/../buildpkg.py \
--Title=wxPythonOSX-$KIND \ --Title=wxPython${SHORTVER}-osx-$KIND \
--Version=$VERSION \ --Version=$VERSION \
--Description="wxPython $VERSION for $W_MSG MacPython-OSX $PYVER" \ --Description="wxPython $VERSION for $W_MSG MacPython-OSX $PYVER" \
--NeedsAuthorization="YES" \ --NeedsAuthorization="YES" \
@ -345,7 +343,7 @@ EOF
$INSTALLROOT \ $INSTALLROOT \
$RESOURCEDIR $RESOURCEDIR
mv wxPythonOSX-$KIND.pkg $DMGDIR/root mv wxPython${SHORTVER}-osx-$KIND.pkg $DMGDIR/root
@ -355,7 +353,7 @@ Welcome to wxPython!
On this disk image you will find the installer for wxPython $VERSION for $W_MSG MacPython-OSX $PYVER. MacPython-OSX is not included. On this disk image you will find the installer for wxPython $VERSION for $W_MSG MacPython-OSX $PYVER. MacPython-OSX is not included.
wxPython-$KIND.pkg The installer package. It contains the wxPython wxPython${SHORTVER}-osx-$KIND.pkg The installer package. It contains the wxPython
extension modules, wxMac dynamic libraries and extension modules, wxMac dynamic libraries and
headers, and some scripts for the command-line headers, and some scripts for the command-line
tools. tools.
@ -399,16 +397,16 @@ EOF
# wxDocs # wxDocs
if [ ! -e $TARBALLDIR/wxPythonDocs-$VERSION.tar.gz ]; then if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.gz ]; then
cat > "$DMGDIR/root/Docs/Build ERROR.txt" <<EOF cat > "$DMGDIR/root/Docs/Build ERROR.txt" <<EOF
The wxPythonDocs tarball was not found when building this disk image! The wxPython-docs tarball was not found when building this disk image!
EOF EOF
else else
pushd $BUILDROOT pushd $BUILDROOT
tar xzvf $TARBALLDIR/wxPythonDocs-$VERSION.tar.gz tar xzvf $TARBALLDIR/wxPython-docs-$VERSION.tar.gz
popd popd
# Make an app to launch viewdocs.py # Make an app to launch viewdocs.py
@ -441,10 +439,10 @@ EOF
popd popd
if [ ! -e $TARBALLDIR/wxPythonDemo-$VERSION.tar.gz ]; then if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then
cat > "$DMGDIR/root/Samples/Build ERROR.txt" <<EOF cat > "$DMGDIR/root/Samples/Build ERROR.txt" <<EOF
The wxPythonDemo tarball was not found when building this disk image! The wxPython-demo tarball was not found when building this disk image!
EOF EOF
cp "$DMGDIR/root/Samples/Build ERROR.txt" $DMGDIR/root/Apps cp "$DMGDIR/root/Samples/Build ERROR.txt" $DMGDIR/root/Apps
@ -453,7 +451,7 @@ EOF
# Copy the demo and samples to the disk image from the tarball # Copy the demo and samples to the disk image from the tarball
pushd $DMGDIR/root/Samples pushd $DMGDIR/root/Samples
tar xzvf $TARBALLDIR/wxPythonDemo-$VERSION.tar.gz tar xzvf $TARBALLDIR/wxPython-demo-$VERSION.tar.gz
mv wxPython-$VERSION/* . mv wxPython-$VERSION/* .
rm -rf wxPython-$VERSION rm -rf wxPython-$VERSION
rm demo/b demo/.setup.sh rm demo/b demo/.setup.sh
@ -498,10 +496,10 @@ EOF
# and then finally make a disk image containing the packages and etc. # and then finally make a disk image containing the packages and etc.
$PROGDIR/../makedmg $DMGDIR/root $DMGDIR wxPythonOSX-$VERSION-$KIND-Py$PYVER $PROGDIR/../makedmg $DMGDIR/root $DMGDIR wxPython${SHORTVER}-osx-$VERSION-$KIND-py$PYVER
echo Moving $DMGDIR/wxPythonOSX-$VERSION-$KIND-Py$PYVER.dmg to $DESTDIR echo Moving $DMGDIR/wxPython${SHORTVER}-osx-$VERSION-$KIND-py$PYVER.dmg to $DESTDIR
mv $DMGDIR/wxPythonOSX-$VERSION-$KIND-Py$PYVER.dmg $DESTDIR mv $DMGDIR/wxPython${SHORTVER}-osx-$VERSION-$KIND-py$PYVER.dmg $DESTDIR
fi fi