From 67992b7732ed305f41465e3b43fda551e09d5345 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Tue, 7 Aug 2001 13:53:25 +0000 Subject: [PATCH] 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. --- Mac/Build/PythonCore.exp | 58 ---------------------------- Mac/Build/PythonCore.mcp | Bin 158538 -> 164756 bytes Mac/Build/PythonCoreCarbon.exp | 58 ---------------------------- Mac/Include/macbuildno.h | 2 +- Mac/Modules/macconfig.c | 4 +- Mac/mwerks/mwerks_shared_config.h | 2 +- Mac/mwerks/mwerks_shcarbon_config.h | 2 +- Mac/scripts/fullbuild.py | 24 ++++++++++-- Mac/scripts/genpluginprojects.py | 37 +++++++----------- 9 files changed, 41 insertions(+), 146 deletions(-) diff --git a/Mac/Build/PythonCore.exp b/Mac/Build/PythonCore.exp index cf77ed16a748..662009a445d2 100644 --- 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 GIT binary patch delta 2423 zc-q~Sdr(wW9LMkPx9o-0T~^*G;Nk;ZB#;4e@R^K)X%Z_8>JX^71;~P+PzH$#m?$E$ z9`pD}LMwzsp4(&6%dZnrU}FXMc}#e)pX3 zo^#Ks^STYyeY~xOh53RYXaoVw0xo=8z(t=O^d1`!w3ed#fEwa5{q*=Q)DY)bLBM!J z6*;SP)DRs~aG4vhj{=X2P80;s)6(joG&eTc?Ct`B7G%2zXhFIanhI=&+1m(Il%TIt zQIKrr?ZEbgkB3M$BEpyLi*T0;hmQjGRZ;{qIYf3aBtmj~>c^4HXbogDt#PoQy=fi7 zPFl^nOTF`}mL}xofZ;VVmk{N|Jl0|x#wHe9merECn0S>aCCZ4U#4=(zv4*H1DhXv- zD~Q*LmC6!{)kFZj%HW8aC<}T}2me8Y*?!GolNgJD1QLBtCFE(Y} zSE8bK)sHJt-K#`RuUfVLRt=^v3GjGC17e3g-o%dDo@HM7lYE}|2iW7&q(Nn_Abmbf zB#E|W@%@3Ym)n9t$L9oto~^p*&faf31tl$EQ+oEV!S{9mE@xmzRU>V=!JQ9oG_Z*PPuQ(tGEeTTndsQe!Ro8*E z`=&u7)f^BtQuBs!D3vl%BWE^2U*z>paFM@gg*B)S6OPa@SCmW+9m>(E;Nxny*jdIp zgJf&+L^;`nULy7I^I{#(9GCJ=oa)c`a8K$!3FPr6NCD~V>xMB;R!A0eK?Cf-4Ux69 zY1fBFDe90n?@fUKUU&?2iu*9}Us(KuB%1g?H!?K^AeA%J^r|{&$1Sj1eC5gM z&}3jIPq<4LD%b1TuhyWy9brd_Af(zJ9^uxbf}kyxDvlw_o3v0M%BdC5CrmoMtx>Q3 z(X!hiNX!NoZi|J1d~XQq<+UN$Xygea(JY6=;Vk6uj7EzbGzRNIzB?AL0i5IQ<8i2q z@;3heSu$CE{p7<=xCZ>@bW&kl3i^Xwo=RFkhte^Cn~s24aOWMG6S3QCeiN08D;jNh%DOP?$hb)%=kcnrb%l@Qo(64CGOWDEz?-)9O zSCyMjfSg|hLEosxwVzU?y(ccztm0j>(RV-{-65j4nm?i3Vb^-nm|n>T&Y@>+?3AS#^WN{w0y9^vH3WCpsf|8dLG5#ltKdr`hI(S_UMn=E#JH=ep{5*R1 zL!7$O!5`CGCs>WUwozb|8c!a~yK->XfW^1T5!L*+X0qeey2JbO{kfz>h@zOgny>Cl z`H5=&S}bqRMJJX5Z7~a0SJ4Y{Qv*} delta 3103 zc-qaDe{fXQ702JX*|*8Y1vYIW`2`6mun7S|W0j(VA~c9X+`%wIqfTpfA~8loAwM9o z?2oL(&ClIjnkyRGKpl|~Vmfa+4>Uw31Z1G76{_j9L|UdDterL;$Ii6%N5A*ImrbTy zJ7fRq&V2UXbMATfoqO*6-rfBz$rs*pq^o%&D+~TK^{%XWKY{lc z;R}qTF>D*Yz!m;f)*4qkjH3>GfeA$=ZRJD)@saGa_U=C`O3B}}@Vu=_QIDNJ>`rDX z>CqHI&?k!@A~_B5HSYOj)1Gu6B7S-E3f}5Y;f2f6__1ZPwVM2I5qIXV;lqm-YDonj z-Jan?8h#J}LC_3B;8{Ldo|D&#UK?l!9iS6*fe46#Zot8Q?)2U{YXH6DU=R%P`@FZP zqv)OCmENT^E+Vxw-yU9|C^aKmwDq4PUahCO_IB~b7oB0l!JDc~`~6hIrXOp)-tFXw zU{z7j&0Q5s_(!$t`Ne(d+?Afo6I)z)T^Q*E&w_oR1w04BpcS+MS!3nGYElwAPibT8)yd|pc8a~2#A7i z!1<0)(X6BB_1nxHKh9qXEmcR*dxO6dD$uf9+9=J3P4|NU2!du1;_cxg#{hbR4q4gL z;T#&}zX=y687BnU|9hdF6;1rR^#%N|S%3Cju_gC%4lfr?&mF zjcI+YPNsd>V^83|o+|D5#>FnU22MCS6xrkra>OsA~FxhZGVa>}Bd7yeP2D}J?(oZ_47 z$*sx*{By&ZBJVrnL*^m86z`VD{H=JmJo#_OyQLW3iFeC8<`?m9ske9I-BN;=)}brg|u(jO=z#$qQ5+k7WQJ!iEOhtm@E4Q13n z>p!bX|9l=LkltLz?oZbr3Q%&MaV*Sy9lIyK3ro zdMkFpQmu$#Ew^_Q;{yj*GmoNu{`3Rv{~)0!nEvod`nW>xAEQ*eUXsHu&QbRo3fgfJ z5;$1MoQ9&#%&`52n5JzhuCp`jprNa2Tk7o18Fpw|V$v2FE0|ji$0TM3wZ^n%+HEmW znRa_jO{U!ulaXn6#`I&_T`}R9b|j`4(~icZV%ps?jhHr%iNmn*rXDpE5nGx# zu#$PyyGC?HJYCANq{jg@q?2x6&3-*wzj%r& z?fRoz*)Gm5!*GHb{QLNUIX>`=@HDWr1bQM#R5q|;#&_#O4eTl)d1po_)C|hB}=dFO7T58{=02bXy*8VKVp1~xxnp{A`)b2 fS(GF1*jLPeUIbIAIYItS;xr~;{f~(8ARGP{>CGe$ diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp index 3cfc93acc252..019070c68a97 100644 --- 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 1956b4daede7..e282285f574e 100644 --- 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 62fa76b72c80..8e577e38fe33 100644 --- 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 05e929335069..db5dffc86ebb 100644 --- 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 26a9b141edfa..24e6129009c3 100644 --- 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 5b3702cf9734..d3a5a13c7c51 100644 --- 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 b7d2f6c802e0..ead0c24e0fba 100644 --- 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") -- 2.47.3