Changeset 71954 in vbox for trunk

Timestamp:

Apr 21, 2018 10:14:45 PM (7 years ago)

Author:

vboxsync

Message:

Installer/win: Added script for packing submission. bugref:8691 [build fix]

File:

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

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

@@ -964 +964 @@
         $(QUIET)$(RM) -f -- $(wildcard $(subst r$(VBOX_SVN_REV),r*, \
                 $@ \
-                $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd ))
+                $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd ) )
         $(if-expr defined(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_FILE_FN,$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
         $(REDIRECT) -C $(@D) -- \
@@ -980 +980 @@
                 $(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') \
+                ,'call sign-dual.cmd ../../../win.amd64/$(KBUILD_TYPE)/repack/$(notdir $(PACKAGE_NAME_MULTIARCH_COMMONCAB)) || exit /b1') \
                 '..\bin\VBoxStubBld.exe ^' \
                 '  -out $(@F) ^' \
@@ -989 +989 @@
                 '  -stub ../bin/VBoxStub.exe || exit /b1' \
                 '$(VBOX_VCC_EDITBIN) /IntegrityCheck:NO $(@F) || exit /b1' \
-               'call sign-dual.cmd $(@F) || exit /b1
+                'call sign-dual.cmd $(@F) || exit /b1' \
                 ) ) \
                 '@echo Create multiarch EXE: $(@F)'
@@ -1015 +1015 @@
                 'if ".%KBUILD_BIN_PATH%" == "." (echo KBUILD_BIN_PATH is not set & exit /b 1)' \
                 'if ".%1" == "." (echo No .cat file specified & exit /b 1)' \
+                $(subst $(KBUILD_BIN_PATH),%KBUILD_BIN_PATH%,$(subst $(KBUILD_DEVTOOLS),%KBUILD_DEVTOOLS%, \
                 '( $(call VBOX_SIGN_FILE_FN,%1,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,,&&) ) || exit /b1' \
+                ) )
 
 $$(RePackScripts_0_OUTDIR)/sign-sha1.cmd: | $$(dir $$@)
@@ -1022 +1024 @@
                 'if ".%KBUILD_BIN_PATH%" == "." (echo KBUILD_BIN_PATH is not set & exit /b 1)' \
                 'if ".%1" == "." (echo No .cat file specified & exit /b 1)' \
+                $(subst $(KBUILD_BIN_PATH),%KBUILD_BIN_PATH%,$(subst $(KBUILD_DEVTOOLS),%KBUILD_DEVTOOLS%, \
                 '( $(call VBOX_SIGN_FILE_FN,%1,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing,&&) ) || exit /b1' \
+                ) )
 
 include $(FILE_KBUILD_SUB_FOOTER)