Changeset 72020 in vbox for trunk/src/VBox/Installer/win/Makefile.kmk

Timestamp:

Apr 25, 2018 2:19:58 PM (7 years ago)

Author:

vboxsync

Message:

Installer/win: Trying to fix windows 10 detection. VersionNT stops at 603 because the microsoft buggers is running the MSI installer in 8.1 compatibilitiy mode or something similarlly stupid (go figure). Renamed Properties.wxi to Defines.wix (they're preprocessor defines, not properties) and added CommonProperties.wix for stuff like the new property that indicates whether we're installing on windows 10 (VBOX_IS_WINDOW_10). bugref:8691

File:

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

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

@@ -502 +502 @@
 #
 $(PATH_SUB_CURRENT)/VirtualBox.wxs: \
-        $(PATH_SUB_CURRENT)/Properties.wxi \
+        $(PATH_SUB_CURRENT)/CommonProperties.wxi \
+        $(PATH_SUB_CURRENT)/Defines.wxi \
         $(PATH_SUB_CURRENT)/VBoxMergeApp.wxi
 
@@ -658 +659 @@
 
 $(eval BLDDIRS += $(VBOX_WIN_INST_REPACK_DIR)/files-VirtualBox_$(lang)/)
-$(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)) $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files)
+$(eval OTHER_CLEAN += $(VBOX_REPACK_FILES_VirtualBox_$(lang)) $(VBOX_WIN_INST_REPACK_DIR)/VirtualBox_$(lang).files $(VBOX_WIN_INST_OUT_DIR)/$(lang)/VirtualBox_$(lang).wixobj.dep)
 endef
 
@@ -783 +784 @@
         $(QUIET)$(VBOX_XSLTPROC) $(VBOX_PATH_WIN_INST_SRC)/dep2.xsl "$$@" | sort  | $(SED) '$!N; /^\(.*\)\n\1$$$$/!P; D' >> "[email protected]"
         $(QUIET)$(APPEND) -n '[email protected]' '' ''
+
+$(eval OTHER_CLEAN += $(VBOX_WIN_INST_OUT_DIR)/VBoxMerge$(module)_$(lang).wixobj)
 endef
 
@@ -940 +943 @@
                 ) ) \
                'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1' \
-                '@echo Create multilanguage MSI: $(@F)'
+                '@echo Create multilanguage MSI: $(notdir $(PACKAGE_NAME_FINAL))'
 
 # Copy multilingual installer to bin.