From e56e87dcc89f0728b7900f13e57b22eb38457eb1 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Wed, 3 Jan 2001 11:12:21 +0000 Subject: [PATCH] Got rid of 68K support. Added optional generation of project files. Redesigned dialog. --- Mac/scripts/fullbuild.py | 100 +++++++++++++++---------------------- Mac/scripts/fullbuild.rsrc | Bin 1206 -> 1364 bytes 2 files changed, 41 insertions(+), 59 deletions(-) diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py index 4f718fd0bad4..4747e38bdbc6 100644 --- a/Mac/scripts/fullbuild.py +++ b/Mac/scripts/fullbuild.py @@ -45,20 +45,22 @@ I_OK=1 I_CANCEL=2 -I_INC_BUILDNO=19 +# label 3 +I_PPC_EXTLIBS=4 +I_GEN_PROJECTS=5 +I_GEN_IMGPROJECTS=6 +I_INC_BUILDNO=7 +# label 8 +I_CORE=9 +I_PPC_PLUGINS=10 +I_PPC_EXTENSIONS=11 +# label 12 +I_PPC_FULL=13 +I_PPC_SMALL=14 +# label 15 +I_APPLETS=16 -I_CORE=3 -I_PPC_PLUGINS=4 -I_PPC_EXTENSIONS=5 -I_68K_PLUGINS=6 -I_68K_EXTENSIONS=7 -I_PPC_FULL=8 -I_PPC_SMALL=9 -I_68K_FULL=10 -I_68K_SMALL=11 -I_APPLETS=12 - -N_BUTTONS=13 +N_BUTTONS=17 if OLDAESUPPORT: class MwShell(Metrowerks_Shell_Suite, CodeWarrior_suite, Metrowerks_Standard_Suite, @@ -83,7 +85,7 @@ def buildmwproject(top, creator, projects): file = os.path.join(top, file) try: fss = macfs.FSSpec(file) - except ValueError: + except MacOS.Error: print '** file not found:', file continue print 'Building', file, target @@ -128,6 +130,16 @@ def buildapplet(top, dummy, list): print 'Building applet', dst buildtools.process(template, src, dst, 1) +def buildprojectfile(top, dummy, list): + """Create CodeWarrior project files with a script""" + for folder, module, routine in list: + print "Generating project files with", module + sys.path.insert(0, os.path.join(top, folder)) + m = __import__(module) + r = getattr(m, routine) + r() + del sys.path[0] + def buildfat(top, dummy, list): """Build fat binaries""" for dst, src1, src2 in list: @@ -166,11 +178,24 @@ def handle_dialog(filename): # The build instructions. Entries are (routine, arg, list-of-files) # XXXX We could also include the builds for stdwin and such here... BUILD_DICT = { +I_GEN_PROJECTS : (buildprojectfile, None, [ + (":Mac:scripts", "genpluginprojects", "genallprojects") + ]), + +I_GEN_IMGPROJECTS : (buildprojectfile, None, [ + (":Extensions:img:Mac", "genimgprojects", "genallprojects") + ]), + I_CORE : (buildmwproject, "CWIE", [ (":Mac:Build:PythonCore.mcp", "PythonCore"), (":Mac:Build:PythonInterpreter.mcp", "PythonInterpreter"), ]), +I_PPC_EXTLIBS : (buildmwproject, "CWIE", [ +## (":Mac:Build:buildlibs.mcp", "buildlibs ppc plus tcl/tk"), + (":Mac:Build:buildlibs.mcp", "buildlibs ppc"), + ]), + I_PPC_PLUGINS : (buildmwproject, "CWIE", [ (":Mac:Build:ucnhash.mcp", "ucnhash.ppc"), (":Mac:Build:pyexpat.mcp", "pyexpat.ppc"), @@ -199,43 +224,6 @@ def handle_dialog(filename): (":Mac:Build:TE.mcp", "TE.ppc"), ]), -I_68K_PLUGINS : (buildmwproject, "CWIE", [ - (":Mac:Build:ucnhash.mcp", "ucnhash.CFM68K"), - (":Mac:Build:ucnhash.mcp", "ucnhash.CFM68K"), - (":Mac:Build:ctb.mcp", "ctb.CFM68K"), - (":Mac:Build:gdbm.mcp", "gdbm.CFM68K"), - (":Mac:Build:icglue.mcp", "icglue.CFM68K"), - (":Mac:Build:waste.mcp", "waste.CFM68K"), - (":Mac:Build:zlib.mcp", "zlib.CFM68K"), -## (":Mac:Build:_tkinter.mcp", "_tkinter.CFM68K"), - (":Extensions:Imaging:_tkinter.mcp", "_tkinter.CFM68K"), - (":Mac:Build:ColorPicker.mcp", "ColorPicker.CFM68K"), - (":Mac:Build:Printing.mcp", "Printing.CFM68K"), - (":Mac:Build:App.mcp", "App.CFM68K"), - (":Mac:Build:Cm.mcp", "Cm.CFM68K"), - (":Mac:Build:Fm.mcp", "Fm.CFM68K"), - (":Mac:Build:Help.mcp", "Help.CFM68K"), - (":Mac:Build:Icn.mcp", "Icn.CFM68K"), - (":Mac:Build:List.mcp", "List.CFM68K"), - (":Mac:Build:Qdoffs.mcp", "Qdoffs.CFM68K"), - (":Mac:Build:Qt.mcp", "Qt.CFM68K"), - (":Mac:Build:Scrap.mcp", "Scrap.CFM68K"), - (":Mac:Build:Snd.mcp", "Snd.CFM68K"), - (":Mac:Build:Sndihooks.mcp", "Sndihooks.CFM68K"), - (":Mac:Build:TE.mcp", "TE.CFM68K"), - ]), - -I_68K_FULL : (buildmwproject, "CWIE", [ - (":Mac:Build:PythonStandalone.mcp", "Python68K"), - ]), - -I_68K_SMALL : (buildmwproject, "CWIE", [ - (":Mac:Build:PythonStandSmall.mcp", "PythonSmall68K"), - ]), - -I_PPC_FULL : (buildmwproject, "CWIE", [ - (":Mac:Build:PythonStandalone.mcp", "PythonStandalone"), - ]), I_PPC_SMALL : (buildmwproject, "CWIE", [ (":Mac:Build:PythonStandSmall.mcp", "PythonStandSmall"), @@ -255,13 +243,6 @@ def handle_dialog(filename): ## (":Extensions:Numerical:Packages:RNG:Mac:RNG.mcp", "RNG.ppc"), ]), -I_68K_EXTENSIONS : (buildmwproject, "CWIE", [ - (":Extensions:Imaging:_imaging.mcp", "_imaging.CFM68K"), -## (":Extensions:Imaging:_tkinter.mcp", "_tkinter.CFM68K"), - (":Extensions:img:Mac:imgmodules.mcp", "imgmodules CFM68K"), -## (":Extensions:NumPy:numpymodules.mcp", "numpymodules.CFM68K"), - ]), - I_APPLETS : (buildapplet, None, [ (":Mac:scripts:EditPythonPrefs.py", "EditPythonPrefs"), (":Mac:scripts:BuildApplet.py", "BuildApplet"), @@ -308,7 +289,8 @@ def main(): for routine, arg, list in instructions: routine(dir, arg, list) - print "All done!" + if todo: + print "All done!" if __name__ == '__main__': main() diff --git a/Mac/scripts/fullbuild.rsrc b/Mac/scripts/fullbuild.rsrc index 40dc1076b314342dc40fe4b638047b373106b06e..93217a628d54d0c1d50657ee5a440be583bb65eb 100644 GIT binary patch literal 1364 zcmbtU&ubG=5T4!aHnFYsw**mqy-P_;@Zh1eCUILEY3qs>DZ*y+lB~Y$hTV-OR6I%# zRuR;T9&J%k1n-L8Jb2Ng6ngUy@LbfHeVeAW6fDj%`{vF2-ZyV%XCLTC0aVy733Tm2 z9YtlRy{OkvHB`cv(ERBKzJ1XwJU{{!o&XpV{if}6?y`av@K=oJ zW~X?|vVHiMl`=P&8p+FhVNY`>WU+HAQ_8@ok#4k4XjhIZUsi1WyH1NnRZ~(#qVF|ZYU4t zdXnch?1g(Ux7e2xRuDKgo0-YUl?AB65`5LQoagh1YXR0^Ntx7>Gtsf)lPoA#(ECa6 zEnrq|;CQag<}oraBXh4ATA?J4SRNto3h|!9ri(pmu!6k0S;u~p(cj?i_qbcT-~@Jr zdJQ%B0N?cFc%vbBNYRypsa(zSZO@WK5pH*{{ur)Be;L63E!#UiL(WZoz0o`5@AT2% zw#1de=^* G$^HY^C&>Q* literal 1206 zcmcgs&ubGw6n?YWq%qXuZ%Xm7g(9AU4H86xSh6tP%JUfOaT@bla^l> zWxgHOHEcs>U1?hnXNj)TO{p#R|gCxvZX1)dMp1MBersj-A0Wv_U2v#`U}(@Q9hCuasq__(auhZ8W@4mWybP z-37ZJPZipNdtt-(!idj7y~IkLQFRXLCAQx=uC5`QC$rr`(WCep;yq-GTU)5N$|a!c z(qU(y5>R!KWmvTX?zLR!LbK^|(O)N>L~Yl4v1&E1X3K%8NG5x&te6@Y7fi|$wrDs8 zq|sUg_@_fW0wR6~{4RL?b|Z8mCP~j}ni;+G7I(QLjK`a{FobVJ|Iu}oWsi>NGxPM* zB@ch!7WagD?fIYZjk3x7rX4uGt;!J1`gga<-*P?b5u≺j#((CVQ)I{}T^&1N{qD z_3ZCpnl9t|!M+h=QLn25;tEcT(aukNJXML!AnYPe0nIF}R)A;BN^uS2C9|?z#F)`= RmSBubVYVwD6xNO;{spHaq_zM6