mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 05:31:20 +00:00 
			
		
		
		
	Run NumPy installer, if present.
Added a couple of splash screens to show what we're doing
This commit is contained in:
		
							parent
							
								
									4cf4de5d11
								
							
						
					
					
						commit
						d0240837fc
					
				
					 2 changed files with 135 additions and 42 deletions
				
			
		|  | @ -10,8 +10,15 @@ | ||||||
| import sys | import sys | ||||||
| import os | import os | ||||||
| import macfs | import macfs | ||||||
|  | import MacOS | ||||||
| verbose=0 | verbose=0 | ||||||
| 
 | 
 | ||||||
|  | SPLASH_LOCATE=512 | ||||||
|  | SPLASH_REMOVE=513 | ||||||
|  | SPLASH_CFM68K=514 | ||||||
|  | SPLASH_PPC=515 | ||||||
|  | SPLASH_NUMPY=516 | ||||||
|  | 
 | ||||||
| ppc_goals = [ | ppc_goals = [ | ||||||
| 	("AE.ppc.slb", "toolboxmodules.ppc.slb"), | 	("AE.ppc.slb", "toolboxmodules.ppc.slb"), | ||||||
| 	("Ctl.ppc.slb", "toolboxmodules.ppc.slb"), | 	("Ctl.ppc.slb", "toolboxmodules.ppc.slb"), | ||||||
|  | @ -148,6 +155,7 @@ def mkcorealias(src, altsrc): | ||||||
| 	 | 	 | ||||||
| 
 | 
 | ||||||
| def main(): | def main(): | ||||||
|  | 	MacOS.splash(SPLASH_LOCATE) | ||||||
| 	gotopluginfolder() | 	gotopluginfolder() | ||||||
| 	 | 	 | ||||||
| 	loadtoolboxmodules() | 	loadtoolboxmodules() | ||||||
|  | @ -155,6 +163,7 @@ def main(): | ||||||
| 	import macostools | 	import macostools | ||||||
| 		 | 		 | ||||||
| 	# Remove old .slb aliases and collect a list of .slb files | 	# Remove old .slb aliases and collect a list of .slb files | ||||||
|  | 	didsplash = 0 | ||||||
| 	LibFiles = [] | 	LibFiles = [] | ||||||
| 	allfiles = os.listdir(':') | 	allfiles = os.listdir(':') | ||||||
| 	if verbose:  print 'Removing old aliases...' | 	if verbose:  print 'Removing old aliases...' | ||||||
|  | @ -162,6 +171,9 @@ def main(): | ||||||
| 		if f[-4:] == '.slb': | 		if f[-4:] == '.slb': | ||||||
| 			finfo = macfs.FSSpec(f).GetFInfo() | 			finfo = macfs.FSSpec(f).GetFInfo() | ||||||
| 			if finfo.Flags & 0x8000: | 			if finfo.Flags & 0x8000: | ||||||
|  | 				if not didsplash: | ||||||
|  | 					MacOS.splash(SPLASH_REMOVE) | ||||||
|  | 					didsplash = 1 | ||||||
| 				if verbose:  print '  Removing', f | 				if verbose:  print '  Removing', f | ||||||
| 				os.unlink(f) | 				os.unlink(f) | ||||||
| 			else: | 			else: | ||||||
|  | @ -170,9 +182,13 @@ def main(): | ||||||
| 	if verbose:  print | 	if verbose:  print | ||||||
| 	 | 	 | ||||||
| 	# Create the new PPC aliases. | 	# Create the new PPC aliases. | ||||||
|  | 	didsplash = 0 | ||||||
| 	if verbose:  print 'Creating PPC aliases...' | 	if verbose:  print 'Creating PPC aliases...' | ||||||
| 	for dst, src in ppc_goals: | 	for dst, src in ppc_goals: | ||||||
| 		if src in LibFiles: | 		if src in LibFiles: | ||||||
|  | 			if not didsplash: | ||||||
|  | 				MacOS.splash(SPLASH_PPC) | ||||||
|  | 				didsplash = 1 | ||||||
| 			macostools.mkalias(src, dst) | 			macostools.mkalias(src, dst) | ||||||
| 			if verbose:  print ' ', dst, '->', src | 			if verbose:  print ' ', dst, '->', src | ||||||
| 		else: | 		else: | ||||||
|  | @ -180,9 +196,13 @@ def main(): | ||||||
| 	if verbose:  print | 	if verbose:  print | ||||||
| 	 | 	 | ||||||
| 	# Create the CFM68K aliases. | 	# Create the CFM68K aliases. | ||||||
|  | 	didsplash = 0 | ||||||
| 	if verbose:  print 'Creating CFM68K aliases...' | 	if verbose:  print 'Creating CFM68K aliases...' | ||||||
| 	for dst, src in cfm68k_goals: | 	for dst, src in cfm68k_goals: | ||||||
| 		if src in LibFiles: | 		if src in LibFiles: | ||||||
|  | 			if not didsplash: | ||||||
|  | 				MacOS.splash(SPLASH_CFM68K) | ||||||
|  | 				didsplash = 1 | ||||||
| 			macostools.mkalias(src, dst) | 			macostools.mkalias(src, dst) | ||||||
| 			if verbose:  print ' ', dst, '->', src | 			if verbose:  print ' ', dst, '->', src | ||||||
| 		else: | 		else: | ||||||
|  | @ -196,6 +216,13 @@ def main(): | ||||||
| 	n = n + mkcorealias('PythonCore', 'PythonCore') | 	n = n + mkcorealias('PythonCore', 'PythonCore') | ||||||
| 	n = n + mkcorealias('PythonCorePPC', ':build.macppc.shared:PythonCorePPC') | 	n = n + mkcorealias('PythonCorePPC', ':build.macppc.shared:PythonCorePPC') | ||||||
| 	n = n + mkcorealias('PythonCoreCFM68K', ':build.mac68k.shared:PythonCoreCFM68K') | 	n = n + mkcorealias('PythonCoreCFM68K', ':build.mac68k.shared:PythonCoreCFM68K') | ||||||
|  | 	 | ||||||
|  | 	# Install NumPy | ||||||
|  | 	if os.path.exists(':Extensions:NumPy:macmkaliases.py'): | ||||||
|  | 		MacOS.splash(SPLASH_NUMPY) | ||||||
|  | 		os.chdir(':Extensions:NumPy') | ||||||
|  | 		import macmkaliases | ||||||
|  | 		err = macmkaliases.main() | ||||||
| 	if verbose and n == 0: | 	if verbose and n == 0: | ||||||
| 		sys.exit(1) | 		sys.exit(1) | ||||||
| 			 | 			 | ||||||
|  |  | ||||||
|  | @ -1,44 +1,110 @@ | ||||||
| (This file must be converted with BinHex 4.0) | (This file must be converted with BinHex 4.0) | ||||||
| 
 | 
 | ||||||
| :&%0[EQCTCh9bC9"jG'K[ELjbFh*M!(*cFQ058d9%!3#3"`X,!SN!N!3"!!!!#KB | :&%0[EQCTCh9bC9"jG'K[ELjbFh*M!(*cFQ058d9%!3#3"aL3!'Cl!*!%!3!!!"E | ||||||
| !!!N@!!!!p6B8)&3JD!!8)&"p%E"S%3!k!@FQ%Lm-6VS#$!`k!&Tj&%eV8'aeCfP | r!!!9r`!!!C%f&#"8)'J!&#"3I4'`D"%!1J&R*K)[$%kk!J`-1J"DH44$EfjQD@G | ||||||
| Z3@aTBA0PFbjbFh*MF`)!!!!rN!B!!$q3#!#3',!I9ad!N!B,#rm4`+KT!4e!%Ir | eFQ93HA4SEfiZFR0bBfi#!!!!2j!'!!!rN!J!N"L`0DR(!*!''*!!ra(!U'N"(8! | ||||||
| c%h!!%#lrmlh5%@B386Dq9@X"!8*%[D'q9@X"!6"4-J&R(N39$!!!('85F!!3,N- | 4rr-6F!!3,[rc[G)4CK"40Vj9D`%"3N5pSEj9D`%"-&%b!@FH4"8-!!!FC4*`!"! | ||||||
| 9$!!!(f)'F!&J!!%"!LaD9#dZ4,d"!"Xm!@B`*e8q'NU!)&-#+!#r!#iL!1d*!J% | Z3a8-!!!IBJC`!@!!!3%#,&T8,5j%[3%!'c`"CM!R96iD5S!J8`)S!,m!,L)!l3N | ||||||
| !3)-Sfc36UGF[$%kk!3P+CfX"!+CA3cS!!!%!!!%!!!!#J!!!"%!!!(JJ!!"`%!! | #!3"!JbME0"1Tebm-6VS"#8TRD`%!TPG$1J!!!3!!!3!!!!+!!!!%3!!!H#!!!(! | ||||||
| !)!J!!2J%!!$i!J!"q!%!!rhiJ!Am#%!*r!JJ%eBF%#0@#!K$rJ!%J!$rJN!"!%% | 3!!!J#!!!q!3!!2J#!!(i!3!$rIL!"I`)3!Rm##!69K`3)eB)#%2q!!5!!2q#3!% | ||||||
| J!Ap#%!&"4!J"@8J%!9&3!J&"B!%"Id!!J3"!!%%23!!K!%!!%3"!!!MrJ!!%ri! | !35!"Id)3!8&%#!&C5!3"89!#!8&J!3&r3!#"!%!!33p!!#%!3!!4!%!!#2q!!!6 | ||||||
| !!L!!!!&!!!!!J!!!!3!!!!1!!!!(`!!!Iq!!!(r`!!!rq!!!rr`!!2rq!!(rr`! | rJ!!#)!!!!8!!!!#!!!!"!!!!!i!!!!I!!!"ri!!!Ir!!!$ri!!$rr!!!rri!!Ir | ||||||
| $rrq!"rrr`!rrrq!Irrr`2rrrq(rrrrcrrrrqIrrrrcrrrriIrrrm$rrrq!Irrr! | r!!2rri!(rrr!$rrri"rrrr!rrrriIrrrr2rrrrjrrrrr2rrrrKrrrr`2rrri"rr | ||||||
| $rrrJ!Irr`!$rrm!!Irr!!$rr`!!Irm!!$rq!!!IrJ!!$i!!!!F!!!!#!!*!%#P$ | rm!2rrq!"rrr!!2rr`!"rrm!!2rr!!"rr`!!2ri!!"rq!!!2J!!!"`!!!!)!!N!3 | ||||||
| J!"k%J!!(S5!!!!!(39"36!#3"Ka3HA3b!!!!!8C548B!N!@!5801)`#3"!%X!!! | +81!!(S5!!!HK)!!!!!G"8&"-!*!'(&"jG$)!!!!"4P*&4J#3"B"*3diM!*!%!5` | ||||||
| !3!%!!S!F3!JJ("!pk(BN[L*!q5#+%+`)L!5)!R!"3!#!!3!$J"r!$q!Im$riIrc | !!!"!!3!#J"a!##!F%$hSGL5q)N$j))S3V!L)")J#F!&!!)!"!!1!(m!2i"r`2rK | ||||||
| rrRrr2riIr!ri"rJ$m!(!!)!!!!3!N"$r!*!Hr`$r!*!Fr`!!!2m!N"H`X,$r!*! | rr2rqIrmrrKrm$rJ(q!2`!F!!J!!!"!#3%2m!N"lr!2m!N"cr!!!!r`#3&l#`X2m | ||||||
| &r`#3&V#`X#X!N!Er!*!@X#XV!*!(r`#3%l#3"3#3#2m!N"+`N!8V!*!)r`#3%2q | !N!Ar!*!@X,#`+`#3"[m!N"D`+bX!N!Ir!*!6X*!&!*!)r`#3%V#3"5X!N!Mr!*! | ||||||
| `N!8V!*!*r`#3$[q`N!FVrj!'!!!!r`#3$2m!X*!(+`#3"Im!N!6r!*!+r`!!X*! | 3rl#3"5X!N!Rr!*!1rl#3"b[rN!B!!!$r!*!-r`#`N!FV!*!&r`#3"2m!N!Vr!!# | ||||||
| (+`#3"Im!N!Ar!*!)r`!!X,!&X!@`"E#`+`!!!2rrr`#3"Im!N!Er!!!!X,!&X!@ | `N!FV!*!&r`#3"Im!N!Mr!!#`X!@`"E!&X,!V!!!!rrrr!*!&r`#3"[m!!!#`X!@ | ||||||
| `"E#`+`#3"2m!N!Ir!*!%r`#3",#3#5X!N!hr!!$r+`#3"5Z3#Iq3#3#3"#[r!!$ | `"E!&X,!V!*!%r`#3"rm!N!6r!*!%X*!*+`#3$Im!!2mV!*!&+j!*rj!*!*!%+rm | ||||||
| r+`#3$2mVN!Rr!!!!+b[r!!$r+`#3#rmVqC!'+b[r+`!V+rm!N!6r+`#3#[mVq5Z | !!2mV!*!-rbZ3#Im!!!!V+rm!!2mV!*!,rb[jN!BV+rmV!#XVr`#3"2mV!*!+rb[ | ||||||
| 3"3!VrbXV+rm!N!Er+`#3#ImVq5Z3"3!VrbXVr`#3#2mV!*!)rb[j+j!&!#[r+rm | j+j!&!#[r+bXVr`#3"[mV!*!*rb[j+j!&!#[r+b[r!*!)rbX!N!Mr+rNVN!8!+rm | ||||||
| !N!Vr+`#3"rmVq5Z3"3!Vrrm!N!cr+`#3"[mV+`#3"L[r!*!1rbX!N!Ar+j!*r`# | Vr`#3#[mV!*!(rb[j+j!&!#[rr`#3$2mV!*!'rbXV!*!'+rm!N!lr+`#3"ImVN!R | ||||||
| 3$rmV!*!%rbZ3"2crrr`Vr`#3%2mV!!!!rb[BibZ3"[m!N"(r+`!!rbZ3#Im!N", | r!*!2rbX!N!6r+j!%r2rrr#[r!*!3rbX!!!$r+pMM+j!'r`#3%ImV!!$r+j!*r`# | ||||||
| r+`!!rrb3"rm!N"6r+`$rN!N!N"Ar+bXVr`#3(2mVr`#3([m!N"%"!*!)r`#3$[r | 3%[mV!!$rr*!(r`#3&2mV!2q3#3#3&ImV+b[r!*!Frb[r!*!Hr`#3%3%!N!Mr!*! | ||||||
| er`#3#V#`X2AepIm!N!U`pC!&r`#3#,#`X2@3"Im!N!ErX,#`!2q3"2Ar!*!%rl# | 1rrAr!*!+X,#`pIAer`#3#V$eN!Ar!*!)X,#`pC!&r`#3"[q`X,!!rj!%pIm!N!6 | ||||||
| `"E#`pIAerrAer`!!rr@`N!AepIArpIAer`!!rr@3"[q3"IAhr`!!rr@3"IrhprI | rX,!&X,$epIArpIAr!!$rpE#3"IAepIrepIAr!!$rpC!'rj!&pIIr!!$rpC!&rrI | ||||||
| rprm!N!6rpC!%rrIrprrr!*!'rrAepIrhprIr!*!)rrAerrIhprm!N!RrpIArrrm | hprrhr`#3"2reN!6rprrhrrm!N!ErpIAerrIhprm!N!MrpIArprIhr`#3#IrepIr | ||||||
| !N Jack Jansen
						Jack Jansen