Changeset 98429 in vbox for trunk/src/VBox
- Timestamp:
- Feb 2, 2023 12:03:46 PM (23 months ago)
- Location:
- trunk/src/VBox/Installer
- Files:
-
- 12 edited
-
Config.kmk (modified) (4 diffs)
-
Makefile.kmk (modified) (1 diff)
-
common/Makefile.kmk (modified) (1 diff)
-
darwin/Makefile.kmk (modified) (19 diffs)
-
freebsd/Makefile.kmk (modified) (10 diffs)
-
linux/Makefile.kmk (modified) (22 diffs)
-
solaris/Makefile.kmk (modified) (10 diffs)
-
win/InstallHelper/Makefile.kmk (modified) (1 diff)
-
win/Makefile.kmk (modified) (31 diffs)
-
win/Resources/Makefile.kmk (modified) (1 diff)
-
win/Stub/Makefile.kmk (modified) (1 diff)
-
win/StubBld/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/Config.kmk
r98103 r98429 77 77 rhel5_ks.cfg \ 78 78 redhat67_ks.cfg \ 79 79 os2_response_files.rsp \ 80 80 win_nt5_unattended.sif \ 81 81 win_nt6_unattended.xml \ … … 86 86 os2_cid_install.cmd \ 87 87 win_postinstall.cmd \ 88 89 88 \ 89 os2_util.exe 90 90 ifndef VBOX_OSE 91 91 VBOX_UNATTENDED_TEMPLATES += \ 92 lgw_ks.cfg \93 lgw_postinstall.sh92 lgw_ks.cfg \ 93 lgw_postinstall.sh 94 94 endif 95 95 else … … 104 104 ## List of files in the per arch DTrace library directory. 105 105 VBOXINST_DTRACE_LIB_ARCH_FILES := \ 106 107 108 109 110 111 106 vbox-types.d \ 107 vbox-arch-types.d \ 108 vm.d \ 109 cpumctx.d \ 110 CPUMInternal.d \ 111 x86.d 112 112 ## List of files in the per arch DTrace testcase directory. 113 113 VBOXINST_DTRACE_TESTCASE_ARCH_FILES := \ … … 135 135 endif 136 136 else 137 VBOX_CP_THIS_BITS:= 64137 VBOX_CP_THIS_BITS := 64 138 138 ifdef VBOX_WITH_COMBINED_PACKAGE 139 139 VBOX_CP_OTHER_ARCH := x86 -
trunk/src/VBox/Installer/Makefile.kmk
r98103 r98429 66 66 PACKING += $(VBOX_SDK_ZIP) 67 67 OTHER_CLEANS += $(VBOX_SDK_ZIP) \ 68 68 $(wildcard $(PATH_STAGE_BIN)/VirtualBoxSDK-*-r*.zip) 69 69 70 # @todo: wrong, it must depend on everything included in SDK71 $(VBOX_SDK_ZIP): \72 $(PATH_STAGE_BIN)/sdk \73 $(VBOX_VERSION_STAMP)70 # @todo: wrong, it must depend on everything included in SDK 71 $(VBOX_SDK_ZIP): \ 72 $(PATH_STAGE_BIN)/sdk \ 73 $(VBOX_VERSION_STAMP) 74 74 $(call MSG_L1,Making SDK delivery $@) 75 75 $(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -r9 $@ sdk -
trunk/src/VBox/Installer/common/Makefile.kmk
r98103 r98429 37 37 ifdef VBOX_WITH_PYTHON 38 38 39 INSTALLS += VBox-python-glue-installer39 INSTALLS += VBox-python-glue-installer 40 40 41 VBox-python-glue-installer_INST = $(INST_SDK)installer/42 VBox-python-glue-installer_MODE = a+r,u+w43 VBox-python-glue-installer_SOURCES = vboxapisetup.py41 VBox-python-glue-installer_INST = $(INST_SDK)installer/ 42 VBox-python-glue-installer_MODE = a+r,u+w 43 VBox-python-glue-installer_SOURCES = vboxapisetup.py 44 44 45 45 endif # VBOX_WITH_PYTHON -
trunk/src/VBox/Installer/darwin/Makefile.kmk
r98103 r98429 167 167 $(if $(VBOX_ADD_MANUAL_de_DE),$(INSTALL) -m 644 $(VBOX_ADD_MANUAL_de_DE) "$(VBOX_PATH_PACK_TMP)/DiskImage/$(VBOX_BRAND_de_DE_MANUAL_NAME).pdf"$(NLTAB)) \ 168 168 $(if $(VBOX_ADD_MANUAL_fr_FR),$(INSTALL) -m 644 $(VBOX_ADD_MANUAL_fr_FR) "$(VBOX_PATH_PACK_TMP)/DiskImage/$(VBOX_BRAND_fr_FR_MANUAL_NAME).pdf"$(NLTAB))) 169 169 # Rename the main package 170 170 else 171 171 $(if $(VBOX_WITH_DOCS_PACKING), $(INSTALL) $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/UserManual.pdf $(VBOX_PATH_PACK_TMP)/DiskImage/) … … 202 202 $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg \ 203 203 $(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg \ 204 $$(wildcard $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/* \ 205 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/*.lproj/*) \ 204 $$(wildcard \ 205 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/* \ 206 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/*.lproj/*) \ 206 207 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_BRAND_$(f)_VIRTUALBOX_WELCOME_RTF)) \ 207 208 $(if $(VBOX_WITH_FUSE_PACKING), $(VBOX_PATH_PACK_TMP)/Packages/OSXFuseCore.pkg) \ … … 287 288 288 289 ifdef VBOX_WITH_VBOXDRV 289 # 290 # The VirtualBox Kernel extensions. 291 # 292 VBOX_DI_KEXTS_UNIVERSAL = VBoxDrv VBoxNetFlt VBoxNetAdp 293 VBOX_DI_KEXTS = $(VBOX_DI_KEXTS_UNIVERSAL) 294 295 $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg: \ 296 $(foreach kext,$(VBOX_DI_KEXTS_UNIVERSAL), $(call VBOX_DI_FN_DEP_BOTH,$(kext).kext/Contents/MacOS/$(kext))) \ 297 $(foreach kext,$(VBOX_DI_KEXTS), $(VBOX_PATH_DIST)/$(kext).kext/Contents/Info.plist) \ 298 $$(wildcard $(VBOX_PATH_DI_SRC)/VBoxKEXTs/* \ 299 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/*.lproj/*) \ 300 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \ 301 $(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST) \ 302 $(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML) \ 303 $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \ 304 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) 290 # 291 # The VirtualBox Kernel extensions. 292 # 293 VBOX_DI_KEXTS_UNIVERSAL = VBoxDrv VBoxNetFlt VBoxNetAdp 294 VBOX_DI_KEXTS = $(VBOX_DI_KEXTS_UNIVERSAL) 295 296 $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg: \ 297 $(foreach kext,$(VBOX_DI_KEXTS_UNIVERSAL), $(call VBOX_DI_FN_DEP_BOTH,$(kext).kext/Contents/MacOS/$(kext))) \ 298 $(foreach kext,$(VBOX_DI_KEXTS), $(VBOX_PATH_DIST)/$(kext).kext/Contents/Info.plist) \ 299 $$(wildcard \ 300 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/* \ 301 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/*.lproj/*) \ 302 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \ 303 $(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST) \ 304 $(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML) \ 305 $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \ 306 $(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) 305 307 $(call MSG_TOOL,pkgbuild,,,$@) 306 308 @# Cleanup any previously failed attempts. … … 333 335 $(NLTAB)$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/$(kext).kext/Contents/MacOS/$(kext) $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/MacOS/) 334 336 @# Sign the kext bundles. 335 ifdef VBOX_SIGNING_MODE337 ifdef VBOX_SIGNING_MODE 336 338 $(foreach kext,$(VBOX_DI_KEXTS) \ 337 339 ,$(NLTAB)$(call VBOX_SIGN_MACHO_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext/Contents/MacOS/$(kext),org.virtualbox.app.kext.$(kext)) ) 338 $(foreach kext,$(VBOX_DI_KEXTS) ,\339 $(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext,org.virtualbox.app.kext.$(kext)) )340 ## @TODO check why this fails on the build box: $(foreach kext,$(VBOX_DI_KEXTS), $(NLTAB)codesign --verify --verbose=1 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext )341 endif340 $(foreach kext,$(VBOX_DI_KEXTS) \ 341 ,$(NLTAB)$(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext,org.virtualbox.app.kext.$(kext)) ) 342 ## @TODO check why this fails on the build box: $(foreach kext,$(VBOX_DI_KEXTS), $(NLTAB)codesign --verify --verbose=1 $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/$(kext).kext ) 343 endif 342 344 @# Set the correct owners. 343 345 sudo chown -R root:wheel $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/ … … 366 368 $(if-expr defined(VBOX_MACOSX_INSTALLER_SIGN) && $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING)) == "",--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \ 367 369 $@ 368 ifdef VBOX_SIGNING_MODE369 if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING))370 ifdef VBOX_SIGNING_MODE 371 if $(intersects darwin all 1,$(VBOX_WITH_CORP_CODE_SIGNING)) 370 372 @# Sign the created pkg. 371 373 $(call VBOX_SIGN_PKG_FN,$@,org.virtualbox.pkg.vboxkexts) 372 endif373 endif374 endif 375 endif 374 376 @# Cleanup 375 377 sudo chown -R "$(shell whoami)" \ … … 448 450 ifdef VBOX_WITH_QTGUI 449 451 VBOX_DI_VBAPP_DYLIBS += \ 450 452 MacOS/UICommon.dylib 451 453 ifneq ($(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/accessible/libqtaccessiblewidgets.dylib),) 452 454 VBOX_DI_VBAPP_DYLIBS += \ … … 460 462 ifdef VBOX_WITH_DEBUGGER 461 463 VBOX_DI_VBAPP_DYLIBS += \ 462 464 MacOS/DbgPlugInDiggers.dylib 463 465 if defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_DEBUGGER_GUI) 464 466 VBOX_DI_VBAPP_DYLIBS += \ … … 507 509 $(error Conflict.$(NLTAB)VBOX_DI_VBAPP_DYLIBS.amd64=$(VBOX_DI_VBAPP_DYLIBS.amd64)$(NLTAB)VBOX_DI_VBAPP_DYLIBS.x86 =$(VBOX_DI_VBAPP_DYLIBS.x86)) 508 510 endif 509 if1of ($(VBOX_DI_VBAPP_DYLIBS.amd64) $(VBOX_DI_VBAPP_DYLIBS.x86), $(VBOX_DI_VBAPP_DYLIBS))511 if1of ($(VBOX_DI_VBAPP_DYLIBS.amd64) $(VBOX_DI_VBAPP_DYLIBS.x86), $(VBOX_DI_VBAPP_DYLIBS)) 510 512 $(error Conflict.$(NLTAB)VBOX_DI_VBAPP_DYLIBS.amd64=$(VBOX_DI_VBAPP_DYLIBS.amd64)$(NLTAB)VBOX_DI_VBAPP_DYLIBS.x86 =$(VBOX_DI_VBAPP_DYLIBS.x86)$(NLTAB)VBOX_DI_VBAPP_DYLIBS=$(VBOX_DI_VBAPP_DYLIBS)) 511 513 endif … … 567 569 ifdef VBOX_WITH_DOCS_QHELP_PACKING 568 570 VBOX_DI_VBAPP_MISC_FILES += \ 569 MacOS/UserManual.qch \570 MacOS/UserManual.qhc571 MacOS/UserManual.qch \ 572 MacOS/UserManual.qhc 571 573 endif 572 574 endif 573 575 ifdef VBOX_WITH_ADDITIONS_PACKING 574 576 ifneq ($(wildcard $(VBOX_PATH_DIST)/VirtualBox.app/Contents/MacOS/VBoxGuestAdditions.iso),) 575 VBOX_DI_VBAPP_MISC_FILES += \576 MacOS/VBoxGuestAdditions.iso577 VBOX_DI_VBAPP_MISC_FILES += \ 578 MacOS/VBoxGuestAdditions.iso 577 579 endif 578 580 endif … … 626 628 # @param 4 Team ID. 627 629 define def_vbox_entitlement_add_app_and_team_id = 628 $(2): $(1) $$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) | $$$$(dir $$$$@)630 $(2): $(1) $$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE) | $$$$(dir $$$$@) 629 631 $$(QUIET)$$(SED) \ 630 632 -e '/^<dict>$$$$/a \ <key>com.apple.application-identifier</key>\n <string>$(strip $(4)).$(strip $(3))</string>\n <key>com.apple.developer.team-identifier</key>\n <string>$(strip $(4))</string>' \ … … 635 637 ifdef VBOX_VIRTUALBOX_APP_ID 636 638 VBOX_VIRTUALBOX_APP_ENTITLEMENTS := $(VBOX_PATH_PACK_TMP)/SUPR3HardenedEntitlements.plist 637 $(evalcall2 def_vbox_entitlement_add_app_and_team_id,$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlements.plist,$(VBOX_VIRTUALBOX_APP_ENTITLEMENTS),$(VBOX_VIRTUALBOX_APP_ID),$(VBOX_PROVISIONPROFILE_TEAM_ID))639 $(evalcall2 def_vbox_entitlement_add_app_and_team_id,$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlements.plist,$(VBOX_VIRTUALBOX_APP_ENTITLEMENTS),$(VBOX_VIRTUALBOX_APP_ID),$(VBOX_PROVISIONPROFILE_TEAM_ID)) 638 640 endif 639 641 640 642 ifdef VBOX_VIRTUALBOXVM_APP_ID 641 643 VBOX_VIRTUALBOXVM_APP_ENTITLEMENTS := $(VBOX_PATH_PACK_TMP)/SUPR3HardenedEntitlementsVM.plist 642 $(evalcall2 def_vbox_entitlement_add_app_and_team_id,$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlementsVM.plist,$(VBOX_VIRTUALBOXVM_APP_ENTITLEMENTS),$(VBOX_VIRTUALBOXVM_APP_ID),$(VBOX_PROVISIONPROFILE_TEAM_ID))644 $(evalcall2 def_vbox_entitlement_add_app_and_team_id,$(PATH_ROOT)/src/VBox/HostDrivers/Support/darwin/SUPR3HardenedEntitlementsVM.plist,$(VBOX_VIRTUALBOXVM_APP_ENTITLEMENTS),$(VBOX_VIRTUALBOXVM_APP_ID),$(VBOX_PROVISIONPROFILE_TEAM_ID)) 643 645 endif 644 646 endif … … 651 653 $(VBOX_DI_VBAPP_OTHER_BINS) $(VBOX_DI_VBAPP_PROGS) $(VBOX_DI_VBAPP_PROGS_HARDENED) $(VBOX_DI_VBAPP_MISC_FILES) \ 652 654 ,$(call VBOX_DI_FN_DEP_BOTH,VirtualBox.app/Contents/$(f)) ) \ 653 $(foreach f, $(VBOX_DI_VBAPP_DYLIBS.x86) $(VBOX_DI_VBAPP_MISC_FILES.x86) \655 $(foreach f, $(VBOX_DI_VBAPP_DYLIBS.x86) $(VBOX_DI_VBAPP_MISC_FILES.x86) \ 654 656 ,$(call VBOX_DI_FN_DEP_32,VirtualBox.app/Contents/$(f)) ) \ 655 $(foreach f, $(VBOX_DI_VBAPP_DYLIBS.amd64) $(VBOX_DI_VBAPP_MISC_FILES.amd64) \657 $(foreach f, $(VBOX_DI_VBAPP_DYLIBS.amd64) $(VBOX_DI_VBAPP_MISC_FILES.amd64) \ 656 658 ,$(call VBOX_DI_FN_DEP_64,VirtualBox.app/Contents/$(f)) ) \ 657 659 \ … … 796 798 ,$(INSTALL) -m 0755 $(VBOX_PATH_DIST)/VirtualBox.app/Contents/$(prog) $(VBOX_PATH_VBOX_APP_TMP)/Contents/$(prog)$(NLTAB)) 797 799 ifdef VBOX_UNATTENDED_TEMPLATES 798 # Unattended installation template scripts.800 # Unattended installation template scripts. 799 801 $(MKDIR) -p -m 0755 -- $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/UnattendedTemplates 800 802 $(foreach file, $(VBOX_UNATTENDED_TEMPLATES) \ … … 803 805 endif 804 806 ifdef VBOX_WITH_DTRACE 805 # DTrace library, testcases and scripts.807 # DTrace library, testcases and scripts. 806 808 $(MKDIR) -p -m 0755 -- \ 807 809 $(VBOX_PATH_VBOX_APP_TMP)/Contents/MacOS/dtrace/lib/$(KBUILD_TARGET_ARCH)/ \ … … 815 817 endif 816 818 ifndef VBOX_WITH_QTGUI 817 # Hack alert! Just something to make pkgbuild happy.819 # Hack alert! Just something to make pkgbuild happy. 818 820 $(APPEND) -tn "$(VBOX_PATH_VBOX_APP_TMP)/Contents/PkgInfo" "APPLVBOX" 819 821 $(APPEND) -tn "$(VBOX_PATH_VBOX_APP_TMP)/Contents/Info.plist" \ … … 868 870 , $(NLTAB)$(call VBOX_SIGN_FILE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/$(file),org.virtualbox.app.$(tolower $(subst $(SP),,$(subst /,.,$(file))))) ) 869 871 870 ifdef VBOX_PROVISIONPROFILE_TEAM_ID871 # $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox/$(VBOX_PROVISIONPROFILE_TEAM_ID).provisionprofile $(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app/Contents/embedded.provisionprofile872 endif872 ifdef VBOX_PROVISIONPROFILE_TEAM_ID 873 # $(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox/$(VBOX_PROVISIONPROFILE_TEAM_ID).provisionprofile $(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app/Contents/embedded.provisionprofile 874 endif 873 875 $(call VBOX_SIGN_BUNDLE_FN,$(VBOX_PATH_VBOX_APP_TMP)/Contents/Resources/VirtualBoxVM.app,,$(if-expr defined(VBOX_WITH_MACOS_HARDENED_RUNTIME)\ 874 876 ,--entitlements="$(VBOX_VIRTUALBOX_APP_ENTITLEMENTS)",)) … … 956 958 # 957 959 $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg: \ 958 $$(wildcard $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/* \ 959 $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/*.lproj/*) \ 960 $$(wildcard \ 961 $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/* \ 962 $(VBOX_PATH_DI_SRC)/VirtualBoxCLI/*.lproj/*) \ 960 963 $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES) \ 961 964 ,$(VBOX_BRAND_$(f)_VIRTUALBOXCLI_DESCRIPTION_PLIST)) \ … … 1042 1045 1043 1046 ifdef VBOX_WITH_FUSE_PACKING 1044 #1045 # The FUSE for macOS core package.1046 #1047 VBOX_PATH_FUSE_CORE_PKG ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/osxfuse/v*)))/Core.pkg1048 $(VBOX_PATH_PACK_TMP)/Packages/OSXFuseCore.pkg: \1049 $(VBOX_PATH_FUSE_CORE_PKG)1047 # 1048 # The FUSE for macOS core package. 1049 # 1050 VBOX_PATH_FUSE_CORE_PKG ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/osxfuse/v*)))/Core.pkg 1051 $(VBOX_PATH_PACK_TMP)/Packages/OSXFuseCore.pkg: \ 1052 $(VBOX_PATH_FUSE_CORE_PKG) 1050 1053 $(call MSG_TOOL,Preparing FUSE for macOS core package,,,$@) 1051 1054 @# Cleanup any previously failed attempts. … … 1059 1062 # Aliases. 1060 1063 # 1061 VBoxKEXTs.pkg: 1062 VirtualBoxCLI.pkg: 1063 VirtualBox.pkg: 1064 VirtualBox.mpkg: 1065 VirtualBox.dmg: 1064 VBoxKEXTs.pkg: $(VBOX_PATH_PACK_TMP)/Packages/VBoxKEXTs.pkg 1065 VirtualBoxCLI.pkg: $(VBOX_PATH_PACK_TMP)/Packages/VirtualBoxCLI.pkg 1066 VirtualBox.pkg: $(VBOX_PATH_PACK_TMP)/Packages/VirtualBox.pkg 1067 VirtualBox.mpkg: $(VBOX_PATH_PACK_TMP)/DiskImage/VirtualBox.pkg 1068 VirtualBox.dmg: $(VBOX_PATH_DIST)/VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).dmg -
trunk/src/VBox/Installer/freebsd/Makefile.kmk
r98103 r98429 56 56 57 57 OTHER_CLEAN += \ 58 $(addprefix $(VBOX_FBSD_INST_STAGE_DIR)/, \59 60 58 $(addprefix $(VBOX_FBSD_INST_STAGE_DIR)/, \ 59 pkg_plist \ 60 LICENSE) \ 61 61 $(wildcard $(VBOX_FBSD_INST_OUT_DIR)/VirtualBox-*) 62 62 … … 102 102 VBoxHostChannel.so \ 103 103 $(if $(VBOX_WITH_MAIN), \ 104 105 106 107 108 109 110 111 112 113 114 104 VBoxManage \ 105 VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \ 106 VBoxNetAdpCtl \ 107 VBoxSVC \ 108 VBoxXPCOM.so \ 109 VBoxXPCOMC.so \ 110 VBoxXPCOMIPCD \ 111 components/VBoxXPCOMIPCC.so \ 112 components/VBoxSVCM.so \ 113 components/VBoxC.so,) \ 114 VBoxTestOGL \ 115 115 $(if $(VBOX_WITH_PYTHON),VBoxPython.so,) \ 116 116 $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \ … … 128 128 $(if $(VBOX_OSE),,LICENSE) \ 129 129 $(if $(VBOX_WITH_MAIN), \ 130 131 130 components/VBoxXPCOMBase.xpt \ 131 components/VirtualBox_XPCOM.xpt) \ 132 132 vboxdrv.tar.gz 133 133 … … 142 142 VBOX_FBSD_SYMLINKS = \ 143 143 $(if $(VBOX_WITH_MAIN), \ 144 145 144 VBoxManage \ 145 VBoxSVC) \ 146 146 $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \ 147 147 $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \ … … 155 155 VirtualBox \ 156 156 $(if $(VBOX_WITH_HARDENING),VirtualBox.so) \ 157 $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,)157 $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,) 158 158 VBOX_FBSD_SYMLINKS += \ 159 159 VirtualBox 160 160 VBOX_FBSD_NO_STRIP += \ 161 $(VBOX_LICENSE_FILES) \161 $(VBOX_LICENSE_FILES) \ 162 162 $(if $(VBOX_WITH_ORACLE_QT),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \ 163 $(if $(VBOX_WITH_ORACLE_QT),accessible/libqtaccessiblewidgets.so,) \163 $(if $(VBOX_WITH_ORACLE_QT),accessible/libqtaccessiblewidgets.so,) \ 164 164 $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) 165 165 VBOX_FBSD_DESKTOP_FILE = \ 166 virtualbox.desktop \167 virtualboxvm.desktop166 virtualbox.desktop \ 167 virtualboxvm.desktop 168 168 VBOX_FBSD_ICON_FILE = \ 169 VBox.png169 VBox.png 170 170 endif 171 171 … … 179 179 ifdef VBOX_WITH_DOCS_PACKING 180 180 VBOX_FBSD_NO_STRIP += \ 181 VirtualBox.chm UserManual.pdf \182 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf)181 VirtualBox.chm UserManual.pdf \ 182 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf) 183 183 endif 184 184 … … 186 186 ifdef VBOX_WITH_VRDP 187 187 VBOX_FBSD_STRIP_BIN += \ 188 VBoxVRDP.so \189 VBoxAuth.so188 VBoxVRDP.so \ 189 VBoxAuth.so 190 190 endif 191 191 … … 193 193 ifdef VBOX_WITH_HEADLESS 194 194 VBOX_FBSD_STRIP_BIN += \ 195 VBoxHeadless \196 $(if $(VBOX_WITH_HARDENING),VBoxHeadless.so)195 VBoxHeadless \ 196 $(if $(VBOX_WITH_HARDENING),VBoxHeadless.so) 197 197 VBOX_FBSD_SYMLINKS += \ 198 VBoxHeadless198 VBoxHeadless 199 199 endif 200 200 … … 202 202 ifdef VBOX_WITH_WEBSERVICES 203 203 VBOX_FBSD_STRIP_BIN += \ 204 vboxwebsrv204 vboxwebsrv 205 205 VBOX_FBSD_SYMLINKS += \ 206 vboxwebsrv206 vboxwebsrv 207 207 endif 208 208 … … 211 211 ifdef VBOX_WITH_DTRACE 212 212 VBOX_FBSD_NO_STRIP += \ 213 214 215 213 $(addprefix dtrace/lib/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_LIB_ARCH_FILES)) \ 214 $(addprefix dtrace/testcase/$(KBUILD_TARGET_ARCH)/,$(VBOXINST_DTRACE_TESTCASE_ARCH_FILES)) \ 215 $(addprefix dtrace/scripts/,$(VBOXINST_DTRACE_SCRIPTS_FILES)) 216 216 endif 217 217 -
trunk/src/VBox/Installer/linux/Makefile.kmk
r98103 r98429 45 45 # 46 46 VBOX_LNX_APP_PRIVATE := $(if $(VBOX_PATH_APP_PRIVATE),$(VBOX_PATH_APP_PRIVATE),/opt/VirtualBox) 47 VBOX_LNX_APP_DOCS := $(if $(VBOX_PATH_PACKAGE_DOCS),$(VBOX_PATH_PACKAGE_DOCS), \48 47 VBOX_LNX_APP_DOCS := $(if $(VBOX_PATH_PACKAGE_DOCS),$(VBOX_PATH_PACKAGE_DOCS), \ 48 $(if $(VBOX_PATH_APP_DOCS),$(VBOX_PATH_APP_DOCS),/opt/VirtualBox)) 49 49 VBOX_PATH_LNX_INST_SRC := $(PATH_SUB_CURRENT) 50 50 VBOX_LNX_INST_OUT_DIR := $(PATH_TARGET)/Installer/linux … … 60 60 if !defined(VBOX_NO_LINUX_RUN_INSTALLER) 61 61 PACKING += $(PATH_STAGE_BIN)/$(VBOX_LNX_PACKAGE_NAME) \ 62 62 $(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2 63 63 else 64 64 PACKING += $(PATH_STAGE_BIN)/VirtualBox.tar … … 66 66 67 67 OTHER_CLEAN += \ 68 $(addprefix $(VBOX_LNX_INST_STAGE_DIR)/, \69 70 71 68 $(addprefix $(VBOX_LNX_INST_STAGE_DIR)/, \ 69 install.sh \ 70 VirtualBox.tar.bz2 \ 71 LICENSE) \ 72 72 $(wildcard $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-*) \ 73 73 $(VBOX_LNX_INST_OUT_DIR)/install.sh … … 118 118 $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualboxvm.desktop,) 119 119 ifeq ($(KBUILD_TYPE),asan) 120 linux-misc_SOURCES += $(foreach lib,$(VBOX_GCC_SANITIZER_SO_FILES) \121 ,$(lib)=>$(notdir $(lib)) $(lib)=>testcase/$(notdir $(lib)) $(lib)=>tools/$(notdir $(lib)) )120 linux-misc_SOURCES += $(foreach lib,$(VBOX_GCC_SANITIZER_SO_FILES) \ 121 ,$(lib)=>$(notdir $(lib)) $(lib)=>testcase/$(notdir $(lib)) $(lib)=>tools/$(notdir $(lib)) ) 122 122 endif 123 123 linux-misc_CLEAN = \ … … 170 170 $(if $(VBOX_WITH_DRAG_AND_DROP),VBoxDragAndDropSvc.so,) \ 171 171 $(if $(VBOX_WITH_MAIN), \ 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 172 VBoxAutostart \ 173 VBoxBalloonCtrl \ 174 VBoxBugReport \ 175 VBoxManage \ 176 VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \ 177 $(if $(VBOX_WITH_LWIP_NAT),VBoxNetNAT $(if $(VBOX_WITH_HARDENING),VBoxNetNAT.so,),) \ 178 VBoxNetAdpCtl \ 179 $(if $(VBOX_WITH_DEVMAPPER),VBoxVolInfo,) \ 180 VBoxSVC \ 181 VBoxXPCOM.so \ 182 VBoxXPCOMC.so \ 183 VBoxXPCOMIPCD \ 184 components/VBoxXPCOMIPCC.so \ 185 components/VBoxSVCM.so \ 186 components/VBoxC.so,) \ 187 187 $(if $(VBOX_WITH_QTGUI),VBoxTestOGL,) \ 188 188 $(if $(VBOX_WITH_VMSVGA3D),VBoxSVGA3D.so,) \ … … 191 191 $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \ 192 192 $(if $(and $(VBOX_WITH_EXTPACK_VNC),$(VBOX_WITHOUT_EXTPACK_VNC_PACKING)), \ 193 194 195 $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \193 ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNC.so \ 194 ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \ 195 $(if $(VBOX_WITH_DTRACE),VBoxDTrace,) \ 196 196 $(if $(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST),VBoxAudioTest,) 197 197 … … 202 202 ifdef VBOX_NO_LINUX_RUN_INSTALLER 203 203 VBOX_LNX_STRIP_OBJ += \ 204 VBoxDDR0.debug \205 VMMR0.debug204 VBoxDDR0.debug \ 205 VMMR0.debug 206 206 else 207 207 VBOX_LNX_DBG_BIN = \ 208 VBoxDDR0.debug \209 VMMR0.debug208 VBoxDDR0.debug \ 209 VMMR0.debug 210 210 endif 211 211 212 212 ifdef VBOX_WITH_RAW_MODE 213 213 VBOX_LNX_STRIP_OBJ += \ 214 VBoxDDRC.rc \215 VMMRC.rc214 VBoxDDRC.rc \ 215 VMMRC.rc 216 216 ifdef VBOX_NO_LINUX_RUN_INSTALLER 217 217 VBOX_LNX_STRIP_OBJ += \ 218 VBoxDDRC.debug \219 VMMRC.debug218 VBoxDDRC.debug \ 219 VMMRC.debug 220 220 else 221 221 VBOX_LNX_DBG_BIN += \ 222 VBoxDDRC.debug \223 VMMRC.debug222 VBoxDDRC.debug \ 223 VMMRC.debug 224 224 endif 225 225 endif … … 229 229 $(if $(VBOX_OSE),,LICENSE) \ 230 230 $(if $(VBOX_WITH_MAIN), \ 231 232 231 components/VBoxXPCOMBase.xpt \ 232 components/VirtualBox_XPCOM.xpt) \ 233 233 $(if $(VBOX_WITH_PYTHON),vboxshell.py,) \ 234 234 $(if $(and $(VBOX_WITH_EXTPACK_VNC),$(VBOX_WITHOUT_EXTPACK_VNC_PACKING)), \ 235 236 237 238 235 ExtensionPacks/VNC/ExtPack.xml \ 236 ExtensionPacks/VNC/ExtPack-license.html \ 237 ExtensionPacks/VNC/ExtPack-license.rtf \ 238 ExtensionPacks/VNC/ExtPack-license.txt,) \ 239 239 check_module_dependencies.sh \ 240 240 postinst-common.sh \ … … 253 253 ifdef VBOX_WITH_EXTPACK 254 254 VBOX_LNX_STRIP_BIN += \ 255 VBoxExtPackHelperApp255 VBoxExtPackHelperApp 256 256 endif 257 257 … … 267 267 ifdef VBOX_WITH_HARDENING 268 268 VBOX_LNX_STRIP_BIN += \ 269 VirtualBoxVM.so269 VirtualBoxVM.so 270 270 endif 271 271 VBOX_LNX_NO_STRIP += \ … … 289 289 ifdef VBOX_WITH_DOCS_PACKING 290 290 VBOX_LNX_NO_STRIP += \ 291 UserManual.pdf \292 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),UserManual_$(f).pdf)291 UserManual.pdf \ 292 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),UserManual_$(f).pdf) 293 293 ifdef VBOX_WITH_DOCS_CHM_PACKING 294 294 VBOX_LNX_NO_STRIP += \ 295 295 VirtualBox.chm \ 296 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm)296 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm) 297 297 endif 298 298 ifdef VBOX_WITH_DOCS_QHELP_PACKING 299 299 VBOX_LNX_NO_STRIP += \ 300 300 UserManual.qch UserManual.qhc \ 301 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),UserManual_$(f).qch ,UserManual_$(f).qhc)301 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),UserManual_$(f).qch ,UserManual_$(f).qhc) 302 302 endif 303 303 endif … … 326 326 ifdef VBOX_WITH_JXPCOM 327 327 VBOX_LNX_NO_STRIP += \ 328 sdk/bindings/xpcom/java/vboxjxpcom.jar328 sdk/bindings/xpcom/java/vboxjxpcom.jar 329 329 endif 330 330 … … 332 332 ifdef VBOX_WITH_HEADLESS 333 333 VBOX_LNX_STRIP_BIN += \ 334 VBoxHeadless \335 $(if $(VBOX_WITH_HARDENING),VBoxHeadless.so)334 VBoxHeadless \ 335 $(if $(VBOX_WITH_HARDENING),VBoxHeadless.so) 336 336 endif 337 337 … … 344 344 # vbox-img 345 345 if defined(VBOX_WITH_TESTCASES) || defined(VBOX_WITH_VBOX_IMG) 346 VBOX_LNX_STRIP_BIN+= \347 vbox-img346 VBOX_LNX_STRIP_BIN += \ 347 vbox-img 348 348 endif 349 349 350 350 # vboximg-mount 351 351 if defined(VBOX_WITH_VBOXIMGMOUNT) 352 VBOX_LNX_STRIP_BIN+= \353 vboximg-mount352 VBOX_LNX_STRIP_BIN += \ 353 vboximg-mount 354 354 endif 355 355 … … 376 376 # Icons 377 377 VBOX_MIME_ICONS = \ 378 $(addprefix $(PATH_ROOT)/src/VBox/Artwork/other/, \379 380 $(foreach s,16 20 24 32 48 64 72 96 128 256,\381 378 $(addprefix $(PATH_ROOT)/src/VBox/Artwork/other/, \ 379 $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \ 380 $(foreach s,16 20 24 32 48 64 72 96 128 256, \ 381 virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png))) 382 382 383 383 VBOX_DESKTOP_ICONS = \ 384 $(addprefix $(PATH_ROOT)/src/VBox/Artwork/$(if $(VBOX_OSE),OSE,NonOSE)/, \385 $(foreach s,16 20 32 40 48 64 128,\386 387 384 $(addprefix $(PATH_ROOT)/src/VBox/Artwork/$(if $(VBOX_OSE),OSE,NonOSE)/, \ 385 $(foreach s,16 20 32 40 48 64 128, \ 386 virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png) \ 387 virtualbox.svg=>scalable/virtualbox.svg) 388 388 389 389 # … … 394 394 # Cleanup of the files we copy/symlink from bin. 395 395 OTHER_CLEAN += $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(filter-out src,$(VBOX_LNX_ARCH_FILES)) src/vboxhost) \ 396 $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,\397 396 $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/, \ 397 $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN)) 398 398 399 399 # … … 433 433 434 434 include $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/files_vboxdrv 435 VBOX_LNX_INST_FILES_VBOXDRV =$(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxdrv/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(FILES_VBOXDRV_NOBIN)))))435 VBOX_LNX_INST_FILES_VBOXDRV = $(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxdrv/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(FILES_VBOXDRV_NOBIN))))) 436 436 include $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt 437 VBOX_LNX_INST_FILES_VBOXNETFLT =$(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxnetflt/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXNETFLT_SOURCES)))))437 VBOX_LNX_INST_FILES_VBOXNETFLT = $(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxnetflt/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXNETFLT_SOURCES))))) 438 438 include $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp 439 VBOX_LNX_INST_FILES_VBOXNETADP =$(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxnetadp/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXNETADP_SOURCES)))))439 VBOX_LNX_INST_FILES_VBOXNETADP = $(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxnetadp/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXNETADP_SOURCES))))) 440 440 441 441 ifdef VBOX_WITH_PCI_PASSTHROUGH 442 442 include $(PATH_ROOT)/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci 443 VBOX_LNX_INST_FILES_VBOXPCI =$(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxpci/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXPCI_SOURCES)))))443 VBOX_LNX_INST_FILES_VBOXPCI = $(patsubst =>%,$(PATH_STAGE_BIN)/src/vboxpci/%,$(filter =>%,$(subst =>, =>,$(subst $(DQUOTE),,$(VBOX_VBOXPCI_SOURCES))))) 444 444 endif 445 445 … … 486 486 $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_BIN)): \ 487 487 $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% \ 488 $(if $(VBOX_NO_LINUX_RUN_INSTALLER),, \489 488 $(if $(VBOX_NO_LINUX_RUN_INSTALLER),, \ 489 $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/%) \ 490 490 | $$(dir $$@) 491 491 $(call MSG_INST_FILE,$<,$@) … … 526 526 527 527 # rules for creating directories in archive (the pattern rules depends on these). 528 BLDDIRS += $(foreach d, \528 BLDDIRS += $(foreach d, \ 529 529 archive \ 530 530 archive/components \ … … 532 532 $(if $(VBOX_WITH_UNATTENDED),archive/unattended_templates,) \ 533 533 $(if $(VBOX_WITH_ORACLE_QT), \ 534 535 536 537 538 539 $(if $(VBOX_WITH_PYTHON), \540 541 542 543 544 545 $(if $(VBOX_WITH_JXPCOM), \546 534 archive/plugins/platforms \ 535 archive/plugins/platformthemes \ 536 archive/plugins/sqldrivers \ 537 archive/plugins/styles \ 538 archive/plugins/xcbglintegrations,) \ 539 $(if $(VBOX_WITH_PYTHON), \ 540 archive/sdk/installer \ 541 archive/sdk/installer/vboxapi \ 542 archive/sdk/bindings/xpcom/python/xpcom \ 543 archive/sdk/bindings/xpcom/python/xpcom/client \ 544 archive/sdk/bindings/xpcom/python/xpcom/server,) \ 545 $(if $(VBOX_WITH_JXPCOM), \ 546 archive/sdk/bindings/xpcom/java,) \ 547 547 $(if $(and $(VBOX_WITH_EXTPACK_VNC),$(VBOX_WITHOUT_EXTPACK_VNC_PACKING)), \ 548 549 548 archive/ExtensionPacks/VNC \ 549 archive/ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),) \ 550 550 archive/additions \ 551 551 $(if-expr defined(VBOX_UNATTENDED_TEMPLATES),archive/UnattendedTemplates,) \ 552 552 install \ 553 $(if $(VBOX_WITH_DTRACE),\554 555 556 557 558 559 560 ,$(VBOX_LNX_INST_OUT_DIR)/$(d)/)553 $(if $(VBOX_WITH_DTRACE), \ 554 archive/dtrace \ 555 archive/dtrace/lib \ 556 archive/dtrace/lib/$(KBUILD_TARGET_ARCH) \ 557 archive/dtrace/testcase/ \ 558 archive/dtrace/testcase/$(KBUILD_TARGET_ARCH) \ 559 archive/dtrace/scripts,) \ 560 ,$(VBOX_LNX_INST_OUT_DIR)/$(d)/) 561 561 562 562 … … 565 565 # 566 566 $(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2: \ 567 $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/, \568 567 $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/, \ 568 $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN)) 569 569 $(call MSG_L1,Packing $@) 570 570 $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@) … … 587 587 588 588 # rules for creating directories in archive-dbg (the pattern rules depends on these). 589 BLDDIRS += $(foreach d, \589 BLDDIRS += $(foreach d, \ 590 590 $(VBOX_LNX_DBG_PATH) \ 591 591 $(VBOX_LNX_DBG_PATH)/components \ 592 ,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(d)/)592 ,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(d)/) 593 593 594 594 include $(FILE_KBUILD_SUB_FOOTER) -
trunk/src/VBox/Installer/solaris/Makefile.kmk
r98128 r98429 30 30 31 31 ifneq ($(KBUILD_HOST),solaris) 32 $(error "The Solaris installer can only be built on Solaris!") # yeah, right.32 $(error "The Solaris installer can only be built on Solaris!") # yeah, right. 33 33 endif 34 34 … … 138 138 solaris-icons_INST = bin/icons/ 139 139 solaris-icons_MODE = a+r,u+w 140 solaris-icons_SOURCES = $(foreach f,$(VBOX_SI_ICON_TYPES), $(foreach s,$(VBOX_SI_ICON_SIZES) \140 solaris-icons_SOURCES = $(foreach f,$(VBOX_SI_ICON_TYPES), $(foreach s,$(VBOX_SI_ICON_SIZES) \ 141 141 ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)) 142 142 … … 356 356 VBoxHostChannel.so \ 357 357 $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \ 358 $(if $(VBOX_WITH_QTGUI), \359 358 $(if $(VBOX_WITH_QTGUI), \ 359 VBoxKeyboard.so) \ 360 360 $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,) \ 361 361 components/VBoxC.so \ … … 373 373 ifdef VBOX_WITH_32_ON_64_MAIN_API 374 374 SOLARIS_STRIP_BINS += \ 375 VBoxRT-x86.so \376 VBoxXPCOM-x86.so \377 components/VBoxClient-x86.so \378 components/VBoxSVCM-x86.so \379 components/VBoxXPCOMIPCC-x86.so375 VBoxRT-x86.so \ 376 VBoxXPCOM-x86.so \ 377 components/VBoxClient-x86.so \ 378 components/VBoxSVCM-x86.so \ 379 components/VBoxXPCOMIPCC-x86.so 380 380 endif 381 381 ifdef VBOX_WITH_HARDENING 382 382 SOLARIS_STRIP_BINS += \ 383 VBoxNetDHCP.so \384 VBoxNetNAT.so \385 $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \386 $(if $(VBOX_WITH_QTGUI),VirtualBoxVM.so UICommon.so,)383 VBoxNetDHCP.so \ 384 VBoxNetNAT.so \ 385 $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \ 386 $(if $(VBOX_WITH_QTGUI),VirtualBoxVM.so UICommon.so,) 387 387 endif 388 388 … … 400 400 VMMR0.r0 401 401 ifdef VBOX_WITH_RAW_MODE 402 SOLARIS_STRIP_OBJS += \403 VBoxDDRC.rc \404 VMMRC.rc402 SOLARIS_STRIP_OBJS += \ 403 VBoxDDRC.rc \ 404 VMMRC.rc 405 405 endif 406 406 … … 441 441 ifdef VBOX_WITH_DOCS_PACKING 442 442 SOLARIS_COMMON += \ 443 $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \444 $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \445 UserManual.pdf \446 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \447 448 449 443 $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \ 444 $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \ 445 UserManual.pdf \ 446 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \ 447 $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox_$(f).chm,) \ 448 $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \ 449 UserManual_$(f).pdf) 450 450 endif 451 451 … … 453 453 ifdef VBOX_WITH_PYTHON 454 454 SOLARIS_COMMON += \ 455 $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \456 $(VBOXINST_SDK_INSTALLER_PYTHON_FILES)455 $(VBOXINST_SDK_BINDINGS_XPCOM_PYTHON_FILES) \ 456 $(VBOXINST_SDK_INSTALLER_PYTHON_FILES) 457 457 ifeq ($(KBUILD_TARGET_ARCH),amd64) 458 458 SOLARIS_PYTHON_32_ON_64_BINS = $(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*_x86.so)) … … 497 497 # Guest Additions 498 498 ifdef VBOX_WITH_ADDITIONS_PACKING 499 # SOLARIS_COMMON += \500 # additions/VBoxGuestAdditions.iso499 # SOLARIS_COMMON += \ 500 # additions/VBoxGuestAdditions.iso 501 501 endif 502 502 … … 505 505 ifdef VBOX_WITH_EFIFW_PACKING 506 506 SOLARIS_COMMON += \ 507 VBoxEFI32.fd \508 VBoxEFI64.fd507 VBoxEFI32.fd \ 508 VBoxEFI64.fd 509 509 endif 510 510 … … 552 552 \ 553 553 $(foreach size, $(VBOX_SI_ICON_SIZES), $(foreach type, $(VBOX_SI_ICON_TYPES) \ 554 ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(type)-$(size)px.png)) \554 ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(type)-$(size)px.png)) \ 555 555 \ 556 556 $(VBOX_SI_DEP_ON_MAKEFILE) \ -
trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk
r98257 r98429 52 52 ifdef VBOX_WITH_NETFLT 53 53 VBoxInstallHelper_LIBS += \ 54 $(PATH_STAGE_LIB)/WinNetConfigSharedStatic.lib \55 $(PATH_STAGE_LIB)/VBoxDrvCfgSharedStatic.lib \54 $(PATH_STAGE_LIB)/WinNetConfigSharedStatic.lib \ 55 $(PATH_STAGE_LIB)/VBoxDrvCfgSharedStatic.lib \ 56 56 $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \ 57 57 $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib -
trunk/src/VBox/Installer/win/Makefile.kmk
r98302 r98429 189 189 # 190 190 ifdef VBOX_WITH_COMBINED_PACKAGE 191 VBOX_INSTALLER_COMMON_DISKID:= 2191 VBOX_INSTALLER_COMMON_DISKID := 2 192 192 else 193 VBOX_INSTALLER_COMMON_DISKID:= 1193 VBOX_INSTALLER_COMMON_DISKID := 1 194 194 endif 195 195 … … 226 226 $(VBOX_WIN_INST_REPACK_DIR)/ \ 227 227 $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \ 228 229 $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ )\228 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/ \ 229 $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ ) \ 230 230 $(VBOX_WIN_INST_OUT_DIR)/NLS/ 231 231 … … 242 242 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \ 243 243 $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \ 244 245 246 247 248 249 250 251 252 253 254 255 256 $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/License_$(lang).wxl )\244 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \ 245 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \ 246 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst \ 247 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).wixpdb \ 248 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).msi \ 249 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix \ 250 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \ 251 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep \ 252 $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix \ 253 $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files \ 254 $(VBOX_WIN_INST_REPACK_DIR)/2-link-$(PACKAGE_NAME_LANG).cmd \ 255 $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/Language_$(lang).wxl \ 256 $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/License_$(lang).wxl ) \ 257 257 $(VBOX_WIN_INST_OUT_DIR)/DirComponentsAndFiles_DTrace.wxi \ 258 258 $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \ … … 276 276 else 277 277 OTHER_CLEAN += \ 278 279 $(PACKAGE_NAME_FINAL)278 $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd \ 279 $(PACKAGE_NAME_FINAL) 280 280 endif 281 281 282 282 ifdef VBOX_WITH_MSM_INSTALL 283 283 OTHER_CLEAN += \ 284 285 286 287 288 289 290 291 292 BLDDIRS+= $foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \293 284 $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \ 285 $(foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \ 286 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm \ 287 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \ 288 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj.dep \ 289 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixpdb \ 290 $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix \ 291 $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).files) 292 BLDDIRS += $foreach lang,$(VBOX_INSTALLER_MERGE_LANGUAGES), \ 293 $(VBOX_WIN_INST_REPACK_DIR)/files-VBoxMerge$(module)_$(lang)/) 294 294 endif 295 295 … … 315 315 # 316 316 define def_vbox_lang_xml 317 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl: $(VBOX_PATH_WIN_INST_SRC)/NLS/$(lang).wxl | $$$$(dir $$$$@)317 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl: $(VBOX_PATH_WIN_INST_SRC)/NLS/$(lang).wxl | $$$$(dir $$$$@) 318 318 $$(call MSG_GENERATE,,$$@,$$<) 319 319 $(QUIET)$(INSTALL) -m 0644 $$< $$@ … … 338 338 # 339 339 define def_vbox_license_xml 340 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl: $(license_file) $(VBOX_WIN_INST_MAKEFILE_DEP) | $$$$(dir $$$$@)340 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl: $(license_file) $(VBOX_WIN_INST_MAKEFILE_DEP) | $$$$(dir $$$$@) 341 341 $$(call MSG_GENERATE,,$$@,$$<) 342 342 $(APPEND) -t $$@ '<?xml version="1.0" encoding="utf-8"?>' … … 487 487 # 488 488 define def_vbox_link_msi 489 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).msi \490 $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL), + $(VBOX_WIN_INST_OUT_DIR)/common.cab,): \491 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \492 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \493 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \494 $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \495 $(VBOX_SVN_REV_KMK) \496 $(VBOX_WIN_INST_MAKEFILE_DEP) \497 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHack.dll,) \498 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \499 | $$$$(dir $$$$@)489 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(PACKAGE_NAME_LANG)_$(lang).msi \ 490 $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL), + $(VBOX_WIN_INST_OUT_DIR)/common.cab,): \ 491 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \ 492 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \ 493 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \ 494 $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \ 495 $(VBOX_SVN_REV_KMK) \ 496 $(VBOX_WIN_INST_MAKEFILE_DEP) \ 497 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHack.dll,) \ 498 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \ 499 | $$$$(dir $$$$@) 500 500 $$(call MSG_L1,Linking installer $$@) 501 501 $(QUIET)$(RM) -f $$(wildcard $$(subst r$$(VBOX_SVN_REV),r*,\ … … 514 514 $$< \ 515 515 $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib 516 if defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL)516 if defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL) 517 517 $(MV) -f -- $$(@D)/common.cab $$(@D)/../common.cab 518 endif519 ifeq ($(lang),en_US)518 endif 519 ifeq ($(lang),en_US) 520 520 $(CP) -f -- "$(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl" "$(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl" \ 521 521 "$(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/" 522 # Create repack script for this step.522 # Create repack script for this step. 523 523 $(APPEND) -tn "$$(VBOX_WIN_INST_REPACK_DIR)/2-link-$$(PACKAGE_NAME_LANG).cmd" \ 524 524 'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \ … … 540 540 $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL),'@echo Created: common.cab',) 541 541 542 endif542 endif 543 543 endef 544 544 … … 553 553 # 554 554 define def_vbox_link_msm 555 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm: \556 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \557 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \558 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \559 $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \560 $(VBOX_SVN_REV_KMK) \561 $(VBOX_WIN_INST_MAKEFILE_DEP) \562 | $$$$(dir $$$$@)555 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm: \ 556 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \ 557 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \ 558 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \ 559 $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \ 560 $(VBOX_SVN_REV_KMK) \ 561 $(VBOX_WIN_INST_MAKEFILE_DEP) \ 562 | $$$$(dir $$$$@) 563 563 $$(call MSG_L1,Linking installer $$@) 564 564 $(QUIET)$(RM) -f $$(wildcard $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_BASE)-r*_$(lang).msi) … … 574 574 $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst 575 575 $(call VBOX_SIGN_MSM_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing) 576 # Create repack script for this step.576 # Create repack script for this step. 577 577 $(APPEND) -tn "$$(VBOX_WIN_INST_REPACK_DIR)/2-link-VBoxMerge$(module)_$(lang).cmd" \ 578 578 'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \ … … 605 605 ifdef VBOX_WITH_COMBINED_PACKAGE 606 606 VBOX_MSI_DEPENDENCIES := \ 607 $(if $(VBOX_WITH_ADDITIONS_PACKING),$(PATH_MULTIARCH_GUEST_ADDITIONS_ISO)/VBoxGuestAdditions.iso)607 $(if $(VBOX_WITH_ADDITIONS_PACKING),$(PATH_MULTIARCH_GUEST_ADDITIONS_ISO)/VBoxGuestAdditions.iso) 608 608 else 609 609 VBOX_MSI_DEPENDENCIES := \ 610 $(if $(VBOX_WITH_ADDITIONS_PACKING),$(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso)610 $(if $(VBOX_WITH_ADDITIONS_PACKING),$(VBOX_PATH_ADDITIONS_ISO)/VBoxGuestAdditions.iso) 611 611 endif 612 612 … … 615 615 # 616 616 $(PATH_SUB_CURRENT)/VirtualBox.wxs: \ 617 $(PATH_SUB_CURRENT)/CommonProperties.wxi \618 $(PATH_SUB_CURRENT)/Defines.wxi \619 $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi617 $(PATH_SUB_CURRENT)/CommonProperties.wxi \ 618 $(PATH_SUB_CURRENT)/Defines.wxi \ 619 $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi 620 620 621 621 $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi $(PATH_SUB_CURRENT)/VirtualBox.wxs: \ 622 $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \623 $(VBOX_WIN_INST_OUT_DIR)/DirComponentsAndFiles_DTrace.wxi \624 $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \625 $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \626 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \627 $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \628 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \629 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi622 $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \ 623 $(VBOX_WIN_INST_OUT_DIR)/DirComponentsAndFiles_DTrace.wxi \ 624 $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \ 625 $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \ 626 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \ 627 $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \ 628 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \ 629 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi 630 630 631 631 # … … 634 634 # 635 635 define def_vbox_compile_wixobj 636 includedep $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep637 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \638 + $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix \639 $(if-expr "$(lang)" != "en_US",, \640 + $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files ): \641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 $(VBOX_WIN_INST_REPACK_DIR)/ $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ )636 includedep $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep 637 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \ 638 + $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix \ 639 $(if-expr "$(lang)" != "en_US",, \ 640 + $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files ): \ 641 $(PATH_SUB_CURRENT)/VirtualBox.wxs \ 642 $(PATH_SUB_CURRENT)/UserInterface.wxi \ 643 $(if-expr defined(VBOX_WITH_MSM_INSTALL), \ 644 $(foreach module,$(VBOX_INSTALLER_MERGE_MODULES), \ 645 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang)_$(KBUILD_TARGET_ARCH).msm), \ 646 $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \ 647 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \ 648 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \ 649 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \ 650 $(if $(VBOX_WITH_CRT_PACKING),$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi,) \ 651 $(if $(VBOX_WITH_CRT_PACKING),$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi,) \ 652 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \ 653 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \ 654 $(VBOX_MSI_DEPENDENCIES)) \ 655 $(VBOX_VERSION_STAMP) \ 656 | $$$$(dir $$$$@) $(if-expr "$(lang)" != "en_US",, \ 657 $(VBOX_WIN_INST_REPACK_DIR)/ $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/ ) 658 658 $(QUIET)$(RM) -f -- "$$@" "$(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix" 659 659 $(REDIRECT) \ … … 741 741 -out $$@ 742 742 ifeq ($(lang),en_US) 743 # Copy preprocessed wix and change source paths to be relative. Stuff not in ../bin needs copying.743 # Copy preprocessed wix and change source paths to be relative. Stuff not in ../bin needs copying. 744 744 $(SED) -e 's,$(subst /,\\,$(PATH_OUT))\\bin,..\\bin,g' \ 745 745 -e 's,$(subst /,\\,$(PATH_OUT_BASE))\\win.amd64\\$(KBUILD_TYPE)\\bin,..\\..\\..\\win.amd64\\$(KBUILD_TYPE)\\bin,g' \ … … 767 767 set -xe && for file in `$(CAT_EXT) "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files"`; \ 768 768 do $(CP_EXT) -f -- "$$(DOLLAR){file}" "$(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/"; done 769 # Create repack script for this step.769 # Create repack script for this step. 770 770 $(APPEND) -tn "$(VBOX_WIN_INST_REPACK_DIR)/1-compile-VirtualBox_$(lang).cmd" \ 771 771 'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \ … … 779 779 '@echo Created: $$(@F)' 780 780 endif 781 # Generate wxi dependencies based on the sourceLineNumber references in the output. Add repack file list for cleanup.781 # Generate wxi dependencies based on the sourceLineNumber references in the output. Add repack file list for cleanup. 782 782 $(QUIET)$(APPEND) -t '[email protected]' '$$@: \' 783 783 $(QUIET)$(VBOX_XSLTPROC) $(VBOX_PATH_WIN_INST_SRC)/dep.xsl "$$@" >> "[email protected]" … … 790 790 endif 791 791 792 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)))792 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang))) 793 793 endef 794 794 … … 800 800 # 801 801 define def_vbox_compile_msm 802 includedep $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj.dep803 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \804 + $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix \805 $(if-expr "$(lang)" != "en_US",, \806 + $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix): \807 $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxs \808 $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxi \809 $(PATH_SUB_CURRENT)/VBoxMerge$(module)CA.wxi \810 $(PATH_SUB_CURRENT)/VBoxMerge$(module)Seq.wxi \811 $(PATH_SUB_CURRENT)/UserInterface.wxi \812 $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \813 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \814 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \815 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \816 $(if $(VBOX_WITH_CRT_PACKING),$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi,) \817 $(if $(VBOX_WITH_CRT_PACKING),$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi,) \818 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \819 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \820 $(VBOX_MSI_DEPENDENCIES) \821 $(VBOX_VERSION_STAMP) \822 | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/802 includedep $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj.dep 803 $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj \ 804 + $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix \ 805 $(if-expr "$(lang)" != "en_US",, \ 806 + $(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix): \ 807 $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxs \ 808 $(PATH_SUB_CURRENT)/VBoxMerge$(module).wxi \ 809 $(PATH_SUB_CURRENT)/VBoxMerge$(module)CA.wxi \ 810 $(PATH_SUB_CURRENT)/VBoxMerge$(module)Seq.wxi \ 811 $(PATH_SUB_CURRENT)/UserInterface.wxi \ 812 $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \ 813 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \ 814 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \ 815 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \ 816 $(if $(VBOX_WITH_CRT_PACKING),$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls.wxi,) \ 817 $(if $(VBOX_WITH_CRT_PACKING),$(VBOX_WIN_INST_OUT_DIR)/VBoxCrtDlls32.wxi,) \ 818 $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \ 819 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \ 820 $(VBOX_MSI_DEPENDENCIES) \ 821 $(VBOX_VERSION_STAMP) \ 822 | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/ 823 823 $(QUIET)$(RM) -f -- "$$@" "$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix" 824 824 $(REDIRECT) \ … … 902 902 -out $$@ 903 903 ifeq ($(lang),en_US) 904 # Copy preprocessed wix and change source paths to be relative. Stuff not in ../bin needs copying.904 # Copy preprocessed wix and change source paths to be relative. Stuff not in ../bin needs copying. 905 905 $(SED) -e 's,$(subst /,\\,$(PATH_OUT))\\bin,..\\bin,g' \ 906 906 -e 's,$(subst /,\\,$(PATH_OUT_BASE))\\win.amd64\\$(KBUILD_TYPE)\\bin,..\\..\\..\\win.amd64\\$(KBUILD_TYPE)\\bin,g' \ … … 928 928 set -xe && for file in `$(CAT_EXT) "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).files"`; \ 929 929 do $(CP_EXT) -f -- "$$(DOLLAR){file}" "$(VBOX_WIN_INST_REPACK_DIR)/files-VBoxMerge$(module)_$(lang)/"; done 930 # Create repack script for this step.930 # Create repack script for this step. 931 931 $(APPEND) -tn "$(VBOX_WIN_INST_REPACK_DIR)/1-compile-VBoxMerge$(module)_$(lang).cmd" \ 932 932 'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \ … … 940 940 '@echo Created: $$(@F)' 941 941 endif 942 # Generate wxi dependencies based on the sourceLineNumber references in the output. Add repack file list for cleanup.942 # Generate wxi dependencies based on the sourceLineNumber references in the output. Add repack file list for cleanup. 943 943 $(QUIET)$(APPEND) -t '[email protected]' '$$@: \' 944 944 $(QUIET)$(VBOX_XSLTPROC) $(VBOX_PATH_WIN_INST_SRC)/dep.xsl "$$@" >> "[email protected]" … … 951 951 endif 952 952 953 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VBoxMerge$(module)_$(lang)))953 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VBoxMerge$(module)_$(lang))) 954 954 endef 955 955 … … 1068 1068 # 1069 1069 define def_vbox_create_mst 1070 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst \1071 + $(VBOX_WIN_INST_REPACK_DIR)/$(lang).mst: \1072 $(VBOX_WIN_INST_OUT_DIR)/en_US/$(PACKAGE_NAME_LANG)_en_US.msi \1073 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \1074 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \1075 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \1076 $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \1077 $(VBOX_SVN_REV_KMK) \1078 $(VBOX_WIN_INST_MAKEFILE_DEP) \1079 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHack.dll,) \1080 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \1081 | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/1070 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst \ 1071 + $(VBOX_WIN_INST_REPACK_DIR)/$(lang).mst: \ 1072 $(VBOX_WIN_INST_OUT_DIR)/en_US/$(PACKAGE_NAME_LANG)_en_US.msi \ 1073 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj \ 1074 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \ 1075 $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \ 1076 $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \ 1077 $(VBOX_SVN_REV_KMK) \ 1078 $(VBOX_WIN_INST_MAKEFILE_DEP) \ 1079 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHack.dll,) \ 1080 $(if-expr defined(VBOX_WITH_MSI_HACK),$(MsiHack_0_OUTDIR)/MsiHackExtension.dll,) \ 1081 | $$$$(dir $$$$@) $(VBOX_WIN_INST_REPACK_DIR)/ 1082 1082 $(call MSG_L1,Creating language diff for $(lang)) 1083 1083 kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' -- $(VBOX_PATH_WIX)/light.exe -v -nologo \ … … 1156 1156 1157 1157 if defined(VBOX_WITH_COMBINED_PACKAGE) && "$(KBUILD_TARGET_ARCH)" == "x86" 1158 #1159 # Make the multi-architecture installer by calling our stub builder1160 # with both platform installers (x86 and amd64) + common cab. The common1161 # cab only is needed when we don't use merge modules. We only1162 # need to do this once; so do it on x86 only.1163 #1164 $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \1165 + $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd: \1166 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \1167 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) \1168 $(PATH_STAGE_BIN)/VBoxStub.exe \1169 $$(VBoxStubBld_1_TARGET)1158 # 1159 # Make the multi-architecture installer by calling our stub builder 1160 # with both platform installers (x86 and amd64) + common cab. The common 1161 # cab only is needed when we don't use merge modules. We only 1162 # need to do this once; so do it on x86 only. 1163 # 1164 $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \ 1165 + $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd: \ 1166 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \ 1167 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) \ 1168 $(PATH_STAGE_BIN)/VBoxStub.exe \ 1169 $$(VBoxStubBld_1_TARGET) 1170 1170 $(call MSG_L1,Building Windows combined package) 1171 1171 $(QUIET)$(RM) -f -- $(wildcard $(subst r$(VBOX_SVN_REV),r*, \ … … 1181 1181 $(VBOX_VCC_EDITBIN) /IntegrityCheck:NO $@ 1182 1182 $(call VBOX_SIGN_FILE_FN,$@) 1183 # Create repack script for this step.1183 # Create repack script for this step. 1184 1184 $(APPEND) -nt "$(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(@F).cmd" \ 1185 1185 'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \ … … 1200 1200 '@echo Created multiarch EXE: $(@F)' 1201 1201 else 1202 #1203 # We still do the installer stub thing even if we only ship 64-bit, because we've1204 # gotten used to having it around to install the certificate and such.1205 #1206 $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \1207 + $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd: \1208 $(PACKAGE_NAME_FINAL) \1209 $(PATH_STAGE_BIN)/VBoxStub.exe \1210 $$(VBoxStubBld_1_TARGET)1202 # 1203 # We still do the installer stub thing even if we only ship 64-bit, because we've 1204 # gotten used to having it around to install the certificate and such. 1205 # 1206 $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \ 1207 + $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd: \ 1208 $(PACKAGE_NAME_FINAL) \ 1209 $(PATH_STAGE_BIN)/VBoxStub.exe \ 1210 $$(VBoxStubBld_1_TARGET) 1211 1211 $(call MSG_L1,Building Windows package w/ installer stub) 1212 1212 $(QUIET)$(RM) -f -- $(wildcard $(subst r$(VBOX_SVN_REV),r*, \ … … 1219 1219 $(VBOX_VCC_EDITBIN) /IntegrityCheck:NO $@ 1220 1220 $(call VBOX_SIGN_FILE_FN,$@) 1221 # Create repack script for this step.1221 # Create repack script for this step. 1222 1222 $(APPEND) -nt "$(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(@F).cmd" \ 1223 1223 'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \ … … 1255 1255 ifdef VBOX_WITH_COMBINED_PACKAGE 1256 1256 if "$(KBUILD_TARGET_ARCH)" == "x86" 1257 RePackScripts_SOURCES += \1258 $(RePackScripts_0_OUTDIR)/Combined-1-Prepare.cmd \1259 $(RePackScripts_0_OUTDIR)/Combined-3-Repack.cmd \1260 $(RePackScripts_0_OUTDIR)/Combined-3-RepackAdditions.cmd1257 RePackScripts_SOURCES += \ 1258 $(RePackScripts_0_OUTDIR)/Combined-1-Prepare.cmd \ 1259 $(RePackScripts_0_OUTDIR)/Combined-3-Repack.cmd \ 1260 $(RePackScripts_0_OUTDIR)/Combined-3-RepackAdditions.cmd 1261 1261 endif 1262 1262 else … … 1265 1265 $(RePackScripts_0_OUTDIR)/Single-3-Repack.cmd 1266 1266 1267 ifndef VBOX_OSE1268 RePackScripts_SOURCES += \1269 $(RePackScripts_0_OUTDIR)/Single-0-All.cmd \1270 Scripts/sign-attestation.sh1271 endif1267 ifndef VBOX_OSE 1268 RePackScripts_SOURCES += \ 1269 $(RePackScripts_0_OUTDIR)/Single-0-All.cmd \ 1270 Scripts/sign-attestation.sh 1271 endif 1272 1272 1273 1273 endif … … 1283 1283 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/RepackExtPack.cmd,RepackExtPack.cmd) 1284 1284 ifdef VBOX_WITH_COMBINED_PACKAGE 1285 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd)1286 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-3-Repack.cmd,Combined-3-Repack.cmd)1287 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-3-RepackAdditions.cmd,Combined-3-RepackAdditions.cmd)1285 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd) 1286 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-3-Repack.cmd,Combined-3-Repack.cmd) 1287 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-3-RepackAdditions.cmd,Combined-3-RepackAdditions.cmd) 1288 1288 else 1289 ifndef VBOX_OSE1290 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-0-All.cmd,Single-0-All.cmd)1291 endif1292 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-1-Prepare.cmd,Single-1-Prepare.cmd)1293 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-3-Repack.cmd,Single-3-Repack.cmd)1289 ifndef VBOX_OSE 1290 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-0-All.cmd,Single-0-All.cmd) 1291 endif 1292 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-1-Prepare.cmd,Single-1-Prepare.cmd) 1293 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-3-Repack.cmd,Single-3-Repack.cmd) 1294 1294 endif 1295 1295 -
trunk/src/VBox/Installer/win/Resources/Makefile.kmk
r98103 r98429 49 49 # @todo Put this into Config.kmk? 50 50 ifdef VBOX_OSE 51 52 53 VBOX_WINDOWS_ICON_EXT_VBOX:= $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-vbox.ico54 VBOX_WINDOWS_ICON_EXT_EXTPACK:= $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-vbox-extpack.ico55 VBOX_WINDOWS_ICON_EXT_OVA:= $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-ova.ico56 VBOX_WINDOWS_ICON_EXT_OVF:= $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-ovf.ico57 VBOX_WINDOWS_ICON_EXT_VDI:= $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vdi.ico58 VBOX_WINDOWS_ICON_EXT_VMDK:= $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vmdk.ico59 VBOX_WINDOWS_ICON_EXT_VHD:= $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vhd.ico60 VBOX_WINDOWS_ICON_EXT_HDD:= $(VBOX_ARTWORK_PATH_WIN)/virtualbox-hdd.ico51 # Hack: rc.exe on OSE build boxes don't support Vista icons; so 52 # use a special icon version (without the 256x256 size) instead. 53 VBOX_WINDOWS_ICON_EXT_VBOX := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-vbox.ico 54 VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-vbox-extpack.ico 55 VBOX_WINDOWS_ICON_EXT_OVA := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-ova.ico 56 VBOX_WINDOWS_ICON_EXT_OVF := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-ovf.ico 57 VBOX_WINDOWS_ICON_EXT_VDI := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vdi.ico 58 VBOX_WINDOWS_ICON_EXT_VMDK := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vmdk.ico 59 VBOX_WINDOWS_ICON_EXT_VHD := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vhd.ico 60 VBOX_WINDOWS_ICON_EXT_HDD := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-hdd.ico 61 61 else 62 VBOX_WINDOWS_ICON_EXT_VBOX:= $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-vbox.ico63 VBOX_WINDOWS_ICON_EXT_EXTPACK:= $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-vbox-extpack.ico64 VBOX_WINDOWS_ICON_EXT_OVA:= $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-ova.ico65 VBOX_WINDOWS_ICON_EXT_OVF:= $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-ovf.ico66 VBOX_WINDOWS_ICON_EXT_VDI:= $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vdi.ico67 VBOX_WINDOWS_ICON_EXT_VMDK:= $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vmdk.ico68 VBOX_WINDOWS_ICON_EXT_VHD:= $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vhd.ico69 VBOX_WINDOWS_ICON_EXT_HDD:= $(VBOX_ARTWORK_PATH_WIN)/virtualbox-hdd.ico62 VBOX_WINDOWS_ICON_EXT_VBOX := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-vbox.ico 63 VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-vbox-extpack.ico 64 VBOX_WINDOWS_ICON_EXT_OVA := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-ova.ico 65 VBOX_WINDOWS_ICON_EXT_OVF := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-ovf.ico 66 VBOX_WINDOWS_ICON_EXT_VDI := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vdi.ico 67 VBOX_WINDOWS_ICON_EXT_VMDK := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vmdk.ico 68 VBOX_WINDOWS_ICON_EXT_VHD := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vhd.ico 69 VBOX_WINDOWS_ICON_EXT_HDD := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-hdd.ico 70 70 endif 71 71 -
trunk/src/VBox/Installer/win/Stub/Makefile.kmk
r98256 r98429 78 78 endif 79 79 80 $$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h: 80 $$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h: | $$(dir $$@) $(VBOX_RTSIGNTOOL) $(VBOX_BIN2C) $(PATH_STAGE_SYS)/VBoxSup.sys 81 81 $(RM) -f -- "$@" "[email protected]" "[email protected]" "[email protected]" "[email protected]" 82 82 -
trunk/src/VBox/Installer/win/StubBld/Makefile.kmk
r98103 r98429 31 31 # Not a build program as it is needed for repacking after we Get the MS driver blessing. 32 32 PROGRAMS += VBoxStubBld 33 VBoxStubBld_TEMPLATE = VBoxBldProg33 VBoxStubBld_TEMPLATE = VBoxBldProg 34 34 VBoxStubBld_DEFS = _WIN32_WINNT=0x0400 VBOX_SVN_REV=$(VBOX_SVN_REV) $(VBOX_SVN_REV_KMK) 35 35 VBoxStubBld_SOURCES = VBoxStubBld.cpp
Note:
See TracChangeset
for help on using the changeset viewer.
