summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-07-23 10:51:55 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-07-23 10:51:55 (GMT)
commit1fb83c155f7ce0a64a6a27b189144a8b7fc0c3eb (patch)
treef4a73eae2fb5b402752dc4cf4987cda62d930e4b /Mac
parentdffeaf473224ca425f01653a6c52a6fa8ed9592b (diff)
downloadcpython-1fb83c155f7ce0a64a6a27b189144a8b7fc0c3eb.zip
cpython-1fb83c155f7ce0a64a6a27b189144a8b7fc0c3eb.tar.gz
cpython-1fb83c155f7ce0a64a6a27b189144a8b7fc0c3eb.tar.bz2
Don't force boot-disk-only install, for reasons unknown it causes more
problems than it solves. In stead, put a warning near the top of the welcome message. Fixes (or, rather works around) bug #764975.
Diffstat (limited to 'Mac')
-rwxr-xr-xMac/OSX/Dist/build4
-rw-r--r--Mac/OSX/Dist/resources/Welcome.txt9
2 files changed, 8 insertions, 5 deletions
diff --git a/Mac/OSX/Dist/build b/Mac/OSX/Dist/build
index 73b86c5..ee5c450 100755
--- a/Mac/OSX/Dist/build
+++ b/Mac/OSX/Dist/build
@@ -7,7 +7,7 @@
# Script configs
PYVERSION=2.3rc1plus
PYVER=2.3
-BUILDNUM=6
+BUILDNUM=8
DOCLEANUP=no
PROGDIR="`dirname \"$0\"`"
@@ -126,10 +126,10 @@ python $PYTHONSRC/Mac/scripts/buildpkg.py \
--Relocatable="NO" \
--InstallOnly="YES" \
--UseUserMask="NO" \
- --RootVolumeOnly="YES" \
$INSTALLROOT \
$RESOURCEDIR
+# --RootVolumeOnly="YES" \
# ...and then make a disk image containing the package.
mv MacPython-OSX.pkg $DMGDIR/root
diff --git a/Mac/OSX/Dist/resources/Welcome.txt b/Mac/OSX/Dist/resources/Welcome.txt
index 7637852..c8a1161 100644
--- a/Mac/OSX/Dist/resources/Welcome.txt
+++ b/Mac/OSX/Dist/resources/Welcome.txt
@@ -1,7 +1,10 @@
-This package will install MacPython 2.3rc1+ for Mac OS X 10.2.
-Installation on 10.0, 10.1 or the Panther seed is explicitly discouraged.
+This package will install MacPython 2.3rc1+ for Mac OS X 10.2. Installation
+on the Panther preview may work, on 10.1 or earlier will not work.
+
Installation requires approximately 20 MB of disk space, ignore the
-message that it will take zero bytes.
+message that it will take zero bytes. You must install onto your current
+boot disk, even though the installer does not enforce this, otherwise
+things will not work.
MacPython consists of the Python programming language interpreter,
plus a set of programs to allow easy access to it for Mac users (an