Started on support for using standard setup.py to build at least

the "standard" modules. Unfinished, but shouldn't harm anything.

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 054f40e988235ef2e2eff87fcac54790119a232e..cb1bc9f4ca524b553c9ae9b9c3cbf7f386ed9661 100644 (file)
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -171,6 +171,71 @@ def buildcopy(top, dummy, list):
                dst = os.path.join(top, dst)
                macostools.copy(src, dst, forcetype="APPL")
                
+def buildsetup(top, dummy, list):
+       print 'Building extensions with setup.py ', ' '.join(list)
+       argv = ['setup.py'] + list[:]
+       save_argv = sys.argv
+       sys.argv = argv
+       sys.path.insert(0, top)
+       m = __import__('setup')
+       r = getattr(m, 'main')
+       r()
+       del sys.path[0]
+       sys.argv = save_argv
+
+def buildcarbonplugins(top, dummy1, dummy2):
+## XXXX Need to convert pathnames, I guess, and adapt distutils Mac-specific
+## code to not call GetArgv if not needed.
+##     buildsetup(top, None, [
+##             '--dry_run',
+##             'install',
+##                '--prefix=%s' % sys.prefix,
+##                '--install-scripts=%s' % os.path.join(sys.prefix, 'Scripts'),
+##                '--install-platlib=%s' % os.path.join(sys.prefix, 'Lib', 'lib-dynload')
+##             ])
+       buildmwproject(top, "CWIE", [
+               (":Mac:Build:_weakref.carbon.mcp", "_weakref.carbon"),
+               (":Mac:Build:_symtable.carbon.mcp", "_symtable.carbon"),
+               (":Mac:Build:_testcapi.carbon.mcp", "_testcapi.carbon"),
+               (":Mac:Build:_hotshot.carbon.mcp", "_hotshot.carbon"),
+               (":Mac:Build:xx.carbon.mcp", "xx.carbon"),
+               (":Mac:Build:xxsubtype.carbon.mcp", "xxsubtype.carbon"),
+               (":Mac:Build:pyexpat.carbon.mcp", "pyexpat.carbon"),
+               (":Mac:Build:calldll.carbon.mcp", "calldll.carbon"),
+               (":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"),
+               (":Mac:Build:icglue.carbon.mcp", "icglue.carbon"),
+               (":Mac:Build:waste.carbon.mcp", "waste.carbon"),
+               (":Mac:Build:zlib.carbon.mcp", "zlib.carbon"),
+               (":Mac:Build:hfsplus.carbon.mcp", "hfsplus.carbon"),
+       ##      (":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
+               (":Extensions:Imaging:_tkinter.mcp", "_tkinter.carbon"),
+               (":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"),
+               (":Mac:Build:_AE.carbon.mcp", "_AE.carbon"),
+               (":Mac:Build:_App.carbon.mcp", "_App.carbon"),
+               (":Mac:Build:_CF.carbon.mcp", "_CF.carbon"),
+               (":Mac:Build:_CG.carbon.mcp", "_CG.carbon"),
+               (":Mac:Build:_CarbonEvt.carbon.mcp", "_CarbonEvt.carbon"),
+               (":Mac:Build:_Cm.carbon.mcp", "_Cm.carbon"),
+               (":Mac:Build:_Ctl.carbon.mcp", "_Ctl.carbon"),
+               (":Mac:Build:_Dlg.carbon.mcp", "_Dlg.carbon"),
+               (":Mac:Build:_Drag.carbon.mcp", "_Drag.carbon"),
+               (":Mac:Build:_Evt.carbon.mcp", "_Evt.carbon"),
+               (":Mac:Build:_Fm.carbon.mcp", "_Fm.carbon"),
+               (":Mac:Build:_Icn.carbon.mcp", "_Icn.carbon"),
+               (":Mac:Build:_List.carbon.mcp", "_List.carbon"),
+               (":Mac:Build:_Menu.carbon.mcp", "_Menu.carbon"),
+               (":Mac:Build:_Mlte.carbon.mcp", "_Mlte.carbon"),
+               (":Mac:Build:_Qd.carbon.mcp", "_Qd.carbon"),
+               (":Mac:Build:_Qdoffs.carbon.mcp", "_Qdoffs.carbon"),
+               (":Mac:Build:_Qt.carbon.mcp", "_Qt.carbon"),
+               (":Mac:Build:_Res.carbon.mcp", "_Res.carbon"),
+               (":Mac:Build:_Scrap.carbon.mcp", "_Scrap.carbon"),
+               (":Mac:Build:_Snd.carbon.mcp", "_Snd.carbon"),
+               (":Mac:Build:_Sndihooks.carbon.mcp", "_Sndihooks.carbon"),
+               (":Mac:Build:_TE.carbon.mcp", "_TE.carbon"),
+               (":Mac:Build:_Win.carbon.mcp", "_Win.carbon"),
+       ])
+       
 def handle_dialog(filename):
        """Handle selection dialog, return list of selected items"""
        d = Dlg.GetNewDialog(DIALOG_ID, -1)
@@ -281,49 +346,7 @@ I_PPC_PLUGINS : (buildmwproject, "CWIE", [
        (":Mac:Build:_Win.mcp", "_Win.ppc"),
        ]),
 
-I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
-       (":Mac:Build:_weakref.carbon.mcp", "_weakref.carbon"),
-       (":Mac:Build:_symtable.carbon.mcp", "_symtable.carbon"),
-       (":Mac:Build:_testcapi.carbon.mcp", "_testcapi.carbon"),
-       (":Mac:Build:_hotshot.carbon.mcp", "_hotshot.carbon"),
-       (":Mac:Build:xx.carbon.mcp", "xx.carbon"),
-       (":Mac:Build:xxsubtype.carbon.mcp", "xxsubtype.carbon"),
-       (":Mac:Build:pyexpat.carbon.mcp", "pyexpat.carbon"),
-       (":Mac:Build:calldll.carbon.mcp", "calldll.carbon"),
-       (":Mac:Build:gdbm.carbon.mcp", "gdbm.carbon"),
-       (":Mac:Build:icglue.carbon.mcp", "icglue.carbon"),
-       (":Mac:Build:waste.carbon.mcp", "waste.carbon"),
-       (":Mac:Build:zlib.carbon.mcp", "zlib.carbon"),
-       (":Mac:Build:hfsplus.carbon.mcp", "hfsplus.carbon"),
-##     (":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
-       (":Extensions:Imaging:_tkinter.mcp", "_tkinter.carbon"),
-       (":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"),
-       (":Mac:Build:_AE.carbon.mcp", "_AE.carbon"),
-       (":Mac:Build:_App.carbon.mcp", "_App.carbon"),
-       (":Mac:Build:_CF.carbon.mcp", "_CF.carbon"),
-       (":Mac:Build:_CG.carbon.mcp", "_CG.carbon"),
-       (":Mac:Build:_CarbonEvt.carbon.mcp", "_CarbonEvt.carbon"),
-       (":Mac:Build:_Cm.carbon.mcp", "_Cm.carbon"),
-       (":Mac:Build:_Ctl.carbon.mcp", "_Ctl.carbon"),
-       (":Mac:Build:_Dlg.carbon.mcp", "_Dlg.carbon"),
-       (":Mac:Build:_Drag.carbon.mcp", "_Drag.carbon"),
-       (":Mac:Build:_Evt.carbon.mcp", "_Evt.carbon"),
-       (":Mac:Build:_Fm.carbon.mcp", "_Fm.carbon"),
-       (":Mac:Build:_Icn.carbon.mcp", "_Icn.carbon"),
-       (":Mac:Build:_List.carbon.mcp", "_List.carbon"),
-       (":Mac:Build:_Menu.carbon.mcp", "_Menu.carbon"),
-       (":Mac:Build:_Mlte.carbon.mcp", "_Mlte.carbon"),
-       (":Mac:Build:_Qd.carbon.mcp", "_Qd.carbon"),
-       (":Mac:Build:_Qdoffs.carbon.mcp", "_Qdoffs.carbon"),
-       (":Mac:Build:_Qt.carbon.mcp", "_Qt.carbon"),
-       (":Mac:Build:_Res.carbon.mcp", "_Res.carbon"),
-       (":Mac:Build:_Scrap.carbon.mcp", "_Scrap.carbon"),
-       (":Mac:Build:_Snd.carbon.mcp", "_Snd.carbon"),
-       (":Mac:Build:_Sndihooks.carbon.mcp", "_Sndihooks.carbon"),
-       (":Mac:Build:_TE.carbon.mcp", "_TE.carbon"),
-       (":Mac:Build:_Win.carbon.mcp", "_Win.carbon"),
-       
-       ]),
+I_CARBON_PLUGINS :  (buildcarbonplugins, None, []),
 
 I_PPC_FULL : (buildmwproject, "CWIE", [
                (":Mac:Build:PythonStandalone.mcp", "PythonStandalone"),