# Build wxMac and wxPythonOSX from the tarball and then make an
# Installer package out of it.
+#set -o xtrace
+
spectemplate=distrib/wxPythonFull.spec.in
if [ ! -d wxPython -o ! -e ${spectemplate} ]; then
exit 1
fi
-if [ ! "$UID" = "0" ]; then
+if [ "$UID" != "0" ]; then
echo "-------------------------------------------------------"
- echo " WARNING: will be unable to change ownership of files"
+ echo " WARNING: I will be unable to change ownership of files"
echo " unless this script is run as root or via sudo"
echo "-------------------------------------------------------"
fi
function usage {
echo ""
- echo "Usage: $0 [panther|jaguar] [command flags...]"
+ echo "Usage: $0 PYVER [command flags...]"
echo ""
- echo " panther Build for Apple's python in /usr/bin, such as on Panther"
- echo " jaguar Build for a python in /usr/local/bin, such as on Jaguar"
+ echo " PYVER Python version to use to do the build. A"
+ echo " matching python\$PYVER must be found on the PATH"
echo ""
echo "optional command flags:"
echo " skiptar Don't unpack the tarball"
+ echo " inplace Don't use the tarball, build from the CVS tree instead"
+ echo " (The Docs and Demo tarballs are still required for a full build.)"
+ echo " reswig Regenerate SWIG wrappers"
+ echo " universal Generate Universal wxWidgets binary (requires Universal Python "
+ echo " to general Universal wxPython)."
+ echo " unicode Make a unicode build"
echo " skipconfig Don't run configure"
echo " skipbuild Don't build wxWidgets or wxPython"
echo " skipinstall Don't do the installation step"
}
-if [ $# -lt 1 ]; then
- usage
+PYVER=$1
+if [ "$PYVER" != "" ] && which python$PYVER && which pythonw$PYVER; then
+ PYTHON=`which python$PYVER`
+ PYTHONW=`which pythonw$PYVER`
+else
+ usage;
exit 1
fi
-KIND=$1
-case $KIND in
- panther) PYTHON=/usr/bin/python ;;
- jaguar) PYTHON=/usr/local/bin/python ;;
- *) usage; exit 1 ;;
-esac
-PYTHONW=${PYTHON}w
shift
+skiptar=no
+skipconfig=no
+skipbuild=no
+skipinstall=no
+skipdmg=no
+skipclean=no
+inplace=no
+unicode=no
+debug=no
+reswig=no
+universal=no
for flag in $*; do
case ${flag} in
- skiptar) skiptar=1 ;;
- skipconfig) skipconfig=1; skiptar=1 ;;
- skipbuild) skipbuild=1; skipconfig=1; skiptar=1 ;;
- skipinstall) skipinstall=1 ;;
- skipdmg) skipdmg=1 ;;
- skipclean) skipclean=1 ;;
-
+ skiptar) skiptar=yes ;;
+ skipconfig) skipconfig=yes; skiptar=yes ;;
+ skipbuild) skipbuild=yes; skipconfig=yes; skiptar=yes ;;
+ skipinstall) skipinstall=yes ;;
+ skipdmg) skipdmg=yes ;;
+ skipclean) skipclean=yes ;;
+ inplace) inplace=yes; skiptar=yes ;;
+ unicode) unicode=yes ;;
+ ansi) unicode=no ;;
+ debug) debug=yes ;;
+ reswig) reswig=yes ;;
+ universal) universal=yes ;;
*) echo "Unknown flag \"${flag}\""
usage
exit 1
done
+
+OSX_VERSION=`sw_vers -productVersion`
+OSX_VERSION=${OSX_VERSION:0:4}
+
+case $OSX_VERSION in
+ 10.4) TAG=macosx10.4 ;;
+ 10.3) TAG=macosx10.3 ;;
+ 10.2) TAG=macosx10.2 ;;
+ *) usage; exit 1 ;;
+esac
+
+if [ $universal = yes ]; then
+ TAG=universal10.4
+fi
+
+
+
VERSION=`$PYTHON -c "import setup;print setup.VERSION"`
-PYVER=`$PYTHON -c "import sys; print sys.version[:3]"`
+SHORTVER=`echo $VERSION | cut -c 1,2,3`
PYPREFIX=`$PYTHON -c "import sys; print sys.exec_prefix"`
PYLIB=$PYPREFIX/lib/python$PYVER
SITEPACKAGES=$PYLIB/site-packages
+if [ $unicode == yes ]; then
+ CHARTYPE=unicode
+ UNICODEOPT=--enable-unicode
+ PYUNICODEOPT=1
+else
+ CHARTYPE=ansi
+ UNICODEOPT=--disable-unicode
+ PYUNICODEOPT=0
+fi
+
+if [ $debug == yes ]; then
+ DEBUG_FLAG=--enable-debug
+ PYDEBUGOPT=--debug
+else
+ DEBUG_FLAG=--enable-debug_flag
+ PYDEBUGOPT=
+fi
+
+
+# Test if the python we are using is the System installed framework
+# or one that was installed by the user. This changes where the
+# site-packages (or its alias) is located in the installer tree.
+APPLE_PYTHON=no
+if [ -e /Library/Python/$PYVER ] && [ `dirname $PYTHON` == "/usr/bin" ]; then
+ APPLE_PYTHON=yes
+fi
+
+
+
if [ -z "$TARBALLDIR" ]; then
-
- # this is a spot on my fileserver where the tarballs go, adjust
- # as needed for where you put the wxPython tarball...
+ # this is a spot on my fileserver where the tarballs go, adjust
+ # as needed for where you put the wxPython tarball, or set
+ # TARBALLDIR before invoking this script...
TARBALLDIR=/stuff/Development/wxPython/dist/$VERSION
fi
+TARBALL=$TARBALLDIR/wxPython-src-$VERSION.tar.bz2
+
+if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2 ]; then
+ echo "-------------------------------------------------------"
+ echo " WARNING: Demo tarball not found, will skip building "
+ echo " the Demo app bundle and etc."
+ echo " $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2"
+ echo "-------------------------------------------------------"
+fi
+
+if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2 ]; then
+ echo "-------------------------------------------------------"
+ echo " WARNING: Docs tarball not found, will skip building "
+ echo " the the wxDocsViewer app bundle and etc."
+ echo " $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2"
+ echo "-------------------------------------------------------"
+fi
+
-TARBALL=$TARBALLDIR/wxPythonSrc-$VERSION.tar.gz
-PREFIX=/usr/local/lib/wxPython-$VERSION
+
+PREFIX=/usr/local/lib/wxPython-$CHARTYPE-$VERSION
BINPREFIX=/usr/local/bin
+SWIGBIN=/opt/swig/bin/swig
WXROOT=`dirname $PWD`
PROGDIR="`dirname \"$0\"`"
TMPDIR=$PWD/_build_dmg
BUILDROOT=$TMPDIR/build
-INSTALLROOT=$TMPDIR/install
-INSTALLDEVEL=$TMPDIR/install-devel
+
+INSTALLROOT=$TMPDIR/install-root
+INSTALLAPPS=$TMPDIR/install-apps
+
DMGDIR=$TMPDIR/dmg
+DMGROOT=$DMGDIR/root
+DMGAPPS=$DMGDIR/apps
+
RESOURCEDIR=$PROGDIR/resources
DESTDIR=$PWD/dist
-SRCROOT=$BUILDROOT/wxPythonSrc-$VERSION
+SRCROOT=$BUILDROOT/wxPython-src-$VERSION
#----------------------------------------------------------------------
mkdir -p $BUILDROOT
mkdir -p $INSTALLROOT
-#mkdir -p $INSTALLDEVEL
+mkdir -p $INSTALLAPPS
+
rm -rf $DMGDIR
-mkdir -p $DMGDIR/root/Apps
-mkdir -p $DMGDIR/root/Docs
-mkdir -p $DMGDIR/root/Samples
+mkdir -p $DMGROOT
+mkdir -p $DMGAPPS/Docs
+mkdir -p $DMGAPPS/Samples
+if [ ! -d $DESTDIR ]; then
+ mkdir $DESTDIR
+fi
pushd $BUILDROOT
#----------------------------------------------------------------------
# Unpack the tarball
-if [ -z "$skiptar" ]; then
+if [ $skiptar != yes ]; then
echo Unarchiving tarball...
- tar xzf $TARBALL
+ tar xjf $TARBALL
+fi
+
+if [ $inplace = no ]; then
+ # make a build dir and cd to it.
+ cd wxPython-src-$VERSION
+ WXDIR=`pwd`
+ mkdir -p $WXDIR/bld
+ cd $WXDIR/bld
+ WXBLD=$WXDIR/bld
+else
+
+ # If building "inplace" then our build dir will be off of the
+ # WXROOT like normal, adjust the variables to find things that
+ # way.
+ WXBLD=$WXROOT/build-$CHARTYPE
+ mkdir -p $WXBLD
+ cd $WXBLD
+ WXDIR=..
+ SRCROOT=$WXROOT
fi
-cd wxPythonSrc-$VERSION
-WXDIR=`pwd`
-mkdir -p $WXDIR/bld
-cd $WXDIR/bld
+echo "Using wx root dir: $WXROOT"
+echo "Using build dir: $WXBLD"
+echo "Using source tree: $WXDIR"
#----------------------------------------------------------------------
+if [ $OSX_VERSION = 10.3 -o $OSX_VERSION = 10.4 ]; then
+ OTHER_CFG_OPTS=--enable-mediactrl
+fi
# Configure wxWidgets
-if [ -z "$skipconfig" ]; then
- ../configure \
+if [ $skipconfig != yes -a $universal != yes ]; then
+ $WXDIR/configure \
--prefix=$PREFIX \
--with-mac \
- --disable-monolithic \
+ --enable-monolithic \
--with-opengl \
--enable-sound \
--enable-display \
--enable-geometry \
+ $DEBUG_FLAG \
--enable-precomp=no \
- --enable-debug_flag
-
-## --enable-optimise \
-## --with-libjpeg=builtin \
-## --with-libpng=builtin \
-## --with-libtiff=builtin \
-## --with-zlib=builtin \
+ --enable-optimise \
+ --disable-debugreport \
+ --disable-precompiled-headers \
+ $UNICODEOPT $OTHER_CFG_OPTS
fi
# Build wxWidgets and wxPython
-if [ -z "$skipbuild" ]; then
+if [ $skipbuild != yes ]; then
# Make wxWidgets and some contribs
- make
- make -C contrib/src/gizmos
- make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
- make -C contrib/src/stc
- make -C contrib/src/xrc
-
-# if [ ! -e $WXDIR/include/wx/gizmos ]; then
-# # Make some links so the wxPython build can find all the headers it needs
-# pushd $WXDIR/include/wx
-# ln -s ../../contrib/include/wx/* .
-# popd
-# fi
+ WXBLD_CONFIG="$WXBLD/wx-config"
+ if [ $universal = yes ]; then
+ export WXROOT
+ export BUILDPREFIX=$PREFIX
+ export INSTALLDIR=$INSTALLROOT$PREFIX
+ $WXDIR/distrib/scripts/mac/macbuild wxpython universal $CHARTYPE
+ else
+ make $MAKEJOBS
+ make $MAKEJOBS -C contrib/src/animate
+ make $MAKEJOBS -C contrib/src/gizmos
+ make $MAKEJOBS -C contrib/src/stc
+ fi
+
+ SWIGIT=0
+ if [ $reswig = yes ]; then
+ SWIGIT=1
+ fi
# Build wxPython
- cd $WXDIR/wxPython
+ cd $WXROOT/wxPython
$PYTHON setup.py \
+ UNICODE=$PYUNICODEOPT \
NO_SCRIPTS=1 \
- WX_CONFIG="$WXDIR/bld/wx-config --inplace" \
+ EP_ADD_OPTS=1 \
+ WX_CONFIG="$WXBLD_CONFIG --inplace" \
+ BUILD_BASE=$WXBLD/wxPython \
+ SWIG=$SWIGBIN \
+ USE_SWIG=$SWIGIT \
build
-
-
- # Build wxrc (XRC resource tool)
- cd $WXDIR/bld/contrib/utils/wxrc
- make
- strip wxrc
-
fi
#----------------------------------------------------------------------
-if [ -z "$skipinstall" ]; then
+if [ $skipinstall != yes ]; then
# Install wxWidgets
- cd $WXDIR/bld
- make 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/stc prefix=$INSTALLROOT$PREFIX install
- make -C contrib/src/xrc prefix=$INSTALLROOT$PREFIX install
+ cd $WXBLD
+ if [ $universal != yes ]; then
+ make prefix=$INSTALLROOT$PREFIX install
+ make -C contrib/src/animate prefix=$INSTALLROOT$PREFIX install
+ make -C contrib/src/gizmos prefix=$INSTALLROOT$PREFIX install
+ make -C contrib/src/stc prefix=$INSTALLROOT$PREFIX install
+ fi
+ # relink wx-config with a relative link
+ cd $INSTALLROOT$PREFIX/bin
+ rm wx-config
+ ln -s ../lib/wx/config/* wx-config
# and wxPython
- cd $WXDIR/wxPython
+ cd $WXROOT/wxPython
$PYTHON setup.py \
+ UNICODE=$PYUNICODEOPT \
NO_SCRIPTS=1 \
- WX_CONFIG="$INSTALLROOT/$PREFIX/bin/wx-config --prefix=$INSTALLROOT/$PREFIX" \
+ EP_ADD_OPTS=1 \
+ WX_CONFIG="$INSTALLROOT$PREFIX/bin/wx-config --prefix=$INSTALLROOT$PREFIX" \
+ BUILD_BASE=$WXBLD/wxPython \
install \
--root=$INSTALLROOT
- # Apple's Python (on Panther) sym-links the site-packages dir to
+ # Apple's Python Framework (such as what comes with Panther)
+ # sym-links the site-packages dir in the framework to
# /Library/Python/$PYVER so we need to move the files so they are
# installed in the physical location, not the virtual one.
- if [ "$KIND" = "panther" ]; then
+ if [ $APPLE_PYTHON == yes ]; then
+ if [ -e $INSTALLROOT/Library/Python/$PYVER ]; then
+ rm -r $INSTALLROOT/Library/Python/$PYVER
+ fi
mkdir -p $INSTALLROOT/Library/Python/$PYVER
mv $INSTALLROOT/$SITEPACKAGES/* $INSTALLROOT/Library/Python/$PYVER
rm -r $INSTALLROOT/System
SITEPACKAGES=/Library/Python/$PYVER
fi
-
# install wxPython's tool scripts
mkdir -p $INSTALLROOT$BINPREFIX
- cd $WXDIR/wxPython/scripts
+ cd $WXROOT/wxPython/scripts
python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX
- # Install wxrc
- cp $WXDIR/bld/contrib/utils/wxrc/wxrc $INSTALLROOT$BINPREFIX
-
+ # Remove the .pyc/.pyo files they just take up space and can be recreated
+ # during the install.
+ pushd $WXROOT/wxPython
+ $PYTHON $PROGDIR/../zappycfiles.py $INSTALLROOT > /dev/null
+ popd
- # Set premissions for files in $INSTALLROOT
+ # Set premissions for files in $INSTALLROOT
if [ "$UID" = "0" ]; then
chown -R root:admin $INSTALLROOT
chmod -R g+w $INSTALLROOT
fi
fi
+if [ $APPLE_PYTHON == yes ]; then
+ SITEPACKAGES=/Library/Python/$PYVER
+fi
+PKGDIR=`cat $INSTALLROOT$SITEPACKAGES/wx.pth`
+
popd
#----------------------------------------------------------------------
# Make the Installer packages and disk image
-if [ -z "$skipdmg" ]; then
-
- # Remove the .pyc/.pyo files they just take up space and can be recreated
- # during the install.
- $PYTHON $PROGDIR/../zappycfiles.py $INSTALLROOT
+if [ $skipdmg != yes ]; then
+ #-----------------------------------------------
+ # The main runtime installer package
# Make the welcome message
- case $KIND in
- panther) W_MSG="the Panther (OS X 10.3.x) version of" ;;
- jaguar) W_MSG="the Jaguar (OS X 10.2.x) version of" ;;
+ case $OSX_VERSION in
+ 10.4) W_MSG="the Tiger (OS X 10.4.x Intel) version of" ;;
+ 10.3) W_MSG="the Panther (OS X 10.3.x) version of" ;;
+ 10.2) W_MSG="the Jaguar (OS X 10.2.x) version of" ;;
esac
+
+ if [ $universal == yes ]; then
+ W_MSG="the Universal (OS X 10.4.x and above) version of"
+ fi
+
+
cat > $RESOURCEDIR/Welcome.txt <<EOF
Welcome!
-This program will install wxPython $VERSION for $W_MSG MacPython-OSX $PYVER.
+This Installer package will install the wxPython $CHARTYPE runtime $VERSION for $W_MSG MacPython-OSX $PYVER. This includes:
+
+ * The wxPython packages and modules
+ * The wxWidgets shared libraries and headers
+ * Some command line tool scripts, installed to /usr/local/bin.
+
+You must install onto your current boot disk, eventhough the installer does not enforce this, otherwise things will not work.
-You must install onto your current boot disk, even though the installer does not enforce this, otherwise things will not work.
+You can install more than one version of the wxPython runtime if you desire. The most recently installed version will be the default wxPython, but you can choose another by setting the PYTHONPATH or by using the wxversion module. See http://wiki.wxpython.org/index.cgi/MultiVersionInstalls for more details.
Build date: `date`
EOF
# Cleanup any old install of the wxPython package
rm -rf \$2$SITEPACKAGES/wxPython
rm -rf \$2$SITEPACKAGES/wx
+rm -rf \$2$SITEPACKAGES/$PKGDIR
exit 0
EOF
chmod +x $RESOURCEDIR/preflight
cat > $RESOURCEDIR/postflight <<EOF
#!/bin/sh -e
# Compile the .py files in the wxPython pacakge
-$PYTHON \$2$PYLIB/compileall.py \$2$SITEPACKAGES/wxPython
-$PYTHON \$2$PYLIB/compileall.py \$2$SITEPACKAGES/wx
-$PYTHON -O \$2$PYLIB/compileall.py \$2$SITEPACKAGES/wxPython
-$PYTHON -O \$2$PYLIB/compileall.py \$2$SITEPACKAGES/wx
-
+$PYTHON \$2$PYLIB/compileall.py \$2$SITEPACKAGES/$PKGDIR
+$PYTHON -O \$2$PYLIB/compileall.py \$2$SITEPACKAGES/$PKGDIR
# and all of the wxPython pacakge should be group writable
-chgrp -R admin \$2$SITEPACKAGES/wxPython
-chmod -R g+w \$2$SITEPACKAGES/wxPython
-chgrp -R admin \$2$SITEPACKAGES/wx
-chmod -R g+w \$2$SITEPACKAGES/wx
+chgrp -R admin \$2$SITEPACKAGES/$PKGDIR
+chmod -R g+w \$2$SITEPACKAGES/$PKGDIR
exit 0
EOF
chmod +x $RESOURCEDIR/postflight
-
+
# Build the main Installer Package...
- rm -rf wxPythonOSX-$KIND.pkg
- python $PROGDIR/../buildpkg.py \
- --Title=wxPythonOSX-$KIND \
+ PKGNAME=wxPython${SHORTVER}-osx-$CHARTYPE-$TAG
+ if [ $PYVER != 2.3 ]; then
+ PKGNAME=wxPython${SHORTVER}-osx-$CHARTYPE-$TAG-py$PYVER
+ fi
+ rm -rf $PKGNAME.pkg
+ $PYTHON $PROGDIR/../buildpkg.py \
+ --Title=$PKGNAME \
--Version=$VERSION \
- --Description="wxPython $VERSION for $W_MSG MacPython-OSX $PYVER" \
+ --Description="wxPython $CHARTYPE runtime $VERSION for $W_MSG MacPython-OSX $PYVER" \
--NeedsAuthorization="YES" \
--Relocatable="NO" \
--InstallOnly="YES" \
$INSTALLROOT \
$RESOURCEDIR
- mv wxPythonOSX-$KIND.pkg $DMGDIR/root
+ mv $PKGNAME.pkg $DMGROOT/$PKGNAME.pkg
+ rm $RESOURCEDIR/postflight
+ rm $RESOURCEDIR/preflight
+ rm $RESOURCEDIR/Welcome.txt
- # Make a README.txt to go on the disk image
- cat > "$DMGDIR/root/README 1st.txt" <<EOF
+ #-----------------------------------------------
+ # Make a README to go on the disk image
+ cat > "$DMGROOT/README 1st.txt" <<EOF
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.
+This disk image contains the following items:
+
+ wxPython${SHORTVER}-osx-$CHARTYPE-$VERSION-$KIND
+
+ This Installer contains the wxPython runtime, compiled on a
+ $KIND OS X system, using the $CHARTYPE build of the wxWidgets
+ library. It includes the Python modules and extension
+ modules, as well as the wxWidgets libraries.
+
+ It is possible to have more than one version of the runtime
+ installed at once if you wish. The most recently installed
+ version will be the default wxPython, but you can choose
+ another by setting the PYTHONPATH or by using the wxversion
+ module. For more details see:
+ http://wiki.wxpython.org/index.cgi/MultiVersionInstalls
+
+
+ uninstall_wxPython.py
+
+ A simple tool to help you manage your installed versions of
+ wxPython. It will allow you to choose from the currently
+ installed wxPython packages and to select one for
+ uninstallation. It is a text-mode tool so you can either run
+ it from a Terminal command line, or you can open it with
+ PythonLauncher and let it create a Terminal to run it in.
+
+ NOTE: If you have versions prior to 2.5.3.1 installed, please
+ do run this uninstall tool to remove the older version.
+
+EOF
+
+
+
+ cp $PROGDIR/../uninstall_wxPython.py $DMGROOT
+
- wxPython-$KIND.pkg The installer package. It contains the wxPython
- extension modules, wxMac dynamic libraries and
- headers, and some scripts for the command-line
- tools.
+ #-----------------------------------------------
+ # Make a disk image to hold these files
+ dmgname=wxPython${SHORTVER}-osx-$CHARTYPE-$VERSION-$TAG-py$PYVER
+ $PROGDIR/../makedmg $DMGROOT $DMGDIR $dmgname
-Everything else here is optional and you can drag them out of the disk
-image and drop them whereever you want. You do need to install the above
-package before you can use any of the items below.
+ echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR
+ mv $DMGDIR/$dmgname.dmg $DESTDIR/$dmgname.dmg
- Apps/wxPython Demo An application bundle version of the demo.
- (This has it's own copy of the sources within
- the bundle.)
+#---------------------------------------------------------------------------
+# Now create app bundles for the demo, docs, and tools and make another
+# disk image to hold it all.
+#---------------------------------------------------------------------------
- Apps/XRCed An application for editing wxPython resource
+ cat > "$DMGAPPS/README 1st.txt" <<EOF
+Welcome to wxPython!
+
+On this disk image you will find Demo, Tools, Docs, and etc. for
+wxPython $VERSION. Everything here is optional and you can drag them
+out of the disk image and drop them wherever you want. You will need
+to have an installed wxPython runtime to be able to use any of them.
+
+
+ wxPython Demo An application bundle version of the demo.
+ (This has it's own copy of the demo sources
+ within the bundle.)
+
+ XRCed An application for editing wxPython resource
files (XRC files.)
- Apps/PyCrust An application that provides an interactive
+ PyCrust An application that provides an interactive
Python shell and also namespace inspectors.
- Docs/wxDocsViewer An application that allows you to view the
+ Docs/wxDocsViewer An application that allows you to view the
wxWidgets documentation.
Docs/licence License files.
- Docs/other A few readmes, change log, etc.
+ Docs/other A few readmes, change log, etc.
- Samples/samples Several small sample applications that
+ Samples/samples Several small sample applications that
demonstrate how to use wxPython.
- Samples/demo A copy of the wxPython demo source code,
+ Samples/demo A copy of the wxPython demo source code,
just open the folder and run demo.pyw.
Happy Hacking!
EOF
-# PyAlaMode An extension of PyCrust that includes source
+# PyAlaMode An extension of PyCrust that includes source
# file editing capabilities.
# wxDocs
- pushd $BUILDROOT
- tar xzvf $TARBALLDIR/wxPythonDocs-$VERSION.tar.gz
- popd
+ if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2 ]; then
+ cat > "$DMGAPPS/Docs/Build ERROR.txt" <<EOF
- # Make an app to launch viewdocs.py
- $PYTHONW $PROGDIR/../buildapp.py \
- --builddir=$DMGDIR/root/Docs \
- --name=wxDocsViewer \
- --mainprogram=$BUILDROOT/wxPython-$VERSION/docs/viewdocs.py \
- --iconfile=$PROGDIR/Info.icns \
- build
+The wxPython-docs tarball was not found when building this disk image!
- cp $BUILDROOT/wxPython-$VERSION/docs/*.zip $DMGDIR/root/Docs/wxDocsViewer.app/Contents/Resources
+EOF
+
+ else
+ pushd $BUILDROOT
+ tar xjvf $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2
+ popd
+
+ # Make an app to launch viewdocs.py
+ $PYTHONW $PROGDIR/../buildapp.py \
+ --builddir=$DMGAPPS/Docs \
+ --name=wxDocsViewer \
+ --mainprogram=$BUILDROOT/wxPython-$VERSION/docs/viewdocs.py \
+ --iconfile=$PROGDIR/Info.icns \
+ build
+
+ cp $BUILDROOT/wxPython-$VERSION/docs/*.zip $DMGAPPS/Docs/wxDocsViewer.app/Contents/Resources
- cat > "$DMGDIR/root/Docs/README 1st.txt" <<EOF
+ cat > "$DMGAPPS/Docs/README 1st.txt" <<EOF
The wxDocsViewer application needs to be copied to your Desktop (or
someplace else you have write access to) before you can run it, so it
EOF
+ fi
+
# license files, docs, etc.
- pushd $DMGDIR/root/Docs
+ pushd $DMGAPPS/Docs
cp -pR $SRCROOT/wxPython/licence .
cp -pR $SRCROOT/wxPython/docs .
rm -rf docs/bin
rm -rf docs/xml-raw
mv docs other
popd
-
- # Copy the demo and samples to the disk image from the tarball
- pushd $DMGDIR/root/Samples
- tar xzvf $TARBALLDIR/wxPythonDemo-$VERSION.tar.gz
- mv wxPython-$VERSION/* .
- rm -rf wxPython-$VERSION
- rm demo/b demo/.setup.sh
- mv demo/demo.py demo/demo.pyw
- popd
-
+
+
+ if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2 ]; then
+ cat > "$DMGAPPS/Samples/Build ERROR.txt" <<EOF
+
+The wxPython-$VERSION-demo tarball was not found when building this disk image!
+
+EOF
+ cp "$DMGAPPS/Samples/Build ERROR.txt" $DMGAPPS
+
+ else
+
+ # Copy the demo and samples to the disk image from the tarball
+ pushd $DMGAPPS/Samples
+ tar xjvf $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2
+ mv wxPython-$VERSION/* .
+ rm -rf wxPython-$VERSION
+ rm -f demo/b demo/.setup.sh
+ mv demo/demo.py demo/demo.pyw
+ popd
+
+ # Make an app bundle to run the demo
+ $PYTHONW $PROGDIR/../buildapp.py \
+ --builddir=$DMGAPPS \
+ --name="wxPython Demo" \
+ --mainprogram=$DMGAPPS/Samples/demo/demo.pyw \
+ --iconfile=$PROGDIR/RunDemo.icns \
+ build
+ cp -pR $DMGAPPS/Samples/demo/* "$DMGAPPS/wxPython Demo.app/Contents/Resources"
+ fi
+
# Make an app bundle to launch PyCrust
$PYTHONW $PROGDIR/../buildapp.py \
- --builddir=$DMGDIR/root/Apps \
+ --builddir=$DMGAPPS \
--name=PyCrust \
--mainprogram=$INSTALLROOT$BINPREFIX/pycrust.py \
--iconfile=$PROGDIR/PieShell.icns \
build
-# # and PyAlaMode
-# $PYTHONW $PROGDIR/../buildapp.py \
-# --builddir=$DMGDIR/root \
-# --name=PyAlaMode \
-# --mainprogram=$INSTALLROOT$BINPREFIX/pyalamode.py \
-# --iconfile=$PROGDIR/PieShell.icns \
-# build
+## TODO: PyAlaMode needs tweaked to be able to run from a bundle. It
+## needs to know to ignore command line parameters and etc...
+# # and PyAlaMode
+# $PYTHONW $PROGDIR/../buildapp.py \
+# --builddir=$DMGAPPS \
+# --name=PyAlaMode \
+# --mainprogram=$INSTALLROOT$BINPREFIX/pyalamode.py \
+# --iconfile=$PROGDIR/PieShell.icns \
+# build
# Make an app to launch XRCed
$PYTHONW $PROGDIR/../buildapp.py \
- --builddir=$DMGDIR/root/Apps \
+ --builddir=$DMGAPPS \
--name=XRCed \
--mainprogram=$INSTALLROOT$BINPREFIX/xrced.py \
--iconfile=$PROGDIR/XRCed.icns \
build
- # Make an app bundle to run the demo
- $PYTHONW $PROGDIR/../buildapp.py \
- --builddir=$DMGDIR/root/Apps \
- --name="wxPython Demo" \
- --mainprogram=$DMGDIR/root/Samples/demo/demo.pyw \
- --iconfile=$PROGDIR/RunDemo.icns \
- build
- cp -pR $DMGDIR/root/Samples/demo/* "$DMGDIR/root/Apps/wxPython Demo.app/Contents/Resources"
-
- # and then finally make a disk image containing the packages and etc.
- $PROGDIR/../makedmg $DMGDIR/root $DMGDIR wxPythonOSX-$VERSION-$KIND-Py$PYVER
- echo Moving $DMGDIR/wxPythonOSX-$VERSION-$KIND-Py$PYVER.dmg to $DESTDIR
- mv $DMGDIR/wxPythonOSX-$VERSION-$KIND-Py$PYVER.dmg $DESTDIR
+ # and then finally make a disk image containing everything
+ dmgname=wxPython${SHORTVER}-osx-docs-demos-$VERSION-$TAG-py$PYVER
+ $PROGDIR/../makedmg $DMGAPPS $DMGDIR $dmgname
+
+ echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR
+ mv $DMGDIR/$dmgname.dmg $DESTDIR/$dmgname.dmg
fi
# Cleanup build/install dirs
-if [ -z "$skipclean" ]; then
+if [ $skipclean != yes ]; then
echo "Cleaning up..."
rm -rf $TMPDIR
else
echo "Cleanup is disabled. You should remove $TMPDIR when finished"
fi
+exit 0
projects / wxWidgets.git / blobdiff