diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-05-07 08:58:11 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-05-07 08:58:11 (GMT) |
| commit | a6872b86a138ea166836cdf8c12658ff66a0ff5b (patch) | |
| tree | 7d50e3f7fb6c6a12a6b7f837415f3e6f81f87809 | |
| parent | 686b14d7ad700cfb3d3f0538695f0aa8e6c1b0b8 (diff) | |
| download | cpython-a6872b86a138ea166836cdf8c12658ff66a0ff5b.zip cpython-a6872b86a138ea166836cdf8c12658ff66a0ff5b.tar.gz cpython-a6872b86a138ea166836cdf8c12658ff66a0ff5b.tar.bz2 | |
Merged 1.2.2.1 fixes:
- Don't generate README, but ask the user to provide it.
- Create destination dir, if needed.
- Updated for 2.3b1.
| -rwxr-xr-x | Mac/OSX/Dist/build | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Mac/OSX/Dist/build b/Mac/OSX/Dist/build index a8976fa..1560ee1 100755 --- a/Mac/OSX/Dist/build +++ b/Mac/OSX/Dist/build @@ -5,9 +5,9 @@ # TODO: Parameterize the versions, builddirs, etc... # Script configs -PYVERSION=2.3a2 +PYVERSION=2.3b1 PYVER=2.3 -BUILDNUM=3 +BUILDNUM=1 DOCLEANUP=no PROGDIR="`dirname \"$0\"`" @@ -40,6 +40,14 @@ mkdir -p $DMGDIR/root # Configure and build Python pushd $BUILDROOT +# Ask the user whether s/he has edited Welcome.txt +read -p "Have you updated $RESOURCEDIR/Welcome.txt (Y/n)? " welcome + +if [ "$welcome" = "n" -o "$welcome" = "N" ]; then + echo "Please do so and retry" + exit +fi + # 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 @@ -85,16 +93,6 @@ rm -rf $INSTALLROOT/usr python $PYTHONSRC/Mac/scripts/zappycfiles.py $INSTALLROOT/Library/Frameworks/Python.framework/Versions/$PYVER/lib/python$PYVER python $PYTHONSRC/Mac/scripts/zappycfiles.py $INSTALLROOT/Library/Frameworks/Python.framework/Versions/$PYVER/Mac/Tools -# Make the welcome message -cat > $RESOURCEDIR/Welcome.txt <<EOF -Welcome! - -This program will install Python $PYVERSION for Mac OS X as a Framework. - -Build number: $BUILDNUM -Build date: `date` -EOF - # Finally, build the package... rm -rf MacPython-OSX.pkg python $PYTHONSRC/Mac/scripts/buildpkg.py \ @@ -111,9 +109,13 @@ python $PYTHONSRC/Mac/scripts/buildpkg.py \ # ...and then make a disk image containing the package. mv MacPython-OSX.pkg $DMGDIR/root +cp $RESOURCEDIR/Welcome.txt $DMGDIR/root/README.txt $PROGDIR/makedmg $DMGDIR/root $DMGDIR MacPython-OSX-$PYVERSION-$BUILDNUM echo Moving $DMGDIR/MacPython-OSX-$PYVERSION-$BUILDNUM to $DESTDIR +if [ ! -e $DESTDIR ]; then + mkdir $DESTDIR +fi mv $DMGDIR/MacPython-OSX-$PYVERSION-$BUILDNUM.dmg $DESTDIR |