X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81de4ba3adca9f6f669ed17827894318d8a9ae65..79db03c99e12cb3ff08404ef01cb614cbd659042:/wxPython/distrib/mac/wxPythonOSX/build?ds=sidebyside diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build index e46fbeafde..0e6e4adda8 100755 --- a/wxPython/distrib/mac/wxPythonOSX/build +++ b/wxPython/distrib/mac/wxPythonOSX/build @@ -31,6 +31,7 @@ function usage { 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 " 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" @@ -61,6 +62,7 @@ skipinstall=no skipdmg=no skipclean=no inplace=no +unicode=no for flag in $*; do case ${flag} in @@ -71,6 +73,7 @@ for flag in $*; do skipdmg) skipdmg=yes ;; skipclean) skipclean=yes ;; inplace) inplace=yes; skiptar=yes ;; + unicode) unicode=yes ;; *) echo "Unknown flag \"${flag}\"" usage @@ -84,7 +87,17 @@ PYVER=`$PYTHON -c "import sys; print sys.version[:3]"` PYPREFIX=`$PYTHON -c "import sys; print sys.exec_prefix"` PYLIB=$PYPREFIX/lib/python$PYVER SITEPACKAGES=$PYLIB/site-packages +SHORTVER=`echo $VERSION | cut -c 1,2,3` +if [ $unicode == yes ]; then + CHARTYPE=unicode + UNICODEOPT=--enable-unicode + PYUNICODEOPT=1 +else + CHARTYPE=ansi + UNICODEOPT=--disable-unicode + PYUNICODEOPT=0 +fi if [ -z "$TARBALLDIR" ]; then @@ -93,28 +106,28 @@ if [ -z "$TARBALLDIR" ]; then # TARBALLDIR before invoking this script... TARBALLDIR=/stuff/Development/wxPython/dist/$VERSION 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 " WARNING: Demo tarball not found, will skip building " echo " the Demo app bundle and etc." - echo " $TARBALLDIR/wxPythonDemo-$VERSION.tar.gz" + echo " $TARBALLDIR/wxPython-demo-$VERSION.tar.gz" echo "-------------------------------------------------------" fi -if [ ! -e $TARBALLDIR/wxPythonDocs-$VERSION.tar.gz ]; then +if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.gz ]; then echo "-------------------------------------------------------" echo " WARNING: Docs tarball not found, will skip building " echo " the the wxDocsViewer app bundle and etc." - echo " $TARBALLDIR/wxPythonDocs-$VERSION.tar.gz" + echo " $TARBALLDIR/wxPython-docs-$VERSION.tar.gz" echo "-------------------------------------------------------" fi -PREFIX=/usr/local/lib/wxPython-$VERSION +PREFIX=/usr/local/lib/wxPython-$CHARTYPE-$VERSION BINPREFIX=/usr/local/bin WXROOT=`dirname $PWD` @@ -122,12 +135,17 @@ 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 #---------------------------------------------------------------------- @@ -135,11 +153,12 @@ SRCROOT=$BUILDROOT/wxPythonSrc-$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 pushd $BUILDROOT @@ -155,7 +174,7 @@ fi if [ $inplace = no ]; then # make a build dir and cd to it. - cd wxPythonSrc-$VERSION + cd wxPython-src-$VERSION WXDIR=`pwd` mkdir -p $WXDIR/bld cd $WXDIR/bld @@ -179,19 +198,16 @@ if [ $skipconfig != yes ]; then $WXDIR/configure \ --prefix=$PREFIX \ --with-mac \ - --disable-monolithic \ + --enable-monolithic \ --with-opengl \ --enable-sound \ --enable-display \ --enable-geometry \ + --enable-debug_flag \ --enable-precomp=no \ - --enable-debug_flag + --enable-optimise \ + $UNICODEOPT -## --enable-optimise \ -## --with-libjpeg=builtin \ -## --with-libpng=builtin \ -## --with-libtiff=builtin \ -## --with-zlib=builtin \ fi @@ -199,26 +215,32 @@ fi if [ $skipbuild != yes ]; then # Make wxWidgets and some contribs + + # For some reason Rez and DeRez have started locking up if run as + # root, figure out why, but in the meantime... + if [ "$UID" = "0" ]; then + chmod a+w lib + if [ "$CHARTYPE" = "ansi" ]; then + su robind -c "make lib/libwx_macd-2.5.3.r" + else + su robind -c "make lib/libwx_macud-2.5.3.r" + fi + fi + 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 # Build wxPython cd $WXDIR/wxPython $PYTHON setup.py \ + UNICODE=$PYUNICODEOPT \ NO_SCRIPTS=1 \ + EP_ADD_OPTS=1 \ WX_CONFIG="$WXBLD/wx-config --inplace" \ BUILD_BASE=$WXBLD/wxPython \ build - - - # Build wxrc (XRC resource tool) - cd $WXBLD/contrib/utils/wxrc - make - strip wxrc - fi #---------------------------------------------------------------------- @@ -230,13 +252,19 @@ if [ $skipinstall != yes ]; then 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 + # 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 $PYTHON setup.py \ + UNICODE=$PYUNICODEOPT \ NO_SCRIPTS=1 \ + EP_ADD_OPTS=1 \ WX_CONFIG="$INSTALLROOT/$PREFIX/bin/wx-config --prefix=$INSTALLROOT/$PREFIX" \ BUILD_BASE=$WXBLD/wxPython \ install \ @@ -256,16 +284,17 @@ if [ $skipinstall != yes ]; then SITEPACKAGES=/Library/Python/$PYVER fi - # install wxPython's tool scripts mkdir -p $INSTALLROOT$BINPREFIX cd $WXDIR/wxPython/scripts python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX - # Install wxrc - cp $WXBLD/contrib/utils/wxrc/wxrc $INSTALLROOT$BINPREFIX - + # Remove the .pyc/.pyo files they just take up space and can be recreated + # during the install. + pushd $WXDIR/wxPython + $PYTHON $PROGDIR/../zappycfiles.py $INSTALLROOT > /dev/null + popd # Set premissions for files in $INSTALLROOT if [ "$UID" = "0" ]; then @@ -274,6 +303,11 @@ if [ $skipinstall != yes ]; then fi fi +if [ "$KIND" = "panther" ]; then + SITEPACKAGES=/Library/Python/$PYVER +fi +PKGDIR=`cat $INSTALLROOT$SITEPACKAGES/wx.pth` + popd #---------------------------------------------------------------------- @@ -281,22 +315,28 @@ popd # Make the Installer packages and disk image if [ $skipdmg != yes ]; then - # Remove the .pyc/.pyo files they just take up space and can be recreated - # during the install. - $PYTHON $PROGDIR/../zappycfiles.py $INSTALLROOT > /dev/null - + #----------------------------------------------- + # 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" ;; esac + + cat > $RESOURCEDIR/Welcome.txt < $RESOURCEDIR/postflight < "$DMGDIR/root/README 1st.txt" < "$DMGROOT/README 1st.txt" < "$DMGAPPS/README 1st.txt" < "$DMGDIR/root/Docs/Build ERROR.txt" < "$DMGAPPS/Docs/Build ERROR.txt" < "$DMGDIR/root/Docs/README 1st.txt" < "$DMGAPPS/Docs/README 1st.txt" < "$DMGDIR/root/Samples/Build ERROR.txt" < "$DMGAPPS/Samples/Build ERROR.txt" <