- toolboxmodules built first (others depend on it)

- Changed name of fat interpreter to PythonFAT (Python conflicted with toplevel
  folder of the same name, unfortunately)

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 224aaba64d35fe35181ff2e959feb323c4ca21ff..2cf10f7095cf82a60082a1e7fbdc0383a9a3f2d4 100644 (file)
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -136,25 +136,25 @@ I_68K_CORE : (buildmwproject, "CWIE", [
        ]),
 
 I_PPC_PLUGINS : (buildmwproject, "CWIE", [
+               ":PlugIns:toolboxmodules.ppc.µ",        # First: used by others
+               ":PlugIns:qtmodules.ppc.µ",
                ":PlugIns:ctb.ppc.µ",
                ":PlugIns:gdbm.ppc.µ",
                ":PlugIns:icglue.ppc.µ",
                ":PlugIns:imgmodules.ppc.µ",
                ":PlugIns:macspeech.ppc.µ",
-               ":PlugIns:toolboxmodules.ppc.µ",
-               ":PlugIns:qtmodules.ppc.µ",
                ":PlugIns:waste.ppc.µ",
                ":PlugIns:_tkinter.ppc.µ",
                ":PlugIns:calldll.ppc.µ",
        ]),
 
 I_68K_PLUGINS : (buildmwproject, "CWIE", [
+               ":PlugIns:toolboxmodules.CFM68K.µ",     # First: used by others
+               ":PlugIns:qtmodules.CFM68K.µ",
                ":PlugIns:ctb.CFM68K.µ",
                ":PlugIns:gdbm.CFM68K.µ",
                ":PlugIns:icglue.CFM68K.µ",
                ":PlugIns:imgmodules.CFM68K.µ",
-               ":PlugIns:toolboxmodules.CFM68K.µ",
-               ":PlugIns:qtmodules.CFM68K.µ",
                ":PlugIns:waste.CFM68K.µ",
                ":PlugIns:_tkinter.CFM68K.µ",
        ]),
@@ -194,7 +194,7 @@ I_APPLETS : (buildapplet, None, [
        ]),
 
 I_FAT : (buildfat, None, [
-                       (":Python", ":build.macppc.shared:PythonPPC", 
+                       (":PythonFAT", ":build.macppc.shared:PythonPPC", 
                                                ":build.mac68k.shared:PythonCFM68K"),
                        (":PythonApplet", ":build.macppc.shared:PythonAppletPPC",
                                                          ":build.mac68k.shared:PythonAppletCFM68K")
@@ -219,8 +219,7 @@ def main():
                instructions.append(BUILD_DICT[i])
                
        for routine, arg, list in instructions:
-               #routine(dir, arg, list)
-               print routine, dir, arg, list # DBG
+               routine(dir, arg, list)
                
        print "All done!"
        sys.exit(1)     

diff --git a/Mac/scripts/fullbuild.rsrc.hqx b/Mac/scripts/fullbuild.rsrc.hqx
index 94691b7eff9f77a811d72d8bb36e54961e9e3cfc..a3e9524a7eda67dcafbdfbe7b11c076556bb8035 100644 (file)
--- a/Mac/scripts/fullbuild.rsrc.hqx
+++ b/Mac/scripts/fullbuild.rsrc.hqx
@@ -2,16 +2,16 @@
 
 :$QCeE'aLG@PXC#jbFh*M!(*cFQ058d9%!3#3"`-0T%X!N!3"!!!!!XF!!!((!!!
 !4J!!4dJ-8f0bC@9Z)%9KFf@U)!)!!!"45f9i8f0&B5%!$QCeE'aLG@PXC#jbFh*
-MFJ)!!!"bFh*M8P0&4!%!N!9bFh*M8P0&4!%!!!!"3!#3%Uq9%&m!N!B$$3#3#Ji
-!!!"(5!K6EfCd5f9jFfB#!!)!88YPH&&i8fXK!!!d!%!!N!4(L!#3$RNf!!"q!+K
-"F!#TGUAD!*!LMT%!"`#3$"3!N!39!#J!+!$l!IF!!3%!!3#3"3)!N!3"UJ!6!*!
-&Y!''!-J"`!3#6dX!N!@d!!S!b!"%"!C$B@jMC@`!N!8N!'F!0J$4"34$Eh*P!*!
-&*!$I!$B"538(8'aeCfPZFp%!N!8N!9F!0J(""3T&H(4PER0TEfjc!*!&2!"R!%i
-!d38%3fpbC3#3"6`!h`"1!8N&"e"XG@GTER24!*!&2!&A!%i"`38+4AKdC@jcD@p
-ZF`#3"9`!C`"Z!0%&"%CeE'`!N!9F!0m!EJ&*"396E@&XE'`!N!9d!'F!KJ$4"34
-'G@aX!*!&G!$I!)B"538&8feKE'a*!*!&P!"R!+B!d38*4Q&d)("bEfGc!`#3"C3
-!h`#Q!8N&"d&`F'aPG(08!*!&*!!0!$3!@)J$8&"$G!#3"6`!$3"-!&L)!cBi5eJ
-!N!9F!!d!E!"BL!T6G'&dD@-J8&"$!*!&G!!0!)3!@)J+8h4KG'PM)$Bi5`#3"C3
-!$3#N!&L)"%eTFf-!N!8)!)m!'!%JL"96C@aPBh3JGfKKG#"dEb"LG@PXC$TX!!!
-"!!!!!XF!!!((!!!!4J)YC+344!!!!"`!4J!"4%a24`!!!"*%594-!!!!(J)!rrm
-!N!3#,@0m!J$rr`!!!"N#,@*B93-:
+MC!)!!!!rN!J!N!BrN!J!N"L[P3NI!*!'!`d!N!S1!!!!4dJ)8fpQG%YPHA0Q!J!
+#!&&,CAK4H&0V)3!!0!"!!*!%4iJ!N!jj0J!!IJ#S3A!!UADPfJ#3)Sk4!!F!N!`
+8!*!%&3!S!#J!q`(h!!%"!!%!N!8#!*!%!DS!%`#3"E3"KJ$)!F!%!Np,!*!&Y!!
++!-J!4!3'3f&ZBf9X!*!&*!"R!$B!d38%3fpbC3#3"53!h`!f!8N&"e"XG@GTER2
+4!*!&*!&A!$B"`38+4AKdC@jcD@pZF`#3"6`!C`"1!0%&"%0[FQ8!N!8m!0m!6J&
+*"3G3E(9RD@jcd3#3"6`"9`"1!F%&#N9iG'9ZFfP[ER-!N!9F!'F!EJ$4"34'G@a
+X!*!&A!$I!'i"538&8feKE'aX!*!&G!"R!)B!d38%4R9XE!#3"A3!h`#'!8N&"90
+YB@aX53#3"C3!C`#Q!0%&#8CKG#"`FQpRF`-!N!@8!0m!TJ&*"3G"F("XCA4c9!#
+3"53!$3!d!&L)!e"33h3!N!8m!!d!6!"BL!-f1%YB!*!&A!!0!'`!@)J+8h4KG'P
+M)&"33`#3"A3!$3#%!&L)#P0dBA4TBb!f1%X!N!@8!!d!T!"BL!40DA0M!*!&#!#
+2!"J"))J98f9XC@0d)(GSBA3JG'mJBR9TE'3kE!!!!3!!!!,(!!!"a`!!!%B#,@5
+N%83!!!!F!%B!!84-6dF!!!!54%P86!!!!"i#!2rr!*!%!LeMI!)!rrm!!!!C!Le
+L@(NE: