Changeset 77301 in vbox

Timestamp:

Feb 13, 2019 2:16:57 PM (6 years ago)

Author:

vboxsync

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

128821

Message:

Installer/win: Added repacking support for the MSM packages

File:

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

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

@@ -435 +435 @@
         $(CP) -f -- "$(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl" "$(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl" \
         "$(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/"
+# Create repack script for this step.
         $(APPEND) -tn "$$(VBOX_WIN_INST_REPACK_DIR)/2-link-$$(PACKAGE_NAME_LANG).cmd" \
         'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
@@ -489 +490 @@
         $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
         $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
-## @todo repack script and files
+# Create repack script for this step.
+        $(APPEND) -tn "$$(VBOX_WIN_INST_REPACK_DIR)/2-link-VBoxMerge$(module)_$(lang).cmd" \
+        'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
+                $(subst $(KBUILD_DEVTOOLS),%KBUILD_DEVTOOLS%,\
+                '$(VBOX_PATH_WIX)/light.exe -v -nologo ^' \
+                '  -loc files-VirtualBox_$(lang)/Language_$(lang).wxl ^' \
+                '  -loc files-VirtualBox_$(lang)/License_$(lang).wxl ^' \
+                '  -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll ^' \
+                '  $(VBOX_MSI_ICE_IGNORE) ^' \
+                '  -out $$(@F) ^' \
+                '  $$(<F) ^' \
+                '  $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib ^' \
+               '  || exit /b1' \
+                'call sign-sha1.cmd $(@F) || exit /b1' \
+               ) \
+               '@echo Created MSM module: $$(@F)' \
 endef
 
@@ -789 +805 @@
         set -xe && for file in  `$(CAT_EXT) "$(VBOX_WIN_INST_REPACK_DIR)/VBoxMerge$(module)_$(lang).files"`; \
                 do $(CP_EXT) -f -- "$$(DOLLAR){file}" "$(VBOX_WIN_INST_REPACK_DIR)/files-VBoxMerge$(module)_$(lang)/"; done
-## @todo repack script
+# Create repack script for this step.
+        $(APPEND) -tn "$(VBOX_WIN_INST_REPACK_DIR)/1-compile-VBoxMerge$(module)_$(lang).cmd" \
+        'if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & exit /b1)' \
+                $(subst $(KBUILD_DEVTOOLS),%KBUILD_DEVTOOLS%,\
+                '$(VBOX_PATH_WIX)/candle.exe VBoxMerge$(module)$(lang).wix ^' \
+                '  -ext $(VBOX_PATH_WIX)/WixUIExtension.dll ^'\
+                '  -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll ^' \
+                '  -out $$(@F) || exit /b1' \
+               ) \
+               '@echo Created: $$(@F)'
  endif
 # Generate wxi dependencies based on the sourceLineNumber references in the output.