Bit another bullet: all toolbox modules are now in dynamically loaded modules. Everyt...

diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp
index cf77ed16a74836d150292b7f96ad5be194f79600..662009a445d2cd8bb6d50a8fecba438ea7e034cc 100644 (file)
--- a/Mac/Build/PythonCore.exp
+++ b/Mac/Build/PythonCore.exp
@@ -816,48 +816,6 @@ PyMac_LoadCodeResourceModule
 PyMac_FindCodeResourceModule
 PyMac_FindResourceModule
 _PyImport_Inittab
-CtlObj_chain
-Control_Type
-initCtl
-_CtlObj_Convert
-_CtlObj_New
-DlgObj_chain
-Dialog_Type
-initDlg
-_DlgObj_Convert
-_DlgObj_New
-_DlgObj_WhichDialog
-MenuObj_chain
-Menu_Type
-initMenu
-_MenuObj_Convert
-_MenuObj_New
-GrafObj_chain
-GrafPort_Type
-BMObj_chain
-BitMap_Type
-QDGlobalsAccess_Type
-initQd
-BMObj_NewCopied
-_BMObj_Convert
-_BMObj_New
-_GrafObj_Convert
-_GrafObj_New
-_QdRGB_Convert
-_QdRGB_New
-ResObj_chain
-Resource_Type
-initRes
-_OptResObj_Convert
-_OptResObj_New
-_ResObj_Convert
-_ResObj_New
-WinObj_chain
-Window_Type
-initWin
-_WinObj_WhichWindow
-_WinObj_Convert
-_WinObj_New
 PyBuffer_Type
 PyBuffer_New
 PyBuffer_FromReadWriteMemory
@@ -1004,25 +962,9 @@ PyExc_RuntimeWarning
 _PyExc_Fini
 _PyExc_Init
 initNav
-AEDesc_chain
-AEDesc_Type
-upp_GenericEventHandler
-upp_AEIdleProc
-initAE
-_AEDesc_Convert
-_AEDesc_New
 init_locale
-initEvt
 init_sre
 initsha
-DragObj_chain
-DragObj_Type
-dragglue_TrackingHandlerUPP
-dragglue_ReceiveHandlerUPP
-dragglue_SendDataUPP
-initDrag
-_DragObj_Convert
-_DragObj_New
 initxreadlines
 PyCell_Type
 PyCell_Set

diff --git a/Mac/Build/PythonCore.mcp b/Mac/Build/PythonCore.mcp
index c662d6267fc981a4f4d7c0ba4f72b79442264b99..addc8ba4bb5b07736adeb5023fb2d3ccc3e75914 100644 (file)
Binary files a/Mac/Build/PythonCore.mcp and b/Mac/Build/PythonCore.mcp differ

diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp
index 3cfc93acc252a3f9f675dfc3a54eeea3a4473e70..019070c68a97d576e6ef97ff023f74fa238bbd3c 100644 (file)
--- a/Mac/Build/PythonCoreCarbon.exp
+++ b/Mac/Build/PythonCoreCarbon.exp
@@ -810,48 +810,6 @@ PyMac_LoadCodeResourceModule
 PyMac_FindCodeResourceModule
 PyMac_FindResourceModule
 _PyImport_Inittab
-CtlObj_chain
-Control_Type
-initCtl
-_CtlObj_Convert
-_CtlObj_New
-DlgObj_chain
-Dialog_Type
-initDlg
-_DlgObj_Convert
-_DlgObj_New
-_DlgObj_WhichDialog
-MenuObj_chain
-Menu_Type
-initMenu
-_MenuObj_Convert
-_MenuObj_New
-GrafObj_chain
-GrafPort_Type
-BMObj_chain
-BitMap_Type
-QDGlobalsAccess_Type
-initQd
-BMObj_NewCopied
-_BMObj_Convert
-_BMObj_New
-_GrafObj_Convert
-_GrafObj_New
-_QdRGB_Convert
-_QdRGB_New
-ResObj_chain
-Resource_Type
-initRes
-_OptResObj_Convert
-_OptResObj_New
-_ResObj_Convert
-_ResObj_New
-WinObj_chain
-Window_Type
-initWin
-_WinObj_WhichWindow
-_WinObj_Convert
-_WinObj_New
 PyBuffer_Type
 PyBuffer_New
 PyBuffer_FromReadWriteMemory
@@ -998,25 +956,9 @@ PyExc_RuntimeWarning
 _PyExc_Fini
 _PyExc_Init
 initNav
-AEDesc_chain
-AEDesc_Type
-upp_GenericEventHandler
-upp_AEIdleProc
-initAE
-_AEDesc_Convert
-_AEDesc_New
 init_locale
-initEvt
 init_sre
 initsha
-DragObj_chain
-DragObj_Type
-dragglue_TrackingHandlerUPP
-dragglue_ReceiveHandlerUPP
-dragglue_SendDataUPP
-initDrag
-_DragObj_Convert
-_DragObj_New
 initxreadlines
 PyCell_Type
 PyCell_Set

diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index 1956b4daede789114fc9d7f04449d44a9977ba41..e282285f574e6ed3606dbe4a7f12d560ad59d9af 100644 (file)
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 97
+#define BUILD 101

diff --git a/Mac/Modules/macconfig.c b/Mac/Modules/macconfig.c
index 62fa76b72c80e49458726b44336913e730023209..8e577e38fe335979a9301172953d0ccbdd17711e 100644 (file)
--- a/Mac/Modules/macconfig.c
+++ b/Mac/Modules/macconfig.c
@@ -80,6 +80,7 @@ extern void initerrno();
 extern void initpcre();
 extern void initunicodedata();
 extern void init_codecs();
+extern void initNav();
 #ifdef USE_MACCTB
 extern void initctb();
 #endif
@@ -120,7 +121,6 @@ extern void initMenu();
 extern void initQd();
 extern void initRes();
 extern void initWin();
-extern void initNav();
 #endif
 #ifdef USE_QT
 extern void initCm();
@@ -207,6 +207,7 @@ struct _inittab _PyImport_Inittab[] = {
        {"unicodedata", initunicodedata},
        {"_codecs", init_codecs},
        {"sha", initsha},
+       {"Nav", initNav},
 #ifdef USE_MACCTB
        {"ctb", initctb},
 #endif
@@ -228,7 +229,6 @@ struct _inittab _PyImport_Inittab[] = {
        {"Drag", initDrag},
        {"Evt", initEvt},
        {"Menu", initMenu},
-       {"Nav", initNav},
        {"Qd", initQd},
        {"Win", initWin},
        {"Res", initRes},

diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h
index 05e9293350696dd822860b6203c4f0b2bdac1573..db5dffc86ebbb31d929d10b22bdbaaa42184d2af 100644 (file)
--- a/Mac/mwerks/mwerks_shared_config.h
+++ b/Mac/mwerks/mwerks_shared_config.h
@@ -10,7 +10,7 @@
 #define USE_GUSI2              /* Stdio implemented with GUSI */
 #define WITH_THREAD            /* Use thread support (needs GUSI 2, not GUSI 1) */
 #define USE_MSL                        /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
-#define USE_CORE_TOOLBOX       /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
+/* #define USE_CORE_TOOLBOX    /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
 /* #define USE_TOOLBOX         /* Include all toolbox modules in core Python */
 /* #define USE_QT              /* Include quicktime modules in core Python */
 /* #define USE_WASTE           /* Include waste module in core Python */

diff --git a/Mac/mwerks/mwerks_shcarbon_config.h b/Mac/mwerks/mwerks_shcarbon_config.h
index 26a9b141edfaf646af6f2ec29d196f22a9d1a493..24e6129009c34d8420acc0b45f5a9c186dfafa7b 100644 (file)
--- a/Mac/mwerks/mwerks_shcarbon_config.h
+++ b/Mac/mwerks/mwerks_shcarbon_config.h
@@ -15,7 +15,7 @@
 /* # define USE_GUSI1  /* Stdio implemented with GUSI 1 */
 #define WITH_THREAD            /* Use thread support (needs GUSI 2, not GUSI 1) */
 #define USE_MSL                        /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
-#define USE_CORE_TOOLBOX       /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
+/* #define USE_CORE_TOOLBOX    /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
 /* #define USE_TOOLBOX         /* Include all toolbox modules in core Python */
 /* #define USE_QT              /* Include quicktime modules in core Python */
 /* #define USE_WASTE           /* Include waste module in core Python */

diff --git a/Mac/scripts/fullbuild.py b/Mac/scripts/fullbuild.py
index 5b3702cf9734a1da9f9dab9dd91f2fdebe195c61..d3a5a13c7c510bc954a5baa2337ed6e75a02ef8e 100644 (file)
--- a/Mac/scripts/fullbuild.py
+++ b/Mac/scripts/fullbuild.py
@@ -249,19 +249,28 @@ I_PPC_PLUGINS : (buildmwproject, "CWIE", [
        (":Extensions:Imaging:_tkinter.mcp", "_tkinter.ppc"),
        (":Mac:Build:ColorPicker.mcp", "ColorPicker.ppc"),
        (":Mac:Build:Printing.mcp", "Printing.ppc"),
+       (":Mac:Build:AE.mcp", "AE.ppc"),
        (":Mac:Build:App.mcp", "App.ppc"),
        (":Mac:Build:Cm.mcp", "Cm.ppc"),
+       (":Mac:Build:Ctl.mcp", "Ctl.ppc"),
+       (":Mac:Build:Dlg.mcp", "Dlg.ppc"),
+       (":Mac:Build:Drag.mcp", "Drag.ppc"),
+       (":Mac:Build:Evt.mcp", "Evt.ppc"),
        (":Mac:Build:Fm.mcp", "Fm.ppc"),
        (":Mac:Build:Help.mcp", "Help.ppc"),
        (":Mac:Build:Icn.mcp", "Icn.ppc"),
        (":Mac:Build:List.mcp", "List.ppc"),
+       (":Mac:Build:Menu.mcp", "Menu.ppc"),
+       (":Mac:Build:Mlte.mcp", "Mlte.ppc"),
+       (":Mac:Build:Qd.mcp", "Qd.ppc"),
        (":Mac:Build:Qdoffs.mcp", "Qdoffs.ppc"),
        (":Mac:Build:Qt.mcp", "Qt.ppc"),
+       (":Mac:Build:Res.mcp", "Res.ppc"),
        (":Mac:Build:Scrap.mcp", "Scrap.ppc"),
        (":Mac:Build:Snd.mcp", "Snd.ppc"),
        (":Mac:Build:Sndihooks.mcp", "Sndihooks.ppc"),
        (":Mac:Build:TE.mcp", "TE.ppc"),
-       (":Mac:Build:Mlte.mcp", "Mlte.ppc"),
+       (":Mac:Build:Win.mcp", "Win.ppc"),
        ]),
 
 I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
@@ -277,20 +286,29 @@ I_CARBON_PLUGINS :  (buildmwproject, "CWIE", [
        (":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
 ##     (":Extensions:Imaging:_tkinter.carbon.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: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"),
        
-       (":Mac:Build:CF.carbon.mcp", "CF.carbon"),
-       (":Mac:Build:Mlte.carbon.mcp", "Mlte.carbon"),
        ]),
 
 I_PPC_FULL : (buildmwproject, "CWIE", [

diff --git a/Mac/scripts/genpluginprojects.py b/Mac/scripts/genpluginprojects.py
index b7d2f6c802e0a6ed505860387456ee56109200a1..ead0c24e0fbaa2bb75f515ed4c6030091b0b90a6 100644 (file)
--- a/Mac/scripts/genpluginprojects.py
+++ b/Mac/scripts/genpluginprojects.py
@@ -105,39 +105,31 @@ def       genallprojects(force=0):
        genpluginproject("all", "_testcapi")
        
        # bgen-generated Toolbox modules
+       genpluginproject("carbon", "AE")
+       genpluginproject("ppc", "AE", libraries=["ObjectSupportLib"])
        genpluginproject("ppc", "App", libraries=["AppearanceLib"])
        genpluginproject("carbon", "App")
-##     genpluginproject("ppc", "Cm",
-##             libraries=["QuickTimeLib"],
-##             extraexportsymbols=[
-##                     "CmpObj_New",
-##                     "CmpObj_Convert",
-##                     "CmpInstObj_New",
-##                     "CmpInstObj_Convert",
-##             ])
-##     genpluginproject("carbon", "Cm",
-##             extraexportsymbols=[
-##                     "CmpObj_New",
-##                     "CmpObj_Convert",
-##                     "CmpInstObj_New",
-##                     "CmpInstObj_Convert",
-##             ])
        genpluginproject("ppc", "Cm", libraries=["QuickTimeLib"])
        genpluginproject("carbon", "Cm")
+       genpluginproject("carbon", "Ctl")
+       genpluginproject("ppc", "Ctl", libraries=["ControlsLib", "AppearanceLib"])
+       genpluginproject("carbon", "Dlg")
+       genpluginproject("ppc", "Dlg", libraries=["DialogsLib", "AppearanceLib"])
+       genpluginproject("carbon", "Drag")
+       genpluginproject("ppc", "Drag", libraries=["DragLib"])
+       genpluginproject("all", "Evt")
        genpluginproject("all", "Fm")
        genpluginproject("ppc", "Help")
        genpluginproject("ppc", "Icn", libraries=["IconServicesLib"])
        genpluginproject("carbon", "Icn")
        genpluginproject("all", "List")
-##     genpluginproject("ppc", "Qt", libraries=["QuickTimeLib", "Cm.ppc.slb", "Qdoffs.ppc.slb"], 
-##                     extradirs=["::Plugins"])
+       genpluginproject("carbon", "Menu")
+       genpluginproject("ppc", "Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"])
+       genpluginproject("all", "Qd")
        genpluginproject("ppc", "Qt", libraries=["QuickTimeLib"])
-##     genpluginproject("carbon", "Qt", libraries=["Cm.carbon.slb", "Qdoffs.carbon.slb"],
-##                     extradirs=["::Plugins"])
        genpluginproject("carbon", "Qt")
-##     genpluginproject("all", "Qdoffs",
-##             extraexportsymbols=["GWorldObj_New", "GWorldObj_Convert"])
        genpluginproject("all", "Qdoffs")
+       genpluginproject("all", "Res")
        genpluginproject("all", "Scrap")
        genpluginproject("ppc", "Snd", libraries=["SoundLib"])
        genpluginproject("carbon", "Snd")
@@ -146,7 +138,8 @@ def genallprojects(force=0):
        genpluginproject("carbon", "TE")
        genpluginproject("ppc", "Mlte", libraries=["Textension"])
        genpluginproject("carbon", "Mlte")
-       
+       genpluginproject("carbon", "Win")
+       genpluginproject("ppc", "Win", libraries=["WindowsLib", "AppearanceLib"])
        # Carbon Only?
        genpluginproject("carbon", "CF")