Changeset 85720 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Aug 12, 2020 4:39:38 PM (4 years ago)

Author:

vboxsync

Message:

Artwork/win, Installer/win, FE/Qt: bugref:9641: Windows 10 start menu should now have large VirtualBox icon according to UWP rules.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (4 diffs)
• VBoxMergeApp.wxi (modified) (1 diff)

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

@@ -79 +79 @@
 endif
 
+# Paths for UWP.
+VBOX_PATH_UWP_MANIFEST     := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/src/platform/win
+ifndef VBOX_OSE
+ VBOX_PATH_UWP_ARTWORK     := $(PATH_ROOT)/src/VBox/Artwork/win/NonOSE
+else
+ VBOX_PATH_UWP_ARTWORK     := $(PATH_ROOT)/src/VBox/Artwork/win/OSE
+endif
+
 
 #
@@ -203 +211 @@
 
 OTHER_CLEAN += \
+        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox.visualelementsmanifest.xml \
+        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_70px.png \
+        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_150px.png \
         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox.wixobj \
         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox.wix \
@@ -277 +288 @@
         -ice:64 \
         -ice:69
+
+#
+# Copy XML file for UWP.
+#
+$(VBOX_WIN_INST_OUT_DIR)/VirtualBox.visualelementsmanifest.xml: $(VBOX_PATH_UWP_MANIFEST)/VirtualBox.visualelementsmanifest.xml | $$(dir $$@)
+        $(call MSG_GENERATE,,$@,$<)
+        $(QUIET)$(INSTALL) -m 0644 $< $@
+
+#
+# Copy PNG files for UWP.
+#
+$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_70px.png: $(VBOX_PATH_UWP_ARTWORK)/VirtualBox_70px.png | $$(dir $$@)
+        $(call MSG_GENERATE,,$@,$<)
+        $(QUIET)$(INSTALL) -m 0644 $< $@
+$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_150px.png: $(VBOX_PATH_UWP_ARTWORK)/VirtualBox_150px.png | $$(dir $$@)
+        $(call MSG_GENERATE,,$@,$<)
+        $(QUIET)$(INSTALL) -m 0644 $< $@
 
 #
@@ -588 +616 @@
         $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
         $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
-        $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi
+        $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
+        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox.visualelementsmanifest.xml \
+        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_70px.png \
+        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_150px.png
 
 #

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -341 +341 @@
         <File Id="file_Qt5WinExtras$(var.VBOX_QT_INFIX).dll" Name="Qt5WinExtras$(var.VBOX_QT_INFIX).dll"
               Source="$(env.PATH_OUT)\bin\Qt5WinExtras$(var.VBOX_QT_INFIX).dll" />
+        <File Id="file_VirtualBox.visualelementsmanifest.xml" Name="VirtualBox.visualelementsmanifest.xml"
+              Source="$(env.PATH_TARGET)\VirtualBox.visualelementsmanifest.xml" />
+        <File Id="file_VirtualBox_70px.png" Name="VirtualBox_70px.png"
+              Source="$(env.PATH_TARGET)\VirtualBox_70px.png" />
+        <File Id="file_VirtualBox_150px.png" Name="VirtualBox_150px.png"
+              Source="$(env.PATH_TARGET)\VirtualBox_150px.png" />
 
         <File Id="file_VBoxTestOGL.exe" Name="VBoxTestOGL.exe"