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

Timestamp:

Sep 13, 2019 10:20:38 AM (5 years ago)

Author:

vboxsync

Message:

Installer/win: forgotten Makefile.kmk change for repacking single builds

File:

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

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

@@ -1103 +1103 @@
         $(RePackScripts_0_OUTDIR)/RepackExtPack.cmd
 endif
-if defined(VBOX_WITH_COMBINED_PACKAGE) && "$(KBUILD_TARGET_ARCH)" == "x86"
+ifdef VBOX_WITH_COMBINED_PACKAGE
+ if "$(KBUILD_TARGET_ARCH)" == "x86"
  RePackScripts_SOURCES += \
         $(RePackScripts_0_OUTDIR)/Combined-1-Prepare.cmd \
         $(RePackScripts_0_OUTDIR)/Combined-3-Repack.cmd
+ endif
+else
+ RePackScripts_SOURCES += \
+        $(RePackScripts_0_OUTDIR)/Single-1-Prepare.cmd \
+        $(RePackScripts_0_OUTDIR)/Single-3-Repack.cmd
 endif
 RePackScripts_CLEAN = \
@@ -1118 +1124 @@
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/PackDriversForSubmission.cmd,PackDriversForSubmission.cmd)
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/RepackExtPack.cmd,RepackExtPack.cmd)
+ifdef VBOX_WITH_COMBINED_PACKAGE
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd)
 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-3-Repack.cmd,Combined-3-Repack.cmd)
+else
+$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-1-Prepare.cmd,Single-1-Prepare.cmd)
+$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Single-3-Repack.cmd,Single-3-Repack.cmd)
+endif
 
 $$(RePackScripts_0_OUTDIR)/sign-dual.cmd: | $$(dir $$@)