From 67992b7732ed305f41465e3b43fda551e09d5345 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
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 cf77ed16a7..662009a445 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
zcmds(dr(wW9LMkPx9o-0T~^*G;I5CwRRS3#$9FOcrb(<Ys6(u}ZUM3&DwaV$(F9+}
za>(N&3AKD6`RGpEHFIq=wX~eF@tt5=4O3|~X48zXes`~Enlnv*HPh~V?w;S{{Pvvh
z{_Z_{{EV)yvO}n|q@+j?1dSkoRlu2V3pneuy`e**VpfrNC(wnsKp#Haj|RkPRvb0V
zu$YW09bJf4$y^=)?4#(zq89}r_=L19COd$QvIhErpat0-1X_@8#%2K<Zw)m96(#7c
zR1_qabrZ1dal;^i^^Ff_JL3bTl0E~0eU%>1OdgT#wZuySPyN`R8J*E=f^z`uVsAQo
zuwzcE?)?4rRZ7DP^TF^Mm77b<Bc`%Fu3l_JscpeZvgQ!45@kd=F`rmKEF@MCi--zB
z+13)`bz&(|MJywh6G|OLh-zXrQA4<iT7nUE#2dsKf)i_rbrcGp9b~Ad@moX#vB{m%
zgWYgOiJlxmn35>D_uK+z%!?2YoVs`K-g?#URiN5G8zje<cYqf+K@b@Df+py%JD)as
zY^tKW>}>+4pM0?yrhpC=uc8NU@<3f+m^R(v%*ZNOaF4!nnNJ^GyEgMl8<$p5tDG$?
zH96XqP*hNM{kRg9<WrPTR8Z7Xl=xR_F#YVPphq;I3Y*<2CU(&EEDI?b8TP~<z@3sU
zbu0G=>GQE7NwmSicSXYv?lOapPd0;|Rh<iD?;kl1D0iy`qc$u+X;`J75rs|dY-#x(
zsFC^-(Zq9vR@%472vS?oHh`t<-1L6hM(V|#EV3kyIm^P>l#)<V%n63+RIY@WK};mo
zCeUKdP{9(5`e}VVBF)&a0$9k#MCwZ0OcN`enFy^c_nZ7jeDVCQ2kiW!2V&5cD%HHV
z7^TF@YLK>FGiapcyG4!ER5ui*GA3$ddn0s2UgHHn`HN;)f$B8j08R5p$>h<YoRkG&
z{%)I_<*qhJuEt=LGfWsFQbt4wYklUhRCx4wXU6*kQ~F4dhnXM~q_3|S20vLLSu6kz
zu-#Whw&#epHa1C_QK^yM9c|XQZ5^1lEzNC<m0yU33o$%B6|DTK7c6q-C|Hc#G6t;j
z%VS_T$l9^s0XWaS>ClsIeQL$Kqaliy90HwUJ`DU9BmO};E&QJ^GNlxQG>@U?zN+0e
z-vqZUTppDJjRtn?XrOeqqE^p-b;kVd7WT{*ge=#?Te$h4AZW{^MTZdOwOS|^<*Y@}
zp|^BmV}oA(q2+*mkd_C2+?5Pn`3?)}<y97JF!I#?Xq7Dka3b<|2BA%k8H_a`-x-3J
z0Z#LlVc64;diH-fl4)-do#g#qxD5Q-I8tF~CPsohFN?H*R%Po^+;jl+{B$;2_^E8P
zK6;7c;|5@)FGaT7u;B43^YGF9zf6~Nvaz>T+J9rcR^Bol_5{m|bMPcUGSAG#&6qcm
z|DKESqEJK+f06gLV;nly^6_>|L(}uT-j3l|YU9mzOb{zRp~p}%|G|!@lFI*}Hs~~C
z)=POpm(YInEV)F`DVYC@Am|%ZzxGq|wD|nO@+y9P5{7rFrZYqgRpUpMGwiZ2jyV;)
z>ty=QHEnX<WV{3#p=mBpbKo2Z;9dttfRmqbU;?hYE{jvK#jooiQ4qq07tfwiL<Q*R
zXn!raO^Y;h%*Q@rWi*ZTJSiW0_k+gV2P-pvM-w1fol?L3!A^`RKau}w)xX8VtMf4-
z>6PEe=kHswaVnjJFu)gw?jO^0*{u5gkC1<$>d)xTujk{|E^}^?PgLXIT4|i3*6q`g
z?<ycAEQ(@*YP_-|#Yd>|%gMZ@0KHfSynY(xm7B?bPR&~xPkHISJjk^2lhZJwa~hed
zpvFT=nG9c8u;%c)O87-G_3G^FN_d<aKC+c36jJq=Hu6QPaR>befGjnBC6G^2;&I!^
VPEg}#>7;~gUmTim^XfwU@J|SPo&5j+

delta 3103
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
KN5xo(4gDMG%_I*1

diff --git a/Mac/Build/PythonCoreCarbon.exp b/Mac/Build/PythonCoreCarbon.exp
index 3cfc93acc2..019070c68a 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 1956b4daed..e282285f57 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 62fa76b72c..8e577e38fe 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 05e9293350..db5dffc86e 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 26a9b141ed..24e6129009 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 5b3702cf97..d3a5a13c7c 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 b7d2f6c802..ead0c24e0f 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.50.1