diff --git a/wxPython/distrib/mac/MacPython/build b/wxPython/distrib/mac/MacPython/build index 1ec635dbd7..735c6d1673 100755 --- a/wxPython/distrib/mac/MacPython/build +++ b/wxPython/distrib/mac/MacPython/build @@ -7,11 +7,12 @@ # Script configs PYVERSION=2.3a1 PYVER=2.3 -BUILDNUM=2 +BUILDNUM=3 DOCLEANUP=no PROGDIR="`dirname \"$0\"`" TMPDIR=/tmp/_py +TMPDIR=/projects/_py BUILDROOT=$TMPDIR/build INSTALLROOT=$TMPDIR/install @@ -31,6 +32,20 @@ mkdir -p $DMGDIR/root # Configure and build Python pushd $BUILDROOT +# Check if we should build and install the docs, but only if it +# doesn't appear to be done already. TODO: fix this path to be version independent +if [ ! -e "build/temp.darwin-6.3-Power Macintosh-2.3/build-html/build-html idx" ]; then + read -p "Build the Python docs? (y/N)? " builddocs +fi + +# If the filesystem is case-sensitive then "python" will be built, but +# some parts of the install expect "python.exe which is what is built +# on a case-insensitive filesystem. Make a link just in case it is +# needed. +if [ ! -e python.exe ]; then + ln -s python python.exe +fi + # Make a link to the waste dir so that lib can be found. This allows # the PythonIDE to be built if [ ! -e waste ]; then @@ -40,9 +55,19 @@ fi $PYTHONSRC/configure --enable-framework=$INSTALLROOT/Library/Frameworks LDFLAGS=-Wl,-x make make frameworkinstall + +if [ "$builddocs" = "y" -o "$builddocs" = "Y" ]; then + ./python.exe $PYTHONSRC/Mac/OSX/setupDocs.py build + echo "" + read -p "When the help indexer is done press Enter..." ans + ./python.exe $PYTHONSRC/Mac/OSX/setupDocs.py install \ + --prefix=$INSTALLROOT/Library/Frameworks/Python.framework/Versions/$PYVER +fi + popd + # Make the Installer package: # First, remove the unix tools as their paths will be wrong. We'll recreate # them in the postinstall. @@ -71,6 +96,7 @@ python $PROGDIR/../buildpkg.py \ --NeedsAuthorization="YES" \ --Relocatable="NO" \ --InstallOnly="YES" \ + --RootVolumeOnly="YES" \ $INSTALLROOT \ $RESOURCEDIR diff --git a/wxPython/distrib/mac/MacPython/resources/Welcome.txt b/wxPython/distrib/mac/MacPython/resources/Welcome.txt index d0eaebfe8d..d302e467fe 100644 --- a/wxPython/distrib/mac/MacPython/resources/Welcome.txt +++ b/wxPython/distrib/mac/MacPython/resources/Welcome.txt @@ -2,5 +2,5 @@ Welcome! This program will install Python 2.3a1 for Mac OS X as a Framework. -Build number: 2 -Build date: Sat Jan 25 17:26:30 PST 2003 +Build number: 3 +Build date: Thu Jan 30 15:34:23 PST 2003 diff --git a/wxPython/distrib/mac/MacPython/resources/postflight b/wxPython/distrib/mac/MacPython/resources/postflight index 093084730a..7b3a635933 100755 --- a/wxPython/distrib/mac/MacPython/resources/postflight +++ b/wxPython/distrib/mac/MacPython/resources/postflight @@ -49,8 +49,10 @@ $TOOLDIR/python -Wi -tt -O \ -x badsyntax $DEST/Library/Frameworks/Python.framework/Versions/$PYVER/lib/python$PYVER -# Make the site-packages dir writable by the admin. Should anything else -# be writable too? +# Make the site-packages and other dirs writable by the admin. + +for d in lib/python$PYVER/site-packages bin; do + chgrp admin $DEST/Library/Frameworks/Python.framework/Versions/$PYVER/$d + chmod g+w $DEST/Library/Frameworks/Python.framework/Versions/$PYVER/$d +done -chgrp admin $DEST/Library/Frameworks/Python.framework/Versions/$PYVER/lib/python$PYVER/site-packages -chmod g+w $DEST/Library/Frameworks/Python.framework/Versions/$PYVER/lib/python$PYVER/site-packages