From: Robin Dunn Date: Wed, 21 Jan 2004 20:53:39 +0000 (+0000) Subject: Changes needed to put the Panther version in the right place, also X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c6387bc1c5d09109a9bf3fef8ed15a977767d9dc Changes needed to put the Panther version in the right place, also changed to using "panther" and "jaguar" in the names. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build index 99d4a30e96..5deb6e4c45 100755 --- a/wxPython/distrib/mac/wxPythonOSX/build +++ b/wxPython/distrib/mac/wxPythonOSX/build @@ -17,9 +17,8 @@ function usage { echo "" echo "Usage: $0 [apple|local] [command flags...]" echo "" - echo " apple Build for Apple's python in /usr/bin" - echo " local Build for a locally installed python in /usr/local/bin" - echo " (for example Jaguar's MacPython)" + 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 "" echo "optional command flags:" echo " skiptar Don't unpack the tarball" @@ -40,9 +39,9 @@ fi KIND=$1 case $KIND in - apple) PYTHON=/usr/bin/python ;; - local) PYTHON=/usr/local/bin/python ;; - *) usage; exit 1 ;; + panther) PYTHON=/usr/bin/python ;; + jaguar) PYTHON=/usr/local/bin/python ;; + *) usage; exit 1 ;; esac PYTHONW=${PYTHON}w shift @@ -68,7 +67,8 @@ done VERSION=`$PYTHON -c "import setup;print setup.VERSION"` PYVER=`$PYTHON -c "import sys; print sys.version[:3]"` PYPREFIX=`$PYTHON -c "import sys; print sys.exec_prefix"` -SITEPACKAGES=$PYPREFIX/lib/python$PYVER/site-packages +PYLIB=$PYPREFIX/lib/python$PYVER +SITEPACKAGES=$PYLIB/site-packages SRCDIR=/stuff/Development/wxPython/dist/$VERSION TARBALL=$SRCDIR/wxPythonSrc-$VERSION.tar.gz @@ -201,9 +201,9 @@ if [ -z "$skipbuild" ]; then fi #---------------------------------------------------------------------- -# Install wxWindows if [ -z "$skipinstall" ]; then + # Install wxWindows cd $WXDIR/bld make prefix=$INSTALLROOT$PREFIX install make -C contrib/src/gizmos prefix=$INSTALLROOT$PREFIX install @@ -221,11 +221,23 @@ if [ -z "$skipinstall" ]; then --root=$INSTALLROOT + # Apple's Python (on Panther) sym-links the site-packages dir 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 + 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 python$PYVER CreateMacScripts.py $INSTALLROOT $BINPREFIX + # Install wxrc cp $WXDIR/bld/contrib/utils/wxrc/wxrc $INSTALLROOT$BINPREFIX @@ -237,7 +249,7 @@ if [ -z "$skipinstall" ]; then cp src/*.i $INSTALLROOT$PREFIX/include/wx/wxPython/i_files - # TODO for $INSTALLROOT and $INSTALLDEVEL ? + # Set premissions for files in $INSTALLROOT chown -R root:admin $INSTALLROOT chmod -R g+w $INSTALLROOT fi @@ -256,14 +268,16 @@ if [ -z "$skipdmg" ]; then # Make the welcome message case $KIND in - apple) W_MSG="an Apple installed (Panther) version of" ;; - local) W_MSG="a locally built version (or Jaguar version) of" ;; + 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.txt < "$DMGDIR/root/README 1st.txt" <