- Timestamp:
- Jan 23, 2023 12:31:13 AM (21 months ago)
- Location:
- trunk/src/libs/xpcom18a4
- Files:
-
- 2 edited
-
Config.kmk (modified) (5 diffs)
-
Makefile.kmk (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/libs/xpcom18a4/Config.kmk
r98179 r98220 218 218 # 219 219 # Template for building the XPCOM executables. 220 # Used as a base template by XPC OMTSTEXEand XPCOMIPCEXE.221 # 222 TEMPLATE_XPC OMEXE= XPCOM executable files223 TEMPLATE_XPC OMEXE_EXTENDS = XPCOM220 # Used as a base template by XPComTstExe and XPCOMIPCEXE. 221 # 222 TEMPLATE_XPComExe = XPCOM executable files 223 TEMPLATE_XPComExe_EXTENDS = XPCOM 224 224 ## @todo undo -fPIC. 225 TEMPLATE_XPC OMEXE_INCS = ipc/ipcd/shared/src \225 TEMPLATE_XPComExe_INCS = ipc/ipcd/shared/src \ 226 226 $(VBOX_PATH_SDK)/bindings/xpcom/include \ 227 227 $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \ … … 230 230 $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \ 231 231 . 232 TEMPLATE_XPC OMEXE_LIBS = \232 TEMPLATE_XPComExe_LIBS = \ 233 233 $(VBox-xpcom-ipcshared_1_TARGET) \ 234 234 $(VBoxXPCOM_1_TARGET) \ 235 235 $(TEMPLATE_XPCOM_LIBS) 236 TEMPLATE_XPC OMEXE_LIBS.freebsd = $(LIB_PTHREAD)237 TEMPLATE_XPC OMEXE_LIBS.linux = dl $(LIB_PTHREAD)238 TEMPLATE_XPC OMEXE_LDFLAGS.darwin = -bind_at_load $(filter-out -current_version -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD),$(TEMPLATE_XPCOM_LDFLAGS.darwin))236 TEMPLATE_XPComExe_LIBS.freebsd = $(LIB_PTHREAD) 237 TEMPLATE_XPComExe_LIBS.linux = dl $(LIB_PTHREAD) 238 TEMPLATE_XPComExe_LDFLAGS.darwin = -bind_at_load $(filter-out -current_version -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD),$(TEMPLATE_XPCOM_LDFLAGS.darwin)) 239 239 240 240 … … 242 242 # Template for building the XPCOM testcase executables 243 243 # 244 TEMPLATE_XPC OMTSTEXE= XPCOM executable files (testcases)245 TEMPLATE_XPC OMTSTEXE_EXTENDS = XPCOMEXE246 TEMPLATE_XPC OMTSTEXE_CXXFLAGS = $(TEMPLATE_XPCOMEXE_CXXFLAGS) -Wno-format247 TEMPLATE_XPC OMTSTEXE_CFLAGS = $(TEMPLATE_XPCOMEXE_CFLAGS) -Wno-format248 TEMPLATE_XPC OMTSTEXE_INST = $(INST_TESTCASE)244 TEMPLATE_XPComTstExe = XPCOM executable files (testcases) 245 TEMPLATE_XPComTstExe_EXTENDS = XPComExe 246 TEMPLATE_XPComTstExe_CXXFLAGS = $(TEMPLATE_XPComExe_CXXFLAGS) -Wno-format 247 TEMPLATE_XPComTstExe_CFLAGS = $(TEMPLATE_XPComExe_CFLAGS) -Wno-format 248 TEMPLATE_XPComTstExe_INST = $(INST_TESTCASE) 249 249 ifdef VBOX_WITH_RUNPATH 250 TEMPLATE_XPC OMTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_XPCOMEXE_LDFLAGS)250 TEMPLATE_XPComTstExe_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_XPComExe_LDFLAGS) 251 251 else ifdef VBOX_WITH_RELATIVE_RUNPATH 252 TEMPLATE_XPC OMTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_XPCOMEXE_LDFLAGS)252 TEMPLATE_XPComTstExe_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_XPComExe_LDFLAGS) 253 253 endif 254 254 if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE) 255 TEMPLATE_XPC OMTSTEXE_POST_CMDS =255 TEMPLATE_XPComTstExe_POST_CMDS = 256 256 endif 257 257 … … 263 263 # and CXXFLAGS completely at the moment. 264 264 # 265 TEMPLATE_XPC OMBLDPROG= XPCOM Build programs executables266 TEMPLATE_XPC OMBLDPROG_EXTENDS = VBoxBldProg267 ## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPC OMEXEis expanded when this is being used.)268 TEMPLATE_XPC OMBLDPROG_DEFS = \265 TEMPLATE_XPComBldProg = XPCOM Build programs executables 266 TEMPLATE_XPComBldProg_EXTENDS = VBoxBldProg 267 ## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPComExe is expanded when this is being used.) 268 TEMPLATE_XPComBldProg_DEFS = \ 269 269 $(TEMPLATE_VBoxBldProg_DEFS) \ 270 $(filter-out VBOX_USE_IPRT_IN_XPCOM, $(TEMPLATE_XPC OMEXE_DEFS))271 TEMPLATE_XPC OMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBoxBldProg_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST))272 TEMPLATE_XPC OMBLDPROG_DEFS.x86 = $(TEMPLATE_VBoxBldProg_DEFS.x86) $(TEMPLATE_XPCOMEXE_DEFS.x86)273 TEMPLATE_XPC OMBLDPROG_DEFS.amd64 = $(TEMPLATE_VBoxBldProg_DEFS.amd64) $(TEMPLATE_XPCOMEXE_DEFS.amd64)274 TEMPLATE_XPC OMBLDPROG_INCS = \270 $(filter-out VBOX_USE_IPRT_IN_XPCOM, $(TEMPLATE_XPComExe_DEFS)) 271 TEMPLATE_XPComBldProg_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBoxBldProg_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPComExe_DEFS.$(KBUILD_HOST)) 272 TEMPLATE_XPComBldProg_DEFS.x86 = $(TEMPLATE_VBoxBldProg_DEFS.x86) $(TEMPLATE_XPComExe_DEFS.x86) 273 TEMPLATE_XPComBldProg_DEFS.amd64 = $(TEMPLATE_VBoxBldProg_DEFS.amd64) $(TEMPLATE_XPComExe_DEFS.amd64) 274 TEMPLATE_XPComBldProg_INCS = \ 275 275 $(VBOX_PATH_SDK)/bindings/xpcom/include \ 276 276 $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \ … … 278 278 $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \ 279 279 $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd 280 TEMPLATE_XPC OMBLDPROG_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format281 TEMPLATE_XPC OMBLDPROG_CXXFLAGS.darwin = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-common -fno-rtti282 TEMPLATE_XPC OMBLDPROG_CXXFLAGS.solaris = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway.283 TEMPLATE_XPC OMBLDPROG_LDFLAGS.darwin = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions284 TEMPLATE_XPC OMBLDPROG_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))280 TEMPLATE_XPComBldProg_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format 281 TEMPLATE_XPComBldProg_CXXFLAGS.darwin = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-common -fno-rtti 282 TEMPLATE_XPComBldProg_CXXFLAGS.solaris = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway. 283 TEMPLATE_XPComBldProg_LDFLAGS.darwin = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions 284 TEMPLATE_XPComBldProg_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET)) 285 285 286 286 -
trunk/src/libs/xpcom18a4/Makefile.kmk
r98103 r98220 428 428 # like in the original build 429 429 # 430 xpidl_TEMPLATE = XPC OMBLDPROG430 xpidl_TEMPLATE = XPComBldProg 431 431 xpidl_DEFS = EXPORT_XPT_API 432 432 ## @todo This assumes HOST == TARGET. … … 436 436 # xpidl_BLD_TRG_ARCH = x86 437 437 # ## @todo kBuild ticket 84 workarounds: 438 # xpidl_DEFS.x86 = $(TEMPLATE_XPC OMBLDPROG_DEFS.x86)439 # xpidl_CFLAGS.x86 = $(TEMPLATE_XPC OMBLDPROG_CFLAGS.x86)440 # xpidl_CXXFLAGS.x86 = $(TEMPLATE_XPC OMBLDPROG_CXXFLAGS.x86)441 # xpidl_LDFLAGS.x86 = $(TEMPLATE_XPC OMBLDPROG_LDFLAGS.x86)438 # xpidl_DEFS.x86 = $(TEMPLATE_XPComBldProg_DEFS.x86) 439 # xpidl_CFLAGS.x86 = $(TEMPLATE_XPComBldProg_CFLAGS.x86) 440 # xpidl_CXXFLAGS.x86 = $(TEMPLATE_XPComBldProg_CXXFLAGS.x86) 441 # xpidl_LDFLAGS.x86 = $(TEMPLATE_XPComBldProg_LDFLAGS.x86) 442 442 #endif 443 443 ifdef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL … … 504 504 # The XPT linker. 505 505 # 506 xpt_link_TEMPLATE = XPC OMBLDPROG506 xpt_link_TEMPLATE = XPComBldProg 507 507 xpt_link_SOURCES = \ 508 508 xpcom/typelib/xpt/tools/xpt_link.c \ … … 1146 1146 1147 1147 TEMPLATE_XPCOMIPCEXE = XPCOM IPC executables 1148 TEMPLATE_XPCOMIPCEXE_EXTENDS = XPC OMEXE1149 TEMPLATE_XPCOMIPCEXE_DEFS = $(TEMPLATE_XPC OMEXE_DEFS) BUILD_DCONNECT=11148 TEMPLATE_XPCOMIPCEXE_EXTENDS = XPComExe 1149 TEMPLATE_XPCOMIPCEXE_DEFS = $(TEMPLATE_XPComExe_DEFS) BUILD_DCONNECT=1 1150 1150 ifdef IPC_LOGGING 1151 1151 TEMPLATE_XPCOMIPCEXE_DEFS += IPC_LOGGING … … 1245 1245 # testcases 1246 1246 # 1247 tstnsIFileEnumerator_TEMPLATE = XPC OMTSTEXE1247 tstnsIFileEnumerator_TEMPLATE = XPComTstExe 1248 1248 tstnsIFileEnumerator_SOURCES = xpcom/tests/nsIFileEnumerator.cpp 1249 tstnsIFileTest_TEMPLATE = XPC OMTSTEXE1249 tstnsIFileTest_TEMPLATE = XPComTstExe 1250 1250 tstnsIFileTest_SOURCES = xpcom/tests/nsIFileTest.cpp 1251 tstTestArray_TEMPLATE = XPC OMTSTEXE1251 tstTestArray_TEMPLATE = XPComTstExe 1252 1252 tstTestArray_SOURCES = xpcom/tests/TestArray.cpp 1253 tstTestAtoms_TEMPLATE = XPC OMTSTEXE1253 tstTestAtoms_TEMPLATE = XPComTstExe 1254 1254 tstTestAtoms_SOURCES = xpcom/tests/TestAtoms.cpp 1255 tstTestAutoLock_TEMPLATE = XPC OMTSTEXE1255 tstTestAutoLock_TEMPLATE = XPComTstExe 1256 1256 tstTestAutoLock_SOURCES = xpcom/tests/TestAutoLock.cpp 1257 tstTestCallTemplates_TEMPLATE = XPC OMTSTEXE1257 tstTestCallTemplates_TEMPLATE = XPComTstExe 1258 1258 tstTestCallTemplates_SOURCES = xpcom/tests/TestCallTemplates.cpp 1259 tstTestCOMPtr_TEMPLATE = XPC OMTSTEXE1259 tstTestCOMPtr_TEMPLATE = XPComTstExe 1260 1260 tstTestCOMPtr_SOURCES = xpcom/tests/TestCOMPtr.cpp 1261 tstTestCOMPtrEq_TEMPLATE = XPC OMTSTEXE1261 tstTestCOMPtrEq_TEMPLATE = XPComTstExe 1262 1262 tstTestCOMPtrEq_SOURCES = xpcom/tests/TestCOMPtrEq.cpp 1263 tstTestCRT_TEMPLATE = XPC OMTSTEXE1263 tstTestCRT_TEMPLATE = XPComTstExe 1264 1264 tstTestCRT_SOURCES = xpcom/tests/TestCRT.cpp 1265 tstTestFactory_TEMPLATE = XPC OMTSTEXE1265 tstTestFactory_TEMPLATE = XPComTstExe 1266 1266 tstTestFactory_SOURCES = xpcom/tests/TestFactory.cpp 1267 tstTestHashtables_TEMPLATE = XPC OMTSTEXE1267 tstTestHashtables_TEMPLATE = XPComTstExe 1268 1268 tstTestHashtables_SOURCES = xpcom/tests/TestHashtables.cpp 1269 tstTestID_TEMPLATE = XPC OMTSTEXE1269 tstTestID_TEMPLATE = XPComTstExe 1270 1270 tstTestID_SOURCES = xpcom/tests/TestID.cpp 1271 tstTestObserverService_TEMPLATE= XPC OMTSTEXE1271 tstTestObserverService_TEMPLATE= XPComTstExe 1272 1272 tstTestObserverService_SOURCES = xpcom/tests/TestObserverService.cpp 1273 tstTestPermanentAtoms_TEMPLATE = XPC OMTSTEXE1273 tstTestPermanentAtoms_TEMPLATE = XPComTstExe 1274 1274 tstTestPermanentAtoms_SOURCES = xpcom/tests/TestPermanentAtoms.cpp 1275 tstTestPipes_TEMPLATE = XPC OMTSTEXE1275 tstTestPipes_TEMPLATE = XPComTstExe 1276 1276 tstTestPipes_SOURCES = xpcom/tests/TestPipes.cpp 1277 tstTestServMgr_TEMPLATE = XPC OMTSTEXE1277 tstTestServMgr_TEMPLATE = XPComTstExe 1278 1278 tstTestServMgr_SOURCES = xpcom/tests/TestServMgr.cpp 1279 1279 tstTestServMgr_INCS = xpcom/tests/services 1280 tstTestThreads_TEMPLATE = XPC OMTSTEXE1280 tstTestThreads_TEMPLATE = XPComTstExe 1281 1281 tstTestThreads_SOURCES = xpcom/tests/TestThreads.cpp 1282 tstTestXPIDLString_TEMPLATE = XPC OMTSTEXE1282 tstTestXPIDLString_TEMPLATE = XPComTstExe 1283 1283 tstTestXPIDLString_SOURCES = xpcom/tests/TestXPIDLString.cpp 1284 tstTestXPTCInvoke_TEMPLATE = XPC OMTSTEXE1284 tstTestXPTCInvoke_TEMPLATE = XPComTstExe 1285 1285 tstTestXPTCInvoke_SOURCES = xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp 1286 tstTestDeque_TEMPLATE = XPC OMTSTEXE1286 tstTestDeque_TEMPLATE = XPComTstExe 1287 1287 tstTestDeque_SOURCES = xpcom/tests/TestDeque.cpp 1288 tstTestAutoPtr_TEMPLATE = XPC OMTSTEXE1288 tstTestAutoPtr_TEMPLATE = XPComTstExe 1289 1289 tstTestAutoPtr_SOURCES = xpcom/tests/TestAutoPtr.cpp 1290 tstTestMinStringAPI_TEMPLATE = XPC OMTSTEXE1290 tstTestMinStringAPI_TEMPLATE = XPComTstExe 1291 1291 tstTestMinStringAPI_SOURCES = xpcom/tests/TestMinStringAPI.cpp 1292 tstTestStrings_TEMPLATE = XPC OMTSTEXE1292 tstTestStrings_TEMPLATE = XPComTstExe 1293 1293 tstTestStrings_SOURCES = xpcom/tests/TestStrings.cpp 1294 tstPrimitiveTest_TEMPLATE = XPC OMTSTEXE1294 tstPrimitiveTest_TEMPLATE = XPComTstExe 1295 1295 tstPrimitiveTest_SOURCES = xpcom/typelib/xpt/tests/PrimitiveTest.c 1296 tstSimpleTypeLib_TEMPLATE = XPC OMTSTEXE1296 tstSimpleTypeLib_TEMPLATE = XPComTstExe 1297 1297 tstSimpleTypeLib_SOURCES = xpcom/typelib/xpt/tests/SimpleTypeLib.c 1298 tstXptDump_TEMPLATE = XPC OMTSTEXE1298 tstXptDump_TEMPLATE = XPComTstExe 1299 1299 tstXptDump_SOURCES = xpcom/typelib/xpt/tools/xpt_dump.c 1300 tstXptLink_TEMPLATE = XPC OMTSTEXE1300 tstXptLink_TEMPLATE = XPComTstExe 1301 1301 tstXptLink_SOURCES = xpcom/typelib/xpt/tools/xpt_link.c 1302 1302
Note:
See TracChangeset
for help on using the changeset viewer.

