From 52b5b0221f7207a1dbd4b9b23885f6e89b8f109e Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Fri, 13 Oct 2000 23:33:34 +0000 Subject: [PATCH] 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. --- Mac/scripts/ConfigurePython.py | 17 ++++++++++++++++- Mac/scripts/ConfigurePython.rsrc | Bin 6441 -> 6935 bytes 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py index 88d66a416f6..91e0af03d3c 100644 --- a/Mac/scripts/ConfigurePython.py +++ b/Mac/scripts/ConfigurePython.py @@ -18,6 +18,9 @@ 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 index d55f604474df796645ffaeb30cf554c1666adaa1..2f23602ba1504c482ab2d58c2b39b40f32535377 100644 GIT binary patch delta 632 zcmYLHJ!lj`6rSDOT{I*SMUq1-9$F~J#Uca=68yWn91ELEh&lhdx!no3WN&AgolD%t z11qr*bwR;WM6`?`HX)vE61ER)yIH*=wuHK3H*~P?K>wWY`WEDvT}h z4M98%c#`wu>@s_4#rJ>Sl6~s(O+i7FXdZ^brKfkFtrxS(!lydjrWdZ+pW^~~~ zX#W9q(%NN5uD0qf?0ZhFbsG3^aka4sd>(j-@m~dAI1hXa-{42!9B>!B!98?f7Wl31 zE;n(AA9ZJK#$`pTvf|X%&~MdjzjuIluQ|6Hzz0{{Rl`56yUm-x7um7$_tE11KC!8} g>{t2h8GGoQf+{mM{-}?=?F1!^6yrvLx| delta 193 zcmbPkw$f;V4U@$2iFR6C;z|q*VnEEebYqc-cs(Nn0|P>co#(6rQxi}~hH)ALualpP z50G8t>FlQrr0d**T-|_lS7vfCh(9eeImZG>F9PyG^g1AI0;G2V#X