Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 67992b7

Browse files
jackjansenjackjansen
committed
Bit another bullet: all toolbox modules are now in dynamically loaded modules. Everything still seems to work, but the ConfigurePythonXXX on initial install may still need work.
1 parent 59c14e2 commit 67992b7

9 files changed

Lines changed: 41 additions & 146 deletions

File tree

‎Mac/Build/PythonCore.exp‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -816,48 +816,6 @@ PyMac_LoadCodeResourceModule
816816
PyMac_FindCodeResourceModule
817817
PyMac_FindResourceModule
818818
_PyImport_Inittab
819-
CtlObj_chain
820-
Control_Type
821-
initCtl
822-
_CtlObj_Convert
823-
_CtlObj_New
824-
DlgObj_chain
825-
Dialog_Type
826-
initDlg
827-
_DlgObj_Convert
828-
_DlgObj_New
829-
_DlgObj_WhichDialog
830-
MenuObj_chain
831-
Menu_Type
832-
initMenu
833-
_MenuObj_Convert
834-
_MenuObj_New
835-
GrafObj_chain
836-
GrafPort_Type
837-
BMObj_chain
838-
BitMap_Type
839-
QDGlobalsAccess_Type
840-
initQd
841-
BMObj_NewCopied
842-
_BMObj_Convert
843-
_BMObj_New
844-
_GrafObj_Convert
845-
_GrafObj_New
846-
_QdRGB_Convert
847-
_QdRGB_New
848-
ResObj_chain
849-
Resource_Type
850-
initRes
851-
_OptResObj_Convert
852-
_OptResObj_New
853-
_ResObj_Convert
854-
_ResObj_New
855-
WinObj_chain
856-
Window_Type
857-
initWin
858-
_WinObj_WhichWindow
859-
_WinObj_Convert
860-
_WinObj_New
861819
PyBuffer_Type
862820
PyBuffer_New
863821
PyBuffer_FromReadWriteMemory
@@ -1004,25 +962,9 @@ PyExc_RuntimeWarning
1004962
_PyExc_Fini
1005963
_PyExc_Init
1006964
initNav
1007-
AEDesc_chain
1008-
AEDesc_Type
1009-
upp_GenericEventHandler
1010-
upp_AEIdleProc
1011-
initAE
1012-
_AEDesc_Convert
1013-
_AEDesc_New
1014965
init_locale
1015-
initEvt
1016966
init_sre
1017967
initsha
1018-
DragObj_chain
1019-
DragObj_Type
1020-
dragglue_TrackingHandlerUPP
1021-
dragglue_ReceiveHandlerUPP
1022-
dragglue_SendDataUPP
1023-
initDrag
1024-
_DragObj_Convert
1025-
_DragObj_New
1026968
initxreadlines
1027969
PyCell_Type
1028970
PyCell_Set

‎Mac/Build/PythonCore.mcp‎

6.07 KB
Binary file not shown.

‎Mac/Build/PythonCoreCarbon.exp‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -810,48 +810,6 @@ PyMac_LoadCodeResourceModule
810810
PyMac_FindCodeResourceModule
811811
PyMac_FindResourceModule
812812
_PyImport_Inittab
813-
CtlObj_chain
814-
Control_Type
815-
initCtl
816-
_CtlObj_Convert
817-
_CtlObj_New
818-
DlgObj_chain
819-
Dialog_Type
820-
initDlg
821-
_DlgObj_Convert
822-
_DlgObj_New
823-
_DlgObj_WhichDialog
824-
MenuObj_chain
825-
Menu_Type
826-
initMenu
827-
_MenuObj_Convert
828-
_MenuObj_New
829-
GrafObj_chain
830-
GrafPort_Type
831-
BMObj_chain
832-
BitMap_Type
833-
QDGlobalsAccess_Type
834-
initQd
835-
BMObj_NewCopied
836-
_BMObj_Convert
837-
_BMObj_New
838-
_GrafObj_Convert
839-
_GrafObj_New
840-
_QdRGB_Convert
841-
_QdRGB_New
842-
ResObj_chain
843-
Resource_Type
844-
initRes
845-
_OptResObj_Convert
846-
_OptResObj_New
847-
_ResObj_Convert
848-
_ResObj_New
849-
WinObj_chain
850-
Window_Type
851-
initWin
852-
_WinObj_WhichWindow
853-
_WinObj_Convert
854-
_WinObj_New
855813
PyBuffer_Type
856814
PyBuffer_New
857815
PyBuffer_FromReadWriteMemory
@@ -998,25 +956,9 @@ PyExc_RuntimeWarning
998956
_PyExc_Fini
999957
_PyExc_Init
1000958
initNav
1001-
AEDesc_chain
1002-
AEDesc_Type
1003-
upp_GenericEventHandler
1004-
upp_AEIdleProc
1005-
initAE
1006-
_AEDesc_Convert
1007-
_AEDesc_New
1008959
init_locale
1009-
initEvt
1010960
init_sre
1011961
initsha
1012-
DragObj_chain
1013-
DragObj_Type
1014-
dragglue_TrackingHandlerUPP
1015-
dragglue_ReceiveHandlerUPP
1016-
dragglue_SendDataUPP
1017-
initDrag
1018-
_DragObj_Convert
1019-
_DragObj_New
1020962
initxreadlines
1021963
PyCell_Type
1022964
PyCell_Set

‎Mac/Include/macbuildno.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#define BUILD 97
1+
#define BUILD 101

‎Mac/Modules/macconfig.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ extern void initerrno();
8080
extern void initpcre();
8181
extern void initunicodedata();
8282
extern void init_codecs();
83+
extern void initNav();
8384
#ifdef USE_MACCTB
8485
extern void initctb();
8586
#endif
@@ -120,7 +121,6 @@ extern void initMenu();
120121
extern void initQd();
121122
extern void initRes();
122123
extern void initWin();
123-
extern void initNav();
124124
#endif
125125
#ifdef USE_QT
126126
extern void initCm();
@@ -207,6 +207,7 @@ struct _inittab _PyImport_Inittab[] = {
207207
{"unicodedata", initunicodedata},
208208
{"_codecs", init_codecs},
209209
{"sha", initsha},
210+
{"Nav", initNav},
210211
#ifdef USE_MACCTB
211212
{"ctb", initctb},
212213
#endif
@@ -228,7 +229,6 @@ struct _inittab _PyImport_Inittab[] = {
228229
{"Drag", initDrag},
229230
{"Evt", initEvt},
230231
{"Menu", initMenu},
231-
{"Nav", initNav},
232232
{"Qd", initQd},
233233
{"Win", initWin},
234234
{"Res", initRes},

‎Mac/mwerks/mwerks_shared_config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define USE_GUSI2 /* Stdio implemented with GUSI */
1111
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
1212
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
13-
#define USE_CORE_TOOLBOX /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
13+
/* #define USE_CORE_TOOLBOX /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
1414
/* #define USE_TOOLBOX /* Include all toolbox modules in core Python */
1515
/* #define USE_QT /* Include quicktime modules in core Python */
1616
/* #define USE_WASTE /* Include waste module in core Python */

‎Mac/mwerks/mwerks_shcarbon_config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/* # define USE_GUSI1 /* Stdio implemented with GUSI 1 */
1616
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
1717
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
18-
#define USE_CORE_TOOLBOX /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
18+
/* #define USE_CORE_TOOLBOX /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
1919
/* #define USE_TOOLBOX /* Include all toolbox modules in core Python */
2020
/* #define USE_QT /* Include quicktime modules in core Python */
2121
/* #define USE_WASTE /* Include waste module in core Python */

‎Mac/scripts/fullbuild.py‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,19 +249,28 @@ def handle_dialog(filename):
249249
(":Extensions:Imaging:_tkinter.mcp", "_tkinter.ppc"),
250250
(":Mac:Build:ColorPicker.mcp", "ColorPicker.ppc"),
251251
(":Mac:Build:Printing.mcp", "Printing.ppc"),
252+
(":Mac:Build:AE.mcp", "AE.ppc"),
252253
(":Mac:Build:App.mcp", "App.ppc"),
253254
(":Mac:Build:Cm.mcp", "Cm.ppc"),
255+
(":Mac:Build:Ctl.mcp", "Ctl.ppc"),
256+
(":Mac:Build:Dlg.mcp", "Dlg.ppc"),
257+
(":Mac:Build:Drag.mcp", "Drag.ppc"),
258+
(":Mac:Build:Evt.mcp", "Evt.ppc"),
254259
(":Mac:Build:Fm.mcp", "Fm.ppc"),
255260
(":Mac:Build:Help.mcp", "Help.ppc"),
256261
(":Mac:Build:Icn.mcp", "Icn.ppc"),
257262
(":Mac:Build:List.mcp", "List.ppc"),
263+
(":Mac:Build:Menu.mcp", "Menu.ppc"),
264+
(":Mac:Build:Mlte.mcp", "Mlte.ppc"),
265+
(":Mac:Build:Qd.mcp", "Qd.ppc"),
258266
(":Mac:Build:Qdoffs.mcp", "Qdoffs.ppc"),
259267
(":Mac:Build:Qt.mcp", "Qt.ppc"),
268+
(":Mac:Build:Res.mcp", "Res.ppc"),
260269
(":Mac:Build:Scrap.mcp", "Scrap.ppc"),
261270
(":Mac:Build:Snd.mcp", "Snd.ppc"),
262271
(":Mac:Build:Sndihooks.mcp", "Sndihooks.ppc"),
263272
(":Mac:Build:TE.mcp", "TE.ppc"),
264-
(":Mac:Build:Mlte.mcp", "Mlte.ppc"),
273+
(":Mac:Build:Win.mcp", "Win.ppc"),
265274
]),
266275

267276
I_CARBON_PLUGINS : (buildmwproject, "CWIE", [
@@ -277,20 +286,29 @@ def handle_dialog(filename):
277286
(":Mac:Build:_dummy_tkinter.mcp", "_tkinter.carbon"),
278287
## (":Extensions:Imaging:_tkinter.carbon.mcp", "_tkinter.carbon"),
279288
(":Mac:Build:ColorPicker.carbon.mcp", "ColorPicker.carbon"),
289+
(":Mac:Build:AE.carbon.mcp", "AE.carbon"),
280290
(":Mac:Build:App.carbon.mcp", "App.carbon"),
291+
(":Mac:Build:CF.carbon.mcp", "CF.carbon"),
281292
(":Mac:Build:Cm.carbon.mcp", "Cm.carbon"),
293+
(":Mac:Build:Ctl.carbon.mcp", "Ctl.carbon"),
294+
(":Mac:Build:Dlg.carbon.mcp", "Dlg.carbon"),
295+
(":Mac:Build:Drag.carbon.mcp", "Drag.carbon"),
296+
(":Mac:Build:Evt.carbon.mcp", "Evt.carbon"),
282297
(":Mac:Build:Fm.carbon.mcp", "Fm.carbon"),
283298
(":Mac:Build:Icn.carbon.mcp", "Icn.carbon"),
284299
(":Mac:Build:List.carbon.mcp", "List.carbon"),
300+
(":Mac:Build:Menu.carbon.mcp", "Menu.carbon"),
301+
(":Mac:Build:Mlte.carbon.mcp", "Mlte.carbon"),
302+
(":Mac:Build:Qd.carbon.mcp", "Qd.carbon"),
285303
(":Mac:Build:Qdoffs.carbon.mcp", "Qdoffs.carbon"),
286304
(":Mac:Build:Qt.carbon.mcp", "Qt.carbon"),
305+
(":Mac:Build:Res.carbon.mcp", "Res.carbon"),
287306
(":Mac:Build:Scrap.carbon.mcp", "Scrap.carbon"),
288307
(":Mac:Build:Snd.carbon.mcp", "Snd.carbon"),
289308
(":Mac:Build:Sndihooks.carbon.mcp", "Sndihooks.carbon"),
290309
(":Mac:Build:TE.carbon.mcp", "TE.carbon"),
310+
(":Mac:Build:Win.carbon.mcp", "Win.carbon"),
291311

292-
(":Mac:Build:CF.carbon.mcp", "CF.carbon"),
293-
(":Mac:Build:Mlte.carbon.mcp", "Mlte.carbon"),
294312
]),
295313

296314
I_PPC_FULL : (buildmwproject, "CWIE", [

‎Mac/scripts/genpluginprojects.py‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -105,39 +105,31 @@ def genallprojects(force=0):
105105
genpluginproject("all", "_testcapi")
106106

107107
# bgen-generated Toolbox modules
108+
genpluginproject("carbon", "AE")
109+
genpluginproject("ppc", "AE", libraries=["ObjectSupportLib"])
108110
genpluginproject("ppc", "App", libraries=["AppearanceLib"])
109111
genpluginproject("carbon", "App")
110-
## genpluginproject("ppc", "Cm",
111-
## libraries=["QuickTimeLib"],
112-
## extraexportsymbols=[
113-
## "CmpObj_New",
114-
## "CmpObj_Convert",
115-
## "CmpInstObj_New",
116-
## "CmpInstObj_Convert",
117-
## ])
118-
## genpluginproject("carbon", "Cm",
119-
## extraexportsymbols=[
120-
## "CmpObj_New",
121-
## "CmpObj_Convert",
122-
## "CmpInstObj_New",
123-
## "CmpInstObj_Convert",
124-
## ])
125112
genpluginproject("ppc", "Cm", libraries=["QuickTimeLib"])
126113
genpluginproject("carbon", "Cm")
114+
genpluginproject("carbon", "Ctl")
115+
genpluginproject("ppc", "Ctl", libraries=["ControlsLib", "AppearanceLib"])
116+
genpluginproject("carbon", "Dlg")
117+
genpluginproject("ppc", "Dlg", libraries=["DialogsLib", "AppearanceLib"])
118+
genpluginproject("carbon", "Drag")
119+
genpluginproject("ppc", "Drag", libraries=["DragLib"])
120+
genpluginproject("all", "Evt")
127121
genpluginproject("all", "Fm")
128122
genpluginproject("ppc", "Help")
129123
genpluginproject("ppc", "Icn", libraries=["IconServicesLib"])
130124
genpluginproject("carbon", "Icn")
131125
genpluginproject("all", "List")
132-
## genpluginproject("ppc", "Qt", libraries=["QuickTimeLib", "Cm.ppc.slb", "Qdoffs.ppc.slb"],
133-
## extradirs=["::Plugins"])
126+
genpluginproject("carbon", "Menu")
127+
genpluginproject("ppc", "Menu", libraries=["MenusLib", "ContextualMenu", "AppearanceLib"])
128+
genpluginproject("all", "Qd")
134129
genpluginproject("ppc", "Qt", libraries=["QuickTimeLib"])
135-
## genpluginproject("carbon", "Qt", libraries=["Cm.carbon.slb", "Qdoffs.carbon.slb"],
136-
## extradirs=["::Plugins"])
137130
genpluginproject("carbon", "Qt")
138-
## genpluginproject("all", "Qdoffs",
139-
## extraexportsymbols=["GWorldObj_New", "GWorldObj_Convert"])
140131
genpluginproject("all", "Qdoffs")
132+
genpluginproject("all", "Res")
141133
genpluginproject("all", "Scrap")
142134
genpluginproject("ppc", "Snd", libraries=["SoundLib"])
143135
genpluginproject("carbon", "Snd")
@@ -146,7 +138,8 @@ def genallprojects(force=0):
146138
genpluginproject("carbon", "TE")
147139
genpluginproject("ppc", "Mlte", libraries=["Textension"])
148140
genpluginproject("carbon", "Mlte")
149-
141+
genpluginproject("carbon", "Win")
142+
genpluginproject("ppc", "Win", libraries=["WindowsLib", "AppearanceLib"])
150143
# Carbon Only?
151144
genpluginproject("carbon", "CF")
152145

0 commit comments

Comments
 (0)