Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3112bc1

Browse files
jackjansenjackjansen
committed
Also create alias to PythonCoreCarbon.
Got rid of lots of 68k stuff.
1 parent 26ce8fb commit 3112bc1

1 file changed

Lines changed: 3 additions & 72 deletions

File tree

‎Mac/scripts/ConfigurePython.py‎

Lines changed: 3 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -23,48 +23,6 @@
2323
ALERT_NONBOOT_ALIAS=2
2424

2525
ppc_goals = [
26-
## ("AE.ppc.slb", "toolboxmodules.ppc.slb"),
27-
## ("Ctl.ppc.slb", "toolboxmodules.ppc.slb"),
28-
## ("Dlg.ppc.slb", "toolboxmodules.ppc.slb"),
29-
## ("Evt.ppc.slb", "toolboxmodules.ppc.slb"),
30-
## ("Fm.ppc.slb", "toolboxmodules.ppc.slb"),
31-
## ("Help.ppc.slb", "toolboxmodules.ppc.slb"),
32-
## ("Icn.ppc.slb", "toolboxmodules.ppc.slb"),
33-
## ("Menu.ppc.slb", "toolboxmodules.ppc.slb"),
34-
## ("List.ppc.slb", "toolboxmodules.ppc.slb"),
35-
## ("Qd.ppc.slb", "toolboxmodules.ppc.slb"),
36-
## ("Res.ppc.slb", "toolboxmodules.ppc.slb"),
37-
## ("Scrap.ppc.slb", "toolboxmodules.ppc.slb"),
38-
## ("Snd.ppc.slb", "toolboxmodules.ppc.slb"),
39-
## ("Sndihooks.ppc.slb", "toolboxmodules.ppc.slb"),
40-
## ("TE.ppc.slb", "toolboxmodules.ppc.slb"),
41-
## ("Win.ppc.slb", "toolboxmodules.ppc.slb"),
42-
##
43-
## ("Cm.ppc.slb", "qtmodules.ppc.slb"),
44-
## ("Qt.ppc.slb", "qtmodules.ppc.slb"),
45-
46-
]
47-
48-
cfm68k_goals = [
49-
## ("AE.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
50-
## ("Ctl.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
51-
## ("Dlg.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
52-
## ("Evt.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
53-
## ("Fm.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
54-
## ("Help.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
55-
## ("Icn.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
56-
## ("Menu.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
57-
## ("List.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
58-
## ("Qd.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
59-
## ("Res.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
60-
## ("Scrap.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
61-
## ("Snd.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
62-
## ("Sndihooks.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
63-
## ("TE.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
64-
## ("Win.CFM68K.slb", "toolboxmodules.CFM68K.slb"),
65-
##
66-
## ("Cm.CFM68K.slb", "qtmodules.CFM68K.slb"),
67-
## ("Qt.CFM68K.slb", "qtmodules.CFM68K.slb"),
6826
]
6927

7028
def gotopluginfolder():
@@ -87,18 +45,7 @@ def loadtoolboxmodules():
8745
if verbose: print 'imported Res the standard way.'
8846
return
8947

90-
# We cannot import it. First attempt to load the cfm68k version
91-
import imp
92-
try:
93-
dummy = imp.load_dynamic('Res', 'toolboxmodules.CFM68K.slb')
94-
except ImportError, arg:
95-
err2 = arg
96-
pass
97-
else:
98-
if verbose: print 'Loaded Res from toolboxmodules.CFM68K.slb.'
99-
return
100-
101-
# Ok, try the ppc version
48+
# We cannot import it. Try a manual load
10249
try:
10350
dummy = imp.load_dynamic('Res', 'toolboxmodules.ppc.slb')
10451
except ImportError, arg:
@@ -112,7 +59,6 @@ def loadtoolboxmodules():
11259
print "I cannot import the Res module, nor load it from either of"
11360
print "toolboxmodules shared libraries. The errors encountered were:"
11461
print "import Res:", err1
115-
print "load from toolboxmodules.CFM68K.slb:", err2
11662
print "load from toolboxmodules.ppc.slb:", err3
11763
sys.exit(1)
11864

@@ -195,28 +141,13 @@ def main():
195141
else:
196142
if verbose: print '*', dst, 'not created:', src, 'not found'
197143
if verbose: print
198-
199-
# Create the CFM68K aliases.
200-
didsplash = 0
201-
if verbose: print 'Creating CFM68K aliases...'
202-
for dst, src in cfm68k_goals:
203-
if src in LibFiles:
204-
if not didsplash:
205-
MacOS.splash(SPLASH_CFM68K)
206-
didsplash = 1
207-
macostools.mkalias(src, dst)
208-
if verbose: print ' ', dst, '->', src
209-
else:
210-
if verbose: print '*', dst, 'not created:', src, 'not found'
211-
if verbose: print
212-
144+
213145
# Create the PythonCore alias(es)
214146
if verbose: print 'Creating PythonCore aliases in Extensions folder...'
215147
os.chdir('::')
216148
n = 0
217149
n = n + mkcorealias('PythonCore', 'PythonCore')
218-
n = n + mkcorealias('PythonCorePPC', ':build.macppc.shared:PythonCorePPC')
219-
n = n + mkcorealias('PythonCoreCFM68K', ':build.mac68k.shared:PythonCoreCFM68K')
150+
n = n + mkcorealias('PythonCoreCarbon', 'PythonCoreCarbon')
220151

221152
if verbose and n == 0:
222153
sys.exit(1)

0 commit comments

Comments
 (0)