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

Skip to content

Commit 5ee24ae

Browse files
jackjansenjackjansen
committed
Weaklink most toolbox modules, improving backward compatibility. Modules will no longer fail to load if a single routine is missing on the curent OS version, in stead calling the missing routine will raise an exception.
Should finally fix 531398. 2.2.1 candidate.
1 parent 29ac3cb commit 5ee24ae

1 file changed

Lines changed: 25 additions & 12 deletions

File tree

‎Mac/scripts/genpluginprojects.py‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,13 @@ def genallprojects(force=0):
132132

133133
# bgen-generated Toolbox modules
134134
genpluginproject("carbon", "_AE", outputdir="::Lib:Carbon")
135-
genpluginproject("ppc", "_AE", libraries=["ObjectSupportLib"], outputdir="::Lib:Carbon")
135+
genpluginproject("ppc", "_AE", libraries=["ObjectSupportLib"],
136+
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
136137
genpluginproject("ppc", "_App", libraries=["CarbonAccessors.o", "AppearanceLib"],
137138
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
138139
genpluginproject("carbon", "_App", outputdir="::Lib:Carbon")
139-
genpluginproject("ppc", "_Cm", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
140+
genpluginproject("ppc", "_Cm", libraries=["QuickTimeLib"],
141+
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
140142
genpluginproject("carbon", "_Cm", outputdir="::Lib:Carbon")
141143
# XXX can't work properly because we need to set a custom fragment initializer
142144
#genpluginproject("carbon", "_CG",
@@ -150,29 +152,40 @@ def genallprojects(force=0):
150152
genpluginproject("ppc", "_Dlg", libraries=["CarbonAccessors.o", "DialogsLib", "AppearanceLib"],
151153
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
152154
genpluginproject("carbon", "_Drag", outputdir="::Lib:Carbon")
153-
genpluginproject("ppc", "_Drag", libraries=["DragLib"], outputdir="::Lib:Carbon")
154-
genpluginproject("all", "_Evt", outputdir="::Lib:Carbon")
155-
genpluginproject("all", "_Fm", outputdir="::Lib:Carbon")
155+
genpluginproject("ppc", "_Drag", libraries=["DragLib"],
156+
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
157+
genpluginproject("all", "_Evt",
158+
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
159+
genpluginproject("all", "_Fm",
160+
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
156161
genpluginproject("ppc", "_Help", outputdir="::Lib:Carbon")
157-
genpluginproject("ppc", "_Icn", libraries=["IconServicesLib"], outputdir="::Lib:Carbon")
162+
genpluginproject("ppc", "_Icn", libraries=["IconServicesLib"],
163+
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
158164
genpluginproject("carbon", "_Icn", outputdir="::Lib:Carbon")
159165
genpluginproject("all", "_List", outputdir="::Lib:Carbon")
160166
genpluginproject("carbon", "_Menu", outputdir="::Lib:Carbon")
161167
genpluginproject("ppc", "_Menu", libraries=["CarbonAccessors.o", "MenusLib", "ContextualMenu", "AppearanceLib"],
162168
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
163-
genpluginproject("all", "_Qd", outputdir="::Lib:Carbon")
164-
genpluginproject("ppc", "_Qt", libraries=["QuickTimeLib"], outputdir="::Lib:Carbon")
165-
genpluginproject("carbon", "_Qt", outputdir="::Lib:Carbon")
166-
genpluginproject("all", "_Qdoffs", outputdir="::Lib:Carbon")
169+
genpluginproject("all", "_Qd",
170+
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
171+
genpluginproject("ppc", "_Qt", libraries=["QuickTimeLib"],
172+
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
173+
genpluginproject("carbon", "_Qt",
174+
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
175+
genpluginproject("all", "_Qdoffs",
176+
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
167177
genpluginproject("all", "_Res",
168178
stdlibraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
169179
genpluginproject("all", "_Scrap", outputdir="::Lib:Carbon")
170180
genpluginproject("ppc", "_Snd", libraries=["CarbonAccessors.o", "SoundLib"], outputdir="::Lib:Carbon")
171181
genpluginproject("carbon", "_Snd", outputdir="::Lib:Carbon")
172182
genpluginproject("all", "_Sndihooks", sources=[":snd:_Sndihooks.c"], outputdir="::Lib:Carbon")
173-
genpluginproject("ppc", "_TE", libraries=["CarbonAccessors.o", "DragLib"], outputdir="::Lib:Carbon")
183+
genpluginproject("ppc", "_TE", libraries=["CarbonAccessors.o", "DragLib"],
184+
stdlibraryflags="Debug, WeakImport",
185+
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
174186
genpluginproject("carbon", "_TE", outputdir="::Lib:Carbon")
175-
genpluginproject("ppc", "_Mlte", libraries=["Textension"], outputdir="::Lib:Carbon")
187+
genpluginproject("ppc", "_Mlte", libraries=["Textension"],
188+
libraryflags="Debug, WeakImport", outputdir="::Lib:Carbon")
176189
genpluginproject("carbon", "_Mlte", outputdir="::Lib:Carbon")
177190
genpluginproject("carbon", "_Win", outputdir="::Lib:Carbon")
178191
genpluginproject("ppc", "_Win", libraries=["CarbonAccessors.o", "WindowsLib", "AppearanceLib"],

0 commit comments

Comments
 (0)