Changeset 80798 in vbox for trunk/src

Timestamp:

Sep 15, 2019 6:47:28 PM (5 years ago)

Author:

vboxsync

Message:

Installer/win: no need to copy anything in the multilanguage step, and fix cleaning up

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)

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

@@ -203 +203 @@
  ifeq ($(KBUILD_TARGET_ARCH),x86)
   OTHER_CLEAN += \
-        $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(@F).cmd \
+        $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd \
         $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86)
  endif
@@ -212 +212 @@
 else
  OTHER_CLEAN += \
+        $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd \
         $(PACKAGE_NAME_FINAL)
 endif
@@ -994 +995 @@
                 'call sign-sha1.cmd $(@F) || exit /b1' \
                 ) ) \
-               'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1' \
+        $(if VBOX_WITH_COMBINED_PACKAGE,'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1',) \
                 '@echo Create multilanguage MSI: $(notdir $(PACKAGE_NAME_FINAL))'