Changeset 80819 in vbox

Timestamp:

Sep 16, 2019 11:22:29 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133388

Message:

Installer/win: Hopefully last fixes (the copying was still done, and step 4 used the full path of the MSI file instead of just the filename), plus a bit of grammar.

Location:

trunk/src/VBox/Installer/win

Files:

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

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

@@ -995 +995 @@
                 'call sign-sha1.cmd $(@F) || exit /b1' \
                 ) ) \
-        $(if VBOX_WITH_COMBINED_PACKAGE,'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1',) \
-                '@echo Create multilanguage MSI: $(notdir $(PACKAGE_NAME_FINAL))'
+        $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1',) \
+                '@echo Created multilanguage MSI: $(notdir $(PACKAGE_NAME_FINAL))'
 
 # Copy multilingual installer to bin.
@@ -1047 +1047 @@
                 'call sign-dual.cmd $(@F) || exit /b1' \
                 ) ) \
-                '@echo Create multiarch EXE: $(@F)'
+                '@echo Created multiarch EXE: $(@F)'
 else
 #
@@ -1075 +1075 @@
                 '..\bin\VBoxStubBld.exe ^' \
                 '  -out $(@F) ^' \
-                '  -target-$(KBUILD_TARGET_ARCH) $(PACKAGE_NAME_FINAL) ^' \
+                '  -target-$(KBUILD_TARGET_ARCH) $(notdir $(PACKAGE_NAME_FINAL)) ^' \
                 '  -stub ../bin/VBoxStub.exe || exit /b1' \
                 '$(VBOX_VCC_EDITBIN) /IntegrityCheck:NO $(@F) || exit /b1' \
                 'call sign-dual.cmd $(@F) || exit /b1' \
                 ) ) \
-                '@echo Create multiarch EXE: $(@F)'
+                '@echo Created multiarch EXE: $(@F)'
 endif
 

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

@@ -33 +33 @@
 rem Parse arguments.
 rem
-set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\..\..\
+set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\
 for %%i in (%_MY_OPT_UNTAR_DIR%) do set _MY_OPT_UNTAR_DIR=%%~fi
 set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack