Changeset 80799 in vbox for trunk/src

Timestamp:

Sep 15, 2019 7:44:37 PM (5 years ago)

Author:

vboxsync

Message:

Installer/win: more fixes for re-packing a single build installer

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (1 diff)
• Scripts/Single-3-Repack.cmd (modified) (1 diff)
• StubBld/Makefile.kmk (modified) (1 diff)

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

@@ -1074 +1074 @@
                 $(subst $(KBUILD_BIN_PATH),%KBUILD_BIN_PATH%,$(subst $(KBUILD_DEVTOOLS),%KBUILD_DEVTOOLS%, \
                 $(if-expr defined(VBOX_WITH_MSM_INSTALL), \
-                ,'call sign-dual.cmd ../../../win.amd64/$(KBUILD_TYPE)/repack/$(notdir $(PACKAGE_NAME_MULTIARCH_COMMONCAB)) || exit /b1') \
                 '..\bin\VBoxStubBld.exe ^' \
                 '  -out $(@F) ^' \

trunk/src/VBox/Installer/win/Scripts/Single-3-Repack.cmd

@@ -201 +201 @@
 echo .
 
+echo * Creating multi arch installer...
+for %%i in (4-*.cmd) do (call %%i || goto end_failed)
+echo .
+
 
 set _MY_OUT_FILES=

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

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+if !defined(VBOX_WITH_COMBINED_BUILD) || "$(KBUILD_TARGET_ARCH)" == "x86"
+PROGRAMS += VBoxStubBld
+else
 BLDPROGS += VBoxStubBld
+endif
 VBoxStubBld_TEMPLATE= VBoxBldProg
 VBoxStubBld_DEFS    = _WIN32_WINNT=0x0400 VBOX_SVN_REV=$(VBOX_SVN_REV) $(VBOX_SVN_REV_KMK)