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 88d66a416f65..91e0af03d3ce 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 index d55f604474df796645ffaeb30cf554c1666adaa1..2f23602ba1504c482ab2d58c2b39b40f32535377 100644 GIT binary patch delta 632 zc-l=-J!lj`6rSDOU1CTg21yRFcxa&<7mE-?B$(*l|CpmCFxYyibt3}Y93UMuxmrj+ubCN>AlSw*Y$R09K7+t2D z45;8#=lmF1B+s4X?)RIr2OYY_fXCWUAy@>fsp-fVa8Zb5JkyraKth$_hRe8rZhX8c zRTs~u;KR1;i3pOO0U8hV!ALM2_D9B(%4+9KeaEm^qlShJDI%t-pzT?Tmy<*=qaj3< z4IW3pO%>XxnqTGihejO(-DR3Wo8dBsDVrUldZk$l(7)q*&C`hYm)7b_h);Q_ZTy0V;sWApj4i%LoI~74-r@m{ZWi%NEm&z_ z5#MV5`bWKF)2WyspTnidE5T9j}<*&oV!$TlbbJ>sb c*)#4SIF)yXKGxl~{=~|5jAK+x%bp6^Z)zQ{rvLx| delta 193 zc-ot8w$f;V4U@$2iFR6C;z|q*VnEEebYqc-cs(Nn0|P>co#(6rQxi}~hH)ALualpP z50G8t>FlQrr0d**T-|_lS7vfCh(9eeImZG>F9PyG^g1AI0;G2V#XEyFg%KUu(<$0+^ N3Pq{K`K3k4sQ~ndE{y;H -- 2.47.3