- Use cfmfile to (finally) implement building fat Pythons

- Turned the 10 or so yes/no questions into a single dialog

2 files changed, 137 insertions, 62 deletions

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index e49eabb..224aaba 100644
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -19,9 +19,36 @@ import addpack
 import aetools
 import AppleEvents
 from Metrowerks_Shell_Suite import Metrowerks_Shell_Suite
-from Required_Suite import Required_Suite 
+from Required_Suite import Required_Suite
+
+import Res
+import Dlg
 
 import mkapplet
+import cfmfile
+
+# Dialog resource. Note that the item numbers should correspond
+# to those in the DITL resource. Also note that the order is important:
+# things are built in this order, so there should be no forward dependencies.
+DIALOG_ID = 512
+
+I_OK=1
+I_CANCEL=2
+
+I_PPC_CORE=3
+I_PPC_PLUGINS=4
+I_PPC_EXTENSIONS=5
+I_68K_CORE=6
+I_68K_PLUGINS=7
+I_68K_EXTENSIONS=8
+I_PPC_FULL=9
+I_PPC_SMALL=10
+I_68K_FULL=11
+I_68K_SMALL=12
+I_FAT=13
+I_APPLETS=14
+
+N_BUTTONS=15
 
 class MwShell(aetools.TalkTo, Metrowerks_Shell_Suite, Required_Suite):
 	pass
@@ -46,7 +73,7 @@ def buildmwproject(top, creator, projects):
 ##	mgr.quit()
 	
 def buildapplet(top, dummy, list):
-	"""Create a PPC python applet"""
+	"""Create python applets"""
 	template = mkapplet.findtemplate()
 	for src in list:
 		if src[-3:] != '.py':
@@ -60,32 +87,55 @@ def buildapplet(top, dummy, list):
 			pass
 		print 'Building applet', dst
 		mkapplet.process(template, src, dst)
+		
+def buildfat(top, dummy, list):
+	"""Build fat binaries"""
+	for dst, src1, src2 in list:
+		dst = os.path.join(top, dst)
+		src1 = os.path.join(top, src1)
+		src2 = os.path.join(top, src2)
+		print 'Building fat binary', dst
+		cfmfile.mergecfmfiles((src1, src2), dst)
+		
+def handle_dialog():
+	"""Handle selection dialog, return list of selected items"""
+	d = Dlg.GetNewDialog(DIALOG_ID, -1)
+	d.SetDialogDefaultItem(I_OK)
+	d.SetDialogCancelItem(I_CANCEL)
+	results = [0]*N_BUTTONS
+	while 1:
+		n = Dlg.ModalDialog(None)
+		if n == I_OK:
+			break
+		if n == I_CANCEL:
+			return []
+		if n < len(results):
+			results[n] = (not results[n])
+			tp, h, rect = d.GetDialogItem(n)
+			h.as_Control().SetControlValue(results[n])
+	rv = []
+	for i in range(len(results)):
+		if results[i]:
+			rv.append(i)
+	return rv
 
 #
 # The build instructions. Entries are (routine, arg, list-of-files)
 # XXXX We could also include the builds for stdwin and such here...
-PPC_INSTRUCTIONS=[
-	(buildmwproject, "CWIE", [
+BUILD_DICT = {
+I_PPC_CORE : (buildmwproject, "CWIE", [
 		":build.macppc.shared:PythonCorePPC.µ",
 		":build.macppc.shared:PythonPPC.µ",
 		":build.macppc.shared:PythonAppletPPC.µ",
-	])
-]
-CFM68K_INSTRUCTIONS=[
-	(buildmwproject, "CWIE", [
+	]),
+
+I_68K_CORE : (buildmwproject, "CWIE", [
 		":build.mac68k.shared:PythonCoreCFM68K.µ",
 		":build.mac68k.shared:PythonCFM68K.µ",
 		":build.mac68k.shared:PythonAppletCFM68K.µ",
-	])
-]
-FAT_INSTRUCTIONS=[
-	(buildmwproject, "CWIE", [
-		":build.macppc.shared:Python.µ",
-		":build.macppc.shared:PythonApplet.µ",
-	])
-]
-PLUGIN_INSTRUCTIONS=[
-	(buildmwproject, "CWIE", [
+	]),
+
+I_PPC_PLUGINS : (buildmwproject, "CWIE", [
 		":PlugIns:ctb.ppc.µ",
 		":PlugIns:gdbm.ppc.µ",
 		":PlugIns:icglue.ppc.µ",
@@ -96,10 +146,9 @@ PLUGIN_INSTRUCTIONS=[
 		":PlugIns:waste.ppc.µ",
 		":PlugIns:_tkinter.ppc.µ",
 		":PlugIns:calldll.ppc.µ",
-	])
-]
-CFM68KPLUGIN_INSTRUCTIONS=[
-	(buildmwproject, "CWIE", [
+	]),
+
+I_68K_PLUGINS : (buildmwproject, "CWIE", [
 		":PlugIns:ctb.CFM68K.µ",
 		":PlugIns:gdbm.CFM68K.µ",
 		":PlugIns:icglue.CFM68K.µ",
@@ -108,62 +157,71 @@ CFM68KPLUGIN_INSTRUCTIONS=[
 		":PlugIns:qtmodules.CFM68K.µ",
 		":PlugIns:waste.CFM68K.µ",
 		":PlugIns:_tkinter.CFM68K.µ",
-	])
-]
-M68K_INSTRUCTIONS=[
-	(buildmwproject, "CWIE", [
+	]),
+
+I_68K_FULL : (buildmwproject, "CWIE", [
 		":build.mac68k.stand:Python68K.µ",
-	])
-]
-PPCSTAND_INSTRUCTIONS=[
-	(buildmwproject, "CWIE", [
+	]),
+	
+I_68K_SMALL : (buildmwproject, "CWIE", [
+		":build.mac68k.stand:Python68Ksmall.µ",
+	]),
+
+I_PPC_FULL : (buildmwproject, "CWIE", [
 		":build.macppc.stand:PythonStandalone.µ",
-	])
-]
-EXTENSION_INSTRUCTIONS=[
-	(buildmwproject, "CWIE", [
+	]),
+
+I_PPC_SMALL : (buildmwproject, "CWIE", [
+		":build.macppc.stand:PythonStandSmall.µ",
+	]),
+
+I_PPC_EXTENSIONS : (buildmwproject, "CWIE", [
 		":Extensions:Imaging:_imaging.ppc.µ",
-		":Extensions:Imaging:_imaging.CFM68K.µ",
 		":Extensions:Imaging:_tkinter.ppc.µ",
-		":Extensions:Imaging:_tkinter.CFM68K.µ",
 		":Extensions:NumPy:numpymodules.ppc.µ",
+	]),
+
+I_68K_EXTENSIONS : (buildmwproject, "CWIE", [
+		":Extensions:Imaging:_imaging.CFM68K.µ",
+		":Extensions:Imaging:_tkinter.CFM68K.µ",
 		":Extensions:NumPy:numpymodules.CFM68K.µ",
-	])
-]
-APPLET_INSTRUCTIONS=[
-	(buildapplet, None, [
+	]),
+
+I_APPLETS : (buildapplet, None, [
 		":Mac:scripts:EditPythonPrefs.py",
 		":Mac:scripts:mkapplet.py",
 		":Mac:scripts:MkPluginAliases.py"
+	]),
+
+I_FAT : (buildfat, None, [
+			(":Python", ":build.macppc.shared:PythonPPC", 
+						":build.mac68k.shared:PythonCFM68K"),
+			(":PythonApplet", ":build.macppc.shared:PythonAppletPPC",
+							  ":build.mac68k.shared:PythonAppletCFM68K")
 	])
-]
-
-ALLINST=[
-	("PPC shared executable", PPC_INSTRUCTIONS),
-	("PPC plugin modules", PLUGIN_INSTRUCTIONS),
-	("CFM68K shared executable", CFM68K_INSTRUCTIONS),
-	("CFM68K plugin modules", CFM68KPLUGIN_INSTRUCTIONS),
-	("FAT shared executables", FAT_INSTRUCTIONS),
-	("68K standalone executable", M68K_INSTRUCTIONS),
-	("PPC standalone executable", PPCSTAND_INSTRUCTIONS),
-	("Extensions", EXTENSION_INSTRUCTIONS),
-	("Applets", APPLET_INSTRUCTIONS)
-]
+}
 				
 def main():
+	try:
+		h = Res.OpenResFile('fullbuild.rsrc')
+	except Res.Error:
+		pass	# Assume we already have acces to our own resource
+
 	dir, ok = macfs.GetDirectory('Python source folder:')
 	if not ok:
 		sys.exit(0)
 	dir = dir.as_pathname()
-	INSTRUCTIONS = []
-	for string, inst in ALLINST:
-		answer = EasyDialogs.AskYesNoCancel("Build %s?"%string, 1)
-		if answer < 0:
-			sys.exit(0)
-		if answer:
-			INSTRUCTIONS = INSTRUCTIONS + inst
-	for routine, arg, list in INSTRUCTIONS:
-		routine(dir, arg, list)
+	
+	todo = handle_dialog()
+	
+	instructions = []
+	for i in todo:
+		instructions.append(BUILD_DICT[i])
+		
+	for routine, arg, list in instructions:
+		#routine(dir, arg, list)
+		print routine, dir, arg, list # DBG
+		
 	print "All done!"
 	sys.exit(1)	
 	
diff --git a/Mac/scripts/fullbuild.rsrc.hqx b/Mac/scripts/fullbuild.rsrc.hqx
new file mode 100644
index 0000000..94691b7
--- /dev/null
+++ b/Mac/scripts/fullbuild.rsrc.hqx
@@ -0,0 +1,17 @@
+(This file must be converted with BinHex 4.0)
+
+:$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-: