diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2000-10-13 23:33:34 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2000-10-13 23:33:34 (GMT) |
| commit | 52b5b0221f7207a1dbd4b9b23885f6e89b8f109e (patch) | |
| tree | 2dd0ddc3a44b4d98c6d986864e8d61ac23b3e47c /Mac/scripts | |
| parent | 31e7c9c6d61b090a7fd7a8af78b1e3bc8fd463fe (diff) | |
| download | cpython-52b5b0221f7207a1dbd4b9b23885f6e89b8f109e.zip cpython-52b5b0221f7207a1dbd4b9b23885f6e89b8f109e.tar.gz cpython-52b5b0221f7207a1dbd4b9b23885f6e89b8f109e.tar.bz2 | |
If we're installing to another partition than the system partition offer to copy PythonCore in stead of aliasing it. This should fix the applet problems some people have.
Diffstat (limited to 'Mac/scripts')
| -rw-r--r-- | Mac/scripts/ConfigurePython.py | 17 | ||||
| -rw-r--r-- | Mac/scripts/ConfigurePython.rsrc | bin | 6441 -> 6935 bytes |
2 files changed, 16 insertions, 1 deletions
diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py index 88d66a4..91e0af0 100644 --- a/Mac/scripts/ConfigurePython.py +++ b/Mac/scripts/ConfigurePython.py @@ -18,6 +18,9 @@ SPLASH_REMOVE=513 SPLASH_CFM68K=514 SPLASH_PPC=515 SPLASH_NUMPY=516 +ALERT_NONBOOT=517 +ALERT_NONBOOT_COPY=1 +ALERT_NONBOOT_ALIAS=2 ppc_goals = [ ## ("AE.ppc.slb", "toolboxmodules.ppc.slb"), @@ -134,7 +137,19 @@ def mkcorealias(src, altsrc): os.unlink(dst) except os.error: pass - macostools.mkalias(os.path.join(sys.exec_prefix, src), dst) + do_copy = 0 + if macfs.FSSpec(sys.exec_prefix).as_tuple()[0] != -1: # XXXX + try: + import Dlg + rv = Dlg.CautionAlert(ALERT_NONBOOT, None) + if rv == ALERT_NONBOOT_COPY: + do_copy = 1 + except ImportError: + pass + if do_copy: + macostools.copy(os.path.join(sys.exec_prefix, src), dst) + else: + macostools.mkalias(os.path.join(sys.exec_prefix, src), dst) if verbose: print ' ', dst, '->', src return 1 diff --git a/Mac/scripts/ConfigurePython.rsrc b/Mac/scripts/ConfigurePython.rsrc Binary files differindex d55f604..2f23602 100644 --- a/Mac/scripts/ConfigurePython.rsrc +++ b/Mac/scripts/ConfigurePython.rsrc |