VirtualBox

Changeset 98429 in vbox for trunk/src/VBox/Installer/win


Ignore:
Timestamp:
Feb 2, 2023 12:03:46 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
155676
Message:

Installer/*.kmk: Automatic scm cleanups. bugref:10348

Location:
trunk/src/VBox/Installer/win
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

    r98257 r98429  
    5252ifdef VBOX_WITH_NETFLT
    5353 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 \
    5656        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
    5757        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib

  • trunk/src/VBox/Installer/win/Makefile.kmk

    r98302 r98429  
    189189#
    190190ifdef VBOX_WITH_COMBINED_PACKAGE
    191   VBOX_INSTALLER_COMMON_DISKID := 2
     191 VBOX_INSTALLER_COMMON_DISKID := 2
    192192else
    193   VBOX_INSTALLER_COMMON_DISKID := 1
     193 VBOX_INSTALLER_COMMON_DISKID := 1
    194194endif
    195195
    … …  
    226226        $(VBOX_WIN_INST_REPACK_DIR)/ \
    227227        $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
    228                 $(VBOX_WIN_INST_OUT_DIR)/$(lang)/ \
    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)/ ) \
    230230        $(VBOX_WIN_INST_OUT_DIR)/NLS/
    231231
    … …  
    242242        $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
    243243        $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
    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 )\
     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 ) \
    257257        $(VBOX_WIN_INST_OUT_DIR)/DirComponentsAndFiles_DTrace.wxi \
    258258        $(VBOX_WIN_INST_OUT_DIR)/Files_Main.wxi \
    … …  
    276276else
    277277 OTHER_CLEAN += \
    278         $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd \
    279         $(PACKAGE_NAME_FINAL)
     278        $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd \
     279        $(PACKAGE_NAME_FINAL)
    280280endif
    281281
    282282ifdef VBOX_WITH_MSM_INSTALL
    283283 OTHER_CLEAN += \
    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)/)
     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)/)
    294294endif
    295295
    … …  
    315315#
    316316define 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 $$$$@)
    318318        $$(call MSG_GENERATE,,$$@,$$<)
    319319        $(QUIET)$(INSTALL) -m 0644 $$< $$@
    … …  
    338338#
    339339define 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 $$$$@)
    341341        $$(call MSG_GENERATE,,$$@,$$<)
    342342        $(APPEND) -t $$@ '<?xml version="1.0" encoding="utf-8"?>'
    … …  
    487487#
    488488define 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 $$$$@)
    500500        $$(call MSG_L1,Linking installer $$@)
    501501        $(QUIET)$(RM) -f $$(wildcard $$(subst r$$(VBOX_SVN_REV),r*,\
    … …  
    514514                $$< \
    515515                $(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)
    517517        $(MV) -f -- $$(@D)/common.cab $$(@D)/../common.cab
    518 endif
    519 ifeq ($(lang),en_US)
     518 endif
     519 ifeq ($(lang),en_US)
    520520        $(CP) -f -- "$(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl" "$(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl" \
    521521        "$(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/"
    522 # Create repack script for this step.
     522  # Create repack script for this step.
    523523        $(APPEND) -tn "$$(VBOX_WIN_INST_REPACK_DIR)/2-link-$$(PACKAGE_NAME_LANG).cmd" \
    524524        'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
    … …  
    540540                $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE) && !defined(VBOX_WITH_MSM_INSTALL),'@echo Created: common.cab',)
    541541
    542 endif
     542 endif
    543543endef
    544544
    … …  
    553553#
    554554define 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 $$$$@)
    563563        $$(call MSG_L1,Linking installer $$@)
    564564        $(QUIET)$(RM) -f $$(wildcard $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_BASE)-r*_$(lang).msi)
    … …  
    574574        $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
    575575        $(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.
    577577        $(APPEND) -tn "$$(VBOX_WIN_INST_REPACK_DIR)/2-link-VBoxMerge$(module)_$(lang).cmd" \
    578578        'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
    … …  
    605605ifdef VBOX_WITH_COMBINED_PACKAGE
    606606 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)
    608608else
    609609 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)
    611611endif
    612612
    … …  
    615615#
    616616$(PATH_SUB_CURRENT)/VirtualBox.wxs: \
    617         $(PATH_SUB_CURRENT)/CommonProperties.wxi \
    618         $(PATH_SUB_CURRENT)/Defines.wxi \
    619         $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi
     617                $(PATH_SUB_CURRENT)/CommonProperties.wxi \
     618                $(PATH_SUB_CURRENT)/Defines.wxi \
     619                $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi
    620620
    621621$(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.wxi
     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.wxi
    630630
    631631#
    … …  
    634634#
    635635define def_vbox_compile_wixobj
    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)/ )
     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)/ )
    658658        $(QUIET)$(RM) -f -- "$$@"  "$(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).wix"
    659659        $(REDIRECT) \
    … …  
    741741                -out $$@
    742742 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.
    744744        $(SED)  -e 's,$(subst /,\\,$(PATH_OUT))\\bin,..\\bin,g' \
    745745                -e 's,$(subst /,\\,$(PATH_OUT_BASE))\\win.amd64\\$(KBUILD_TYPE)\\bin,..\\..\\..\\win.amd64\\$(KBUILD_TYPE)\\bin,g' \
    … …  
    767767        set -xe && for file in  `$(CAT_EXT) "$(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files"`; \
    768768                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.
    770770        $(APPEND) -tn "$(VBOX_WIN_INST_REPACK_DIR)/1-compile-VirtualBox_$(lang).cmd" \
    771771        'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
    … …  
    779779               '@echo Created: $$(@F)'
    780780 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.
    782782        $(QUIET)$(APPEND) -t '[email protected]' '$$@: \'
    783783        $(QUIET)$(VBOX_XSLTPROC) $(VBOX_PATH_WIN_INST_SRC)/dep.xsl "$$@" >> "[email protected]"
    … …  
    790790 endif
    791791
    792 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)))
     792 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)))
    793793endef
    794794
    … …  
    800800#
    801801define def_vbox_compile_msm
    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)/
     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)/
    823823        $(QUIET)$(RM) -f -- "$$@" "$(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wix" "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).wix"
    824824        $(REDIRECT) \
    … …  
    902902                -out $$@
    903903 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.
    905905        $(SED)  -e 's,$(subst /,\\,$(PATH_OUT))\\bin,..\\bin,g' \
    906906                -e 's,$(subst /,\\,$(PATH_OUT_BASE))\\win.amd64\\$(KBUILD_TYPE)\\bin,..\\..\\..\\win.amd64\\$(KBUILD_TYPE)\\bin,g' \
    … …  
    928928        set -xe && for file in  `$(CAT_EXT) "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).files"`; \
    929929                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.
    931931        $(APPEND) -tn "$(VBOX_WIN_INST_REPACK_DIR)/1-compile-VBoxMerge$(module)_$(lang).cmd" \
    932932        'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
    … …  
    940940               '@echo Created: $$(@F)'
    941941 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.
    943943        $(QUIET)$(APPEND) -t '[email protected]' '$$@: \'
    944944        $(QUIET)$(VBOX_XSLTPROC) $(VBOX_PATH_WIN_INST_SRC)/dep.xsl "$$@" >> "[email protected]"
    … …  
    951951 endif
    952952
    953 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VBoxMerge$(module)_$(lang)))
     953 $(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VBoxMerge$(module)_$(lang)))
    954954endef
    955955
    … …  
    10681068#
    10691069define 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)/
    10821082        $(call MSG_L1,Creating language diff for $(lang))
    10831083        kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' -- $(VBOX_PATH_WIX)/light.exe -v -nologo \
    … …  
    11561156
    11571157if defined(VBOX_WITH_COMBINED_PACKAGE) && "$(KBUILD_TARGET_ARCH)" == "x86"
    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)
     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)
    11701170        $(call MSG_L1,Building Windows combined package)
    11711171        $(QUIET)$(RM) -f -- $(wildcard $(subst r$(VBOX_SVN_REV),r*, \
    … …  
    11811181        $(VBOX_VCC_EDITBIN) /IntegrityCheck:NO $@
    11821182        $(call VBOX_SIGN_FILE_FN,$@)
    1183 # Create repack script for this step.
     1183 # Create repack script for this step.
    11841184        $(APPEND) -nt "$(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(@F).cmd" \
    11851185                'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
    … …  
    12001200                '@echo Created multiarch EXE: $(@F)'
    12011201else
    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)
     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)
    12111211        $(call MSG_L1,Building Windows package w/ installer stub)
    12121212        $(QUIET)$(RM) -f -- $(wildcard $(subst r$(VBOX_SVN_REV),r*, \
    … …  
    12191219        $(VBOX_VCC_EDITBIN) /IntegrityCheck:NO $@
    12201220        $(call VBOX_SIGN_FILE_FN,$@)
    1221 # Create repack script for this step.
     1221 # Create repack script for this step.
    12221222        $(APPEND) -nt "$(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(@F).cmd" \
    12231223                'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
    … …  
    12551255ifdef VBOX_WITH_COMBINED_PACKAGE
    12561256 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.cmd
     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.cmd
    12611261 endif
    12621262else
    … …  
    12651265        $(RePackScripts_0_OUTDIR)/Single-3-Repack.cmd
    12661266
    1267 ifndef VBOX_OSE
    1268  RePackScripts_SOURCES += \
    1269         $(RePackScripts_0_OUTDIR)/Single-0-All.cmd \
    1270         Scripts/sign-attestation.sh
    1271 endif
     1267 ifndef VBOX_OSE
     1268  RePackScripts_SOURCES += \
     1269        $(RePackScripts_0_OUTDIR)/Single-0-All.cmd \
     1270        Scripts/sign-attestation.sh
     1271 endif
    12721272
    12731273endif
    … …  
    12831283$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/RepackExtPack.cmd,RepackExtPack.cmd)
    12841284ifdef 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)
    12881288else
    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)
     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)
    12941294endif
    12951295

  • trunk/src/VBox/Installer/win/Resources/Makefile.kmk

    r98103 r98429  
    4949# @todo Put this into Config.kmk?
    5050ifdef VBOX_OSE
    51   # 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
     51 # 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
    6161else
    62   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
     62 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
    7070endif
    7171

  • trunk/src/VBox/Installer/win/Stub/Makefile.kmk

    r98256 r98429  
    7878 endif
    7979
    80  $$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h:  | $$(dir $$@) $(VBOX_RTSIGNTOOL) $(VBOX_BIN2C) $(PATH_STAGE_SYS)/VBoxSup.sys
     80 $$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h: | $$(dir $$@) $(VBOX_RTSIGNTOOL) $(VBOX_BIN2C) $(PATH_STAGE_SYS)/VBoxSup.sys
    8181        $(RM) -f -- "$@" "[email protected]" "[email protected]" "[email protected]" "[email protected]"
    8282

  • trunk/src/VBox/Installer/win/StubBld/Makefile.kmk

    r98103 r98429  
    3131# Not a build program as it is needed for repacking after we Get the MS driver blessing.
    3232PROGRAMS += VBoxStubBld
    33 VBoxStubBld_TEMPLATE= VBoxBldProg
     33VBoxStubBld_TEMPLATE = VBoxBldProg
    3434VBoxStubBld_DEFS    = _WIN32_WINNT=0x0400 VBOX_SVN_REV=$(VBOX_SVN_REV) $(VBOX_SVN_REV_KMK)
    3535VBoxStubBld_SOURCES = VBoxStubBld.cpp
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette