- Timestamp:
- Apr 21, 2017 9:18:14 AM (7 years ago)
- File:
-
- 1 edited
-
trunk/src/VBox/Main/Makefile.kmk (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/Makefile.kmk
r66636 r66643 136 136 # recompile every time a comma in the documentation is changed. 137 137 # 138 $(call KB_FN_AUTO_CMD_DEPS,$(VBOX_XIDL_FILE).ts) 138 139 $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE): \ 139 140 $(VBOX_XIDL_FILE_SRC) \ 140 141 $(VBOX_PATH_MAIN_SRC)/idl/docstrip.xsl \ 141 142 | $$(dir $$@) 142 # $(CP) -fv $< $(VBOX_XIDL_FILE).ts 143 $(QUIET)$(VBOX_XSLTPROC) -o $(VBOX_XIDL_FILE).ts $(VBOX_PATH_MAIN_SRC)/idl/docstrip.xsl $< 143 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 144 # $(CP) -fv $(VBOX_XIDL_FILE_SRC) $(VBOX_XIDL_FILE).ts 145 $(QUIET)$(VBOX_XSLTPROC) -o $(VBOX_XIDL_FILE).ts $(VBOX_PATH_MAIN_SRC)/idl/docstrip.xsl $(VBOX_XIDL_FILE_SRC) 144 146 $(QUIET)$(CP) --changed -fv $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE) 145 147 … … 240 242 241 243 ifdef VBOX_WITH_PYTHON 242 INSTALLS += VBox-python-glue243 VBox-python-glue_INST = $(INST_SDK)installer/vboxapi/244 VBox-python-glue_MODE = a+r,u+w245 VBox-python-glue_SOURCES = \246 glue/vboxapi.py=>__init__.py \247 $(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py248 VBox-python-glue_CLEAN = \249 $(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py250 251 ## @todo $(call KB_FN_AUTO_CMD_DEPS,$$(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py) - need to fix the double expansion here252 $$(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py: \244 INSTALLS += VBox-python-glue 245 VBox-python-glue_INST = $(INST_SDK)installer/vboxapi/ 246 VBox-python-glue_MODE = a+r,u+w 247 VBox-python-glue_SOURCES = \ 248 glue/vboxapi.py=>__init__.py \ 249 $(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py 250 VBox-python-glue_CLEAN = \ 251 $(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py 252 $(call KB_FN_DO_PASS0_ON_TARGET,VBox-python-glue) 253 $(call KB_FN_AUTO_CMD_DEPS,$(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py) 254 $(VBox-python-glue_0_OUTDIR)/VirtualBox_constants.py: \ 253 255 $(VBOX_PATH_MAIN_SRC)/glue/constants-python.xsl \ 254 256 $(VBOX_XIDL_FILE) \ 255 257 | $$(dir $$@) 258 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 256 259 $(call MSG_TOOL,xsltproc,Python constants,$<,$@) 257 $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE) 258 260 $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_PATH_MAIN_SRC)/glue/constants-python.xsl $(VBOX_XIDL_FILE) 259 261 endif # VBOX_WITH_PYTHON 260 262 … … 274 276 # 275 277 if defined(VBOX_WITH_SDS) && "$(KBUILD_TARGET)" == "win" 276 PROGRAMS += VBoxSDS 277 VBoxSDS_TEMPLATE = VBOXMAINEXE 278 VBoxSDS_DEFS = \ 279 VBoxSDS_DEFS.win += VBOX_COM_OUTOFPROC_MODULE 280 VBoxSDS_DEFS.win += _WIN32_WINNT=0x0510 281 VBoxSDS_INCS = \ 282 include \ 283 $(VBoxSDS_0_OUTDIR) \ 284 $(VBOX_MAIN_APIWRAPPER_INCS) 285 VBoxSDS_INCS.win = \ 286 $(VBoxCOM_0_OUTDIR) 287 VBoxSDS_LIBS += \ 288 $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB) 289 VBoxSDS_INTERMEDIATES = \ 290 $(VBOX_MAIN_PREREQS) \ 291 $(VBOX_MAIN_APIWRAPPER_GEN_HDRS) 292 VBoxSDS_SOURCES = \ 293 src-all/Global.cpp \ 294 src-all/AutoCaller.cpp \ 295 src-all/VirtualBoxBase.cpp \ 296 src-all/VirtualBoxErrorInfoImpl.cpp \ 297 src-global/VirtualBoxSDSImpl.cpp 298 VBoxSDS_SOURCES.win = \ 299 src-global/win/VBoxSDS.cpp \ 300 src-global/win/VBoxSDS.rc 301 302 src-global/win/VBoxSDS.rc_INCS = $(VBoxSDS_0_OUTDIR) 303 src-global/win/VBoxSDS.rc_DEPS = $(VBoxSDS_0_OUTDIR)/VBoxSDS.rgs $(VBoxSDS_0_OUTDIR)/VBoxSDS-icon.rc 304 src-global/win/VBoxSDS.rc_CLEAN = $(VBoxSDS_0_OUTDIR)/VBoxSDS.rgs $(VBoxSDS_0_OUTDIR)/VBoxSDS-icon.rc 305 306 $$(VBoxSDS_0_OUTDIR)/VBoxSDS-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$(@D)) 278 PROGRAMS += VBoxSDS 279 VBoxSDS_TEMPLATE = VBOXMAINEXE 280 VBoxSDS_DEFS = \ 281 VBoxSDS_DEFS.win += VBOX_COM_OUTOFPROC_MODULE 282 VBoxSDS_DEFS.win += _WIN32_WINNT=0x0510 283 VBoxSDS_INCS = \ 284 include \ 285 $(VBoxSDS_0_OUTDIR) \ 286 $(VBOX_MAIN_APIWRAPPER_INCS) 287 VBoxSDS_INCS.win = \ 288 $(VBoxCOM_0_OUTDIR) 289 VBoxSDS_LIBS += \ 290 $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB) 291 VBoxSDS_INTERMEDIATES = \ 292 $(VBOX_MAIN_PREREQS) \ 293 $(VBOX_MAIN_APIWRAPPER_GEN_HDRS) 294 VBoxSDS_SOURCES = \ 295 src-all/Global.cpp \ 296 src-all/AutoCaller.cpp \ 297 src-all/VirtualBoxBase.cpp \ 298 src-all/VirtualBoxErrorInfoImpl.cpp \ 299 src-global/VirtualBoxSDSImpl.cpp 300 VBoxSDS_SOURCES.win = \ 301 src-global/win/VBoxSDS.cpp \ 302 src-global/win/VBoxSDS.rc 303 $(call KB_FN_DO_PASS0_ON_TARGET,VBoxSDS) # Sets VBoxSDS_0_OUTDIR 304 305 src-global/win/VBoxSDS.rc_INCS = $(VBoxSDS_0_OUTDIR) 306 src-global/win/VBoxSDS.rc_DEPS = $(VBoxSDS_0_OUTDIR)/VBoxSDS-icon.rc #$(VBoxSDS_0_OUTDIR)/VBoxSDS.rgs 307 src-global/win/VBoxSDS.rc_CLEAN = $(VBoxSDS_0_OUTDIR)/VBoxSDS-icon.rc #$(VBoxSDS_0_OUTDIR)/VBoxSDS.rgs 308 309 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSDS_0_OUTDIR)/VBoxSDS-icon.rc) 310 $(VBoxSDS_0_OUTDIR)/VBoxSDS-icon.rc: $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@) 311 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 307 312 $(APPEND) -t $@ '1 ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"' 308 313 309 $$(VBoxSDS_0_OUTDIR)/VBoxSDS.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D)) 310 $(VBOX_XSLTPROC) --stringparam Application "VirtualBox System" --stringparam Module VBoxSDS -o $@ $< $(VBOX_XIDL_FILE) 311 314 # $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSDS_0_OUTDIR)/VBoxSDS.rgs) 315 # $(VBoxSDS_0_OUTDIR)/VBoxSDS.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$@) 316 # $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 317 # $(VBOX_XSLTPROC) \ 318 # --stringparam Application "VirtualBox System" \ 319 # --stringparam Module VBoxSDS \ 320 # -o $@ \ 321 # $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl \ 322 # $(VBOX_XIDL_FILE) 323 # 312 324 endif #if defined(VBOX_WITH_SDS) && "$(KBUILD_TARGET)" == "win" 313 325 … … 582 594 endif 583 595 596 $(call KB_FN_DO_PASS0_ON_TARGET,VBoxSVC) # Sets VBoxSVC_0_OUTDIR 597 584 598 ifdef VBOX_WITH_MAIN_USB_ID_DATABASE # Generate a database of USB vendor IDs and device IDs. 585 599 VBoxSVC_DEFS += VBOX_WITH_MAIN_USB_ID_DATABASE … … 587 601 VBoxSVC_CLEAN += $(VBoxSVC_0_OUTDIR)/USBIdDatabase.cpp 588 602 589 $$(VBoxSVC_0_OUTDIR)/USBIdDatabase.cpp: $$(USBIdDatabaseGenerator_1_TARGET) \ 603 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSVC_0_OUTDIR)/USBIdDatabase.cpp) 604 $(VBoxSVC_0_OUTDIR)/USBIdDatabase.cpp: $$(USBIdDatabaseGenerator_1_TARGET) \ 590 605 $(PATH_SUB_CURRENT)/src-server/usb.ids $(PATH_SUB_CURRENT)/src-server/custom.ids | $$(dir $$@) 591 $(call MSG_GENERATE,USBIdDatabase,$@,$<) 606 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 607 $(call MSG_GENERATE,USBIdDatabase,$@,$(USBIdDatabaseGenerator_1_TARGET)) 592 608 $(QUIET)$(USBIdDatabaseGenerator_1_TARGET) -o "$@" $(filter %.ids,$^) 593 609 … … 602 618 src-server/win/VBoxSVC.rc_DEPS = $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc 603 619 src-server/win/VBoxSVC.rc_CLEAN = $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc 604 $$(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$(@D)) 620 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc) 621 $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc: $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@) 622 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 605 623 $(APPEND) -t $@ '1 ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"' 606 624 607 625 ifndef VBOX_WITH_MIDL_PROXY_STUB 608 src-server/win/VBoxSVC.rc_DEPS += $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs 609 src-server/win/VBoxSVC.rc_CLEAN += $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs 610 $$(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D)) 611 $(VBOX_XSLTPROC) --stringparam Application VirtualBox --stringparam Module VBoxSVC -o $@ $< $(VBOX_XIDL_FILE) 626 src-server/win/VBoxSVC.rc_DEPS += $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs 627 src-server/win/VBoxSVC.rc_CLEAN += $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs 628 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs) 629 $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$@) 630 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 631 $(VBOX_XSLTPROC) \ 632 --stringparam Application VirtualBox \ 633 --stringparam Module VBoxSVC \ 634 -o $@ \ 635 $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl \ 636 $(VBOX_XIDL_FILE) 612 637 endif 613 638 … … 648 673 649 674 # 650 # Generate some event stuff for VBoxSVC and VBoxC. $(MAKEFILE675 # Generate some event stuff for VBoxSVC and VBoxC. 651 676 # 652 677 $(VBOX_AUTOGEN_EVENT_H): $(VBOX_PATH_MAIN_SRC)/idl/comimpl.xsl $(VBOX_XIDL_FILE) | $$(dir $$@) … … 925 950 endif 926 951 952 $(call KB_FN_DO_PASS0_ON_TARGET,VBoxC) # Sets VBoxC_0_OUTDIR 953 927 954 ifeq ($(KBUILD_TARGET),darwin) 928 VBoxC_ORDERDEPS += $(VBoxC_0_OUTDIR)/VBoxC.def 929 VBoxC_CLEAN += $(VBoxC_0_OUTDIR)/VBoxC.def 930 $$(VBoxC_0_OUTDIR)/VBoxC.def: $(MAKEFILE_CURRENT) 955 VBoxC_ORDERDEPS += $(VBoxC_0_OUTDIR)/VBoxC.def 956 VBoxC_CLEAN += $(VBoxC_0_OUTDIR)/VBoxC.def 957 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxC_0_OUTDIR)/VBoxC.def) 958 $(VBoxC_0_OUTDIR)/VBoxC.def: 959 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 931 960 $(RM) -f $@ 932 961 $(APPEND) $@ _NSGetModule … … 939 968 940 969 src-client/win/VBoxC.rc_DEPS = $(VBoxC_0_OUTDIR)/VBoxC.rgs $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb 941 VBoxC_CLEAN.win += $(VBoxC_0_OUTDIR)/VBoxC.rgs 942 943 ## @todo $(call KB_FN_AUTO_CMD_DEPS,$$(VBoxC_0_OUTDIR)/VBoxC.rgs) - need to fix the double expansion here 944 $$(VBoxC_0_OUTDIR)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$@) 945 $(VBOX_XSLTPROC) --stringparam Application VirtualBox --stringparam Module VBoxC -o $@ $< $(VBOX_XIDL_FILE) 970 VBoxC_CLEAN.win += $(VBoxC_0_OUTDIR)/VBoxC.rgs 971 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxC_0_OUTDIR)/VBoxC.rgs) 972 $(VBoxC_0_OUTDIR)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$@) 973 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 974 $(VBOX_XSLTPROC) \ 975 --stringparam Application VirtualBox \ 976 --stringparam Module VBoxC \ 977 -o $@ \ 978 $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl \ 979 $(VBOX_XIDL_FILE) 946 980 947 981 ifdef VBOX_WITH_32_ON_64_MAIN_API … … 996 1030 $(PATH_SDK_$(VBOX_WINPSDK)_LIB.x86)/WbemUuid.Lib 997 1031 VBoxClient-x86_CLEAN.win += $(VBoxClient-x86_0_OUTDIR)/VBoxClient-x86.rgs 1032 $(call KB_FN_DO_PASS0_ON_TARGET,VBoxClient-x86) # Sets VBoxClient-x86_0_OUTDIR 1033 998 1034 src-client/win/VBoxClient-x86.rc_DEPS = \ 999 1035 $(VBoxClient-x86_0_OUTDIR)/VBoxClient-x86.rgs \ 1000 1036 $(VBoxCOM-x86_0_OUTDIR)/VirtualBox-x86.tlb 1001 1037 1002 ## @todo $(call KB_FN_AUTO_CMD_DEPS,$$(VBoxClient-x86_0_OUTDIR)/VBoxClient-x86.rgs) - need to fix the double expansion here1003 $ $(VBoxClient-x86_0_OUTDIR)/VBoxClient-x86.rgs: \1038 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxClient-x86_0_OUTDIR)/VBoxClient-x86.rgs) 1039 $(VBoxClient-x86_0_OUTDIR)/VBoxClient-x86.rgs: \ 1004 1040 $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl \ 1005 1041 $(VBOX_XIDL_FILE) | $$(dir $$@) 1006 $(VBOX_XSLTPROC) --stringparam Application VirtualBox --stringparam Module VBoxC -o $@ $< $(VBOX_XIDL_FILE) 1007 1042 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 1043 $(VBOX_XSLTPROC) \ 1044 --stringparam Application VirtualBox \ 1045 --stringparam Module VBoxC \ 1046 -o $@ \ 1047 $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl \ 1048 $(VBOX_XIDL_FILE) 1008 1049 endif 1009 1050 … … 1275 1316 # Note! We're checking for win.amd64 below when setting the target because of the SDK build which happens on linux.amd64 1276 1317 # but with a 32-bit Wine. 1277 $( if $(VBOX_WITH_MIDL_PROXY_STUB),$(VBoxCOM_0_OUTDIR)/VirtualBox_p.c + $(VBoxCOM_0_OUTDIR)/dlldata.c +,) \1318 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxCOM_0_OUTDIR)/VirtualBox_i.c) 1278 1319 $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \ 1320 $(if $(VBOX_WITH_MIDL_PROXY_STUB), + $(VBoxCOM_0_OUTDIR)/VirtualBox_p.c + $(VBoxCOM_0_OUTDIR)/dlldata.c,) \ 1279 1321 + $(VBoxCOM_0_OUTDIR)/VirtualBox.h \ 1280 1322 + $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $$(dir $$@) 1323 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 1281 1324 $(VBOX_WIN_MIDL) /nologo /W4 \ 1282 1325 /env $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64" ,amd64,win32) \ … … 1286 1329 /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_$(VBOX_WINPSDK)_INC)) \ 1287 1330 /I idl \ 1288 $(call VBOX_FN_MAKE_WIN_PATH,$ <)1331 $(call VBOX_FN_MAKE_WIN_PATH,$(VBOX_IDL_FILE.MSCOM)) 1289 1332 $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM_0_OUTDIR)/VirtualBox.h) 1290 1333 $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM_0_OUTDIR)/VirtualBox_i.c) … … 1296 1339 # that using an older MIDL compiler (v7.00.0499 instead of v7.00.0555) helps. But the W2K3 fix also works. 1297 1340 # To avoid 32-bit vs. 64-bit differences, we do the same for 32-bit windows versions. 1341 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c) 1298 1342 $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c \ 1299 1343 + $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_p.c\ … … 1301 1345 + $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.h \ 1302 1346 + $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $$(dir $$@) 1347 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 1303 1348 $(VBOX_WIN_MIDL) /nologo /W4 \ 1304 1349 $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64" \ … … 1309 1354 /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_$(VBOX_WINPSDK)_INC)) \ 1310 1355 /I idl \ 1311 $(call VBOX_FN_MAKE_WIN_PATH,$ <)1356 $(call VBOX_FN_MAKE_WIN_PATH,$(VBOX_IDL_FILE.MSCOM)) 1312 1357 $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.h) 1313 1358 $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c) … … 1317 1362 # The XP targetted 32-bit proxy stub works with all versions of windows (the 1318 1363 # issues leading to the VBoxProxyStubLegacy.dll are only on 64-bit windows). 1319 $( if $(VBOX_WITH_MIDL_PROXY_STUB),$(VBoxCOM-x86_0_OUTDIR)/VirtualBox_p.c + $(VBoxCOM-x86_0_OUTDIR)/dlldata.c +,) \1364 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxCOM-x86_0_OUTDIR)/VirtualBox_i.c) 1320 1365 $(VBoxCOM-x86_0_OUTDIR)/VirtualBox_i.c \ 1366 $(if $(VBOX_WITH_MIDL_PROXY_STUB), + $(VBoxCOM-x86_0_OUTDIR)/VirtualBox_p.c + $(VBoxCOM-x86_0_OUTDIR)/dlldata.c,) \ 1321 1367 + $(VBoxCOM-x86_0_OUTDIR)/VirtualBox.h \ 1322 1368 + $(VBoxCOM-x86_0_OUTDIR)/VirtualBox-x86.tlb: $(VBOX_IDL_FILE.MSCOM) | $$(dir $$@) 1369 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 1323 1370 $(VBOX_WIN_MIDL) /nologo /W4 \ 1324 1371 /env win32 /target NT51 /robust /protocol all \ … … 1328 1375 /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_$(VBOX_WINPSDK)_INC)) \ 1329 1376 /I idl \ 1330 $(call VBOX_FN_MAKE_WIN_PATH,$ <)1377 $(call VBOX_FN_MAKE_WIN_PATH,$(VBOX_IDL_FILE.MSCOM)) 1331 1378 $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM-x86_0_OUTDIR)/VirtualBox.h) 1332 1379 $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM-x86_0_OUTDIR)/VirtualBox_i.c) … … 1353 1400 ifdef VBOX_WITH_JMSCOM 1354 1401 1355 # 1356 # Java glue JAR files 1357 # 1358 VBOX_JMSCOM_JAR = $(VBoxJMscom-inst-jar_0_OUTDIR)/vboxjmscom.jar 1359 VBOX_JMSCOM_TARGET := $(PATH_TARGET)/vboxjmscom-gen 1360 VBOX_JMSCOM_GEN = $(VBOX_JMSCOM_TARGET)/jmscomgen 1361 VBOX_JMSCOM_JDEST := $(VBOX_JMSCOM_TARGET)/jdest 1362 VBOX_GLUE_XSLT_DIR := $(PATH_ROOT)/src/VBox/Main/glue 1363 VBOX_JACOB_DIR := $(PATH_ROOT)/src/libs/jacob-1.17 1364 1365 INSTALLS += VBoxJMscom-inst-jar 1366 VBoxJMscom-inst-jar_INST = $(INST_SDK)bindings/mscom/java/ 1367 VBoxJMscom-inst-jar_MODE = a+r,u+w 1368 VBoxJMscom-inst-jar_SOURCES = \ 1369 $(VBOX_JMSCOM_JAR) 1370 VBoxJMscom-inst-jar_CLEAN = \ 1371 $(VBOX_JMSCOM_JAR) \ 1372 $(VBOX_JMSCOM_GEN)/jmscomglue.list \ 1373 $(wildcard \ 1374 $(VBOX_JMSCOM_GEN)/java/*.java \ 1375 $(VBOX_JMSCOM_JDEST)/*.class \ 1376 $(VBOX_JMSCOM_JDEST)/*/*.class \ 1377 $(VBOX_JMSCOM_JDEST)/*/*/*.class \ 1378 $(VBOX_JMSCOM_JDEST)/*/*/*/*.class \ 1379 ) 1380 VBoxJMscom-inst-jar_BLDDIRS += $(VBOX_JMSCOM_GEN)/java 1381 1382 $(call KB_FN_AUTO_CMD_DEPS,$(VBOX_JMSCOM_GEN)/jmscomglue.list) 1383 $(VBOX_JMSCOM_GEN)/jmscomglue.list: \ 1402 # 1403 # Java glue JAR files 1404 # 1405 VBOX_JMSCOM_JAR = $(VBoxJMscom-inst-jar_0_OUTDIR)/vboxjmscom.jar 1406 VBOX_JMSCOM_TARGET := $(PATH_TARGET)/vboxjmscom-gen 1407 VBOX_JMSCOM_GEN = $(VBOX_JMSCOM_TARGET)/jmscomgen 1408 VBOX_JMSCOM_JDEST := $(VBOX_JMSCOM_TARGET)/jdest 1409 VBOX_GLUE_XSLT_DIR := $(PATH_ROOT)/src/VBox/Main/glue 1410 VBOX_JACOB_DIR := $(PATH_ROOT)/src/libs/jacob-1.17 1411 1412 INSTALLS += VBoxJMscom-inst-jar 1413 VBoxJMscom-inst-jar_INST = $(INST_SDK)bindings/mscom/java/ 1414 VBoxJMscom-inst-jar_MODE = a+r,u+w 1415 VBoxJMscom-inst-jar_SOURCES = \ 1416 $(VBoxJMscom-inst-jar_0_OUTDIR)/vboxjmscom.jar 1417 VBoxJMscom-inst-jar_CLEAN = \ 1418 $(VBoxJMscom-inst-jar_0_OUTDIR)/vboxjmscom.jar \ 1419 $(VBOX_JMSCOM_GEN)/jmscomglue.list \ 1420 $(wildcard \ 1421 $(VBOX_JMSCOM_GEN)/java/*.java \ 1422 $(VBOX_JMSCOM_JDEST)/*.class \ 1423 $(VBOX_JMSCOM_JDEST)/*/*.class \ 1424 $(VBOX_JMSCOM_JDEST)/*/*/*.class \ 1425 $(VBOX_JMSCOM_JDEST)/*/*/*/*.class \ 1426 ) 1427 VBoxJMscom-inst-jar_BLDDIRS += $(VBOX_JMSCOM_GEN)/java 1428 $(call KB_FN_DO_PASS0_ON_TARGET,VBoxJMscom-inst-jar) # Sets VBoxJMscom-inst-jar_0_OUTDIR 1429 1430 $(call KB_FN_AUTO_CMD_DEPS,$(VBOX_JMSCOM_GEN)/jmscomglue.list) 1431 $(VBOX_JMSCOM_GEN)/jmscomglue.list: \ 1384 1432 $(VBOX_XIDL_FILE) \ 1385 1433 $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \ … … 1398 1446 $(QUIET)echo $(VBOX_JMSCOM_GEN)/java/*.java > $@ 1399 1447 1400 ## @todo $(call KB_FN_AUTO_CMD_DEPS,$(VBOX_JMSCOM_JAR)) - need to fix the double expansion here 1401 $$(VBOX_JMSCOM_JAR): $(VBOX_JMSCOM_GEN)/jmscomglue.list | $$(dir $$@) 1448 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxJMscom-inst-jar_0_OUTDIR)/vboxjmscom.jar) 1449 $(VBoxJMscom-inst-jar_0_OUTDIR)/vboxjmscom.jar: $(VBOX_JMSCOM_GEN)/jmscomglue.list | $$(dir $$@) 1450 $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) 1402 1451 $(call MSG_TOOL,javac,$(notdir $@),jmscomglue.list,) 1403 1452 $(QUIET)$(RM) -Rf $(VBOX_JMSCOM_JDEST) … … 1409 1458 $(QUIET)$(VBOX_JAR) cf $@ -C $(VBOX_JMSCOM_JDEST) . 1410 1459 1411 ## @todo compile TestVBox.java (see below) to have sanity checking 1412 1460 ## @todo compile TestVBox.java (see below) to have sanity checking 1413 1461 endif # VBOX_WITH_JMSCOM 1414 1462
Note:
See TracChangeset
for help on using the changeset viewer.

