X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80625543f551252c5fe20bc0449660de44b0eba0..28d1454afff5ae41bb10cd511f308849b4390abf:/wxPython/distrib/mac/wxPythonOSX/build?ds=sidebyside diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build index bb766cb256..24d9d2bb00 100755 --- a/wxPython/distrib/mac/wxPythonOSX/build +++ b/wxPython/distrib/mac/wxPythonOSX/build @@ -10,6 +10,13 @@ if [ ! -d wxPython -o ! -e ${spectemplate} ]; then exit 1 fi +if [ "$UID" != "0" ]; then + echo "-------------------------------------------------------" + echo " WARNING: will be unable to change ownership of files" + echo " unless this script is run as root or via sudo" + echo "-------------------------------------------------------" +fi + #---------------------------------------------------------------------- # Check Parameters @@ -22,7 +29,8 @@ function usage { echo "" echo "optional command flags:" echo " skiptar Don't unpack the tarball" - echo " use_cvs Use the CVS workspace instead of a tarfile" + 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 " skipconfig Don't run configure" echo " skipbuild Don't build wxWidgets or wxPython" echo " skipinstall Don't do the installation step" @@ -46,16 +54,23 @@ esac PYTHONW=${PYTHON}w shift +skiptar=no +skipconfig=no +skipbuild=no +skipinstall=no +skipdmg=no +skipclean=no +inplace=no for flag in $*; do case ${flag} in - skiptar) skiptar=1 ;; - use_cvs) skiptar=1; use_cvs=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 ;; *) echo "Unknown flag \"${flag}\"" usage @@ -69,12 +84,38 @@ 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 [ -z "$TARBALLDIR" ]; then + # 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.gz + +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/wxPython-demo-$VERSION.tar.gz" + echo "-------------------------------------------------------" +fi + +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/wxPython-docs-$VERSION.tar.gz" + echo "-------------------------------------------------------" +fi -TARBALLDIR=/stuff/Development/wxPython/dist/$VERSION -TARBALL=$TARBALLDIR/wxPythonSrc-$VERSION.tar.gz -PREFIX=/usr/lib/wxPython-$VERSION -BINPREFIX=/usr/bin + + +PREFIX=/usr/local/lib/wxPython-$VERSION +BINPREFIX=/usr/local/bin WXROOT=`dirname $PWD` PROGDIR="`dirname \"$0\"`" @@ -86,7 +127,7 @@ INSTALLDEVEL=$TMPDIR/install-devel DMGDIR=$TMPDIR/dmg RESOURCEDIR=$PROGDIR/resources DESTDIR=$PWD/dist -SRCROOT=$BUILDROOT/wxPythonSrc-$VERSION +SRCROOT=$BUILDROOT/wxPython-src-$VERSION #---------------------------------------------------------------------- @@ -107,64 +148,46 @@ pushd $BUILDROOT #---------------------------------------------------------------------- # Unpack the tarball -if [ -z "$skiptar" ]; then +if [ $skiptar != yes ]; then echo Unarchiving tarball... tar xzf $TARBALL fi -if [ "$use_cvs" = 1 ]; then - # copy the cvs workspace, except for build dirs - - mkdir -p wxPythonSrc-$VERSION - - echo Finding updated files... - if [ -e .last_copy ]; then - FEXPR="-cnewer .last_copy" - fi - MEASURE=$WXROOT// - find $WXROOT $FEXPR -print \ - | grep -v $WXROOT/bld \ - | grep -v wxPython/build \ - | grep -v wxPython/_build \ - | grep -v CVS \ - | grep -v .pyc \ - | cut -b ${#MEASURE}- > filelist - - for x in `cat filelist`; do - if [ -d "$WXROOT/$x" ]; then - mkdir -p "wxPythonSrc-$VERSION/$x" - else - echo $x - cp -p "$WXROOT/$x" "wxPythonSrc-$VERSION/$x" - fi - done - - touch .last_copy +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 BUILDROOT, + # adjust the variables to find things that way. + WXDIR=$WXROOT + SRCROOT=$WXROOT + WXBLD=$BUILDROOT fi - -cd wxPythonSrc-$VERSION -WXDIR=`pwd` -mkdir -p $WXDIR/bld -cd $WXDIR/bld +echo "Using source tree: $WXDIR" +echo "Using build dir: $WXBLD" #---------------------------------------------------------------------- # Configure wxWidgets -if [ -z "$skipconfig" ]; then - ../configure \ +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 \ -## --enable-optimise \ ## --with-libjpeg=builtin \ ## --with-libpng=builtin \ ## --with-libtiff=builtin \ @@ -173,54 +196,52 @@ if [ -z "$skipconfig" ]; then fi # Build wxWidgets and wxPython -if [ -z "$skipbuild" ]; then +if [ $skipbuild != yes ]; then # Make wxWidgets and some contribs - make - make -C contrib/src/gizmos + + # 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 -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 # Build wxPython cd $WXDIR/wxPython $PYTHON setup.py \ NO_SCRIPTS=1 \ - WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \ + EP_ADD_OPTS=1 \ + WX_CONFIG="$WXBLD/wx-config --inplace" \ + BUILD_BASE=$WXBLD/wxPython \ 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 + cd $WXBLD 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 + # 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 \ NO_SCRIPTS=1 \ + EP_ADD_OPTS=1 \ WX_CONFIG="$INSTALLROOT/$PREFIX/bin/wx-config --prefix=$INSTALLROOT/$PREFIX" \ + BUILD_BASE=$WXBLD/wxPython \ install \ --root=$INSTALLROOT @@ -229,6 +250,9 @@ if [ -z "$skipinstall" ]; then # /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 [ -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 @@ -242,32 +266,25 @@ if [ -z "$skipinstall" ]; then python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX - # Install wxrc - cp $WXDIR/bld/contrib/utils/wxrc/wxrc $INSTALLROOT$BINPREFIX - - -# # install the wxPython headers -# cd $WXDIR/wxPython -# cp -R include $INSTALLROOT$PREFIX -# mkdir -p $INSTALLROOT$PREFIX/include/wx/wxPython/i_files -# cp src/*.i $INSTALLROOT$PREFIX/include/wx/wxPython/i_files - - - # Set premissions for files in $INSTALLROOT - chown -R root:admin $INSTALLROOT - chmod -R g+w $INSTALLROOT + # Set premissions for files in $INSTALLROOT + if [ "$UID" = "0" ]; then + chown -R root:admin $INSTALLROOT + chmod -R g+w $INSTALLROOT + fi fi +PKGDIR=`cat $INSTALLROOT/Library/Python/$PYVER/wx.pth` + popd #---------------------------------------------------------------------- # Make the Installer packages and disk image -if [ -z "$skipdmg" ]; then +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 + $PYTHON $PROGDIR/../zappycfiles.py $INSTALLROOT > /dev/null # Make the welcome message @@ -291,6 +308,7 @@ 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 @@ -299,17 +317,13 @@ EOF cat > $RESOURCEDIR/postflight < "$DMGDIR/root/README 1st.txt" < "$DMGDIR/root/Docs/Build ERROR.txt" < "$DMGDIR/root/Docs/README 1st.txt" < "$DMGDIR/root/Docs/README 1st.txt" < "$DMGDIR/root/Samples/Build ERROR.txt" <