Changeset 57112 in vbox for trunk/src/VBox/Installer

Timestamp:

Jul 29, 2015 9:43:26 AM (9 years ago)

Author:

vboxsync

Message:

merge VBox/Resources into VBox/Artwork

Location:

trunk/src/VBox/Installer

Files:

• linux/Makefile.kmk (modified) (2 diffs)
• solaris/Makefile.kmk (modified) (4 diffs)
• win/Resources/Makefile.kmk (modified) (2 diffs)

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

@@ -329 +329 @@
 # Icons
 VBOX_MIME_ICONS = \
-        $(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
+        $(addprefix $(PATH_ROOT)/src/VBox/Artwork/other/,\
             $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
                 $(foreach s,16 20 24 32 48 64 72 96 128 256,\
@@ -335 +335 @@
 
 VBOX_DESKTOP_ICONS = \
-        $(addprefix $(PATH_ROOT)/src/VBox/Resources/$(if $(VBOX_OSE),OSE,NonOSE)/,\
+        $(addprefix $(PATH_ROOT)/src/VBox/Artwork/$(if $(VBOX_OSE),OSE,NonOSE)/,\
             $(foreach s,16 20 32 40 48 64 128,\
                 virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png) \

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

@@ -89 +89 @@
         $(VBOX_BRAND_LICENSE_TXT)=>LICENSE \
         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_64px.png=>VBox.png \
-        $(PATH_ROOT)/src/VBox/Resources/$(if $(VBOX_OSE),OSE,NonOSE)/virtualbox-128px.png=>virtualbox.png
+        $(PATH_ROOT)/src/VBox/Artwork/$(if $(VBOX_OSE),OSE,NonOSE)/virtualbox-128px.png=>virtualbox.png
 
 solaris-bin_INST = bin/
@@ -115 +115 @@
 solaris-icons_MODE = a+r,u+w
 solaris-icons_SOURCES = $(foreach f,$(VBOX_SI_ICON_TYPES), $(foreach s,$(VBOX_SI_ICON_SIZES)\
-        ,$(PATH_ROOT)/src/VBox/Resources/other/virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png))
+        ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png))
 
 
@@ -547 +547 @@
                 \
                 $(foreach size, $(VBOX_SI_ICON_SIZES), $(foreach type, $(VBOX_SI_ICON_TYPES) \
-                ,$(PATH_ROOT)/src/VBox/Resources/other/virtualbox-$(type)-$(size)px.png)) \
+                ,$(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(type)-$(size)px.png)) \
                 \
                 $(VBOX_SI_DEP_ON_MAKEFILE) \
@@ -646 +646 @@
         $(foreach size, $(VBOX_SI_ICON_SIZES), $(foreach type, $(VBOX_SI_ICON_TYPES) \
                 ,$(NLTAB)$(INSTALL) -m 0644 \
-                        $(PATH_ROOT)/src/VBox/Resources/other/virtualbox-$(type)-$(size)px.png \
+                        $(PATH_ROOT)/src/VBox/Artwork/other/virtualbox-$(type)-$(size)px.png \
                         $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/icons/hicolor/$(size)x$(size)/mimetypes/virtualbox-$(type).png))
 

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

@@ -32 +32 @@
 
 # The resource path.
-VBOX_RESOURCES_PATH_WIN := $(subst /,\\,$(PATH_ROOT))/src/VBox/Resources/win
+VBOX_ARTWORK_PATH_WIN := $(subst /,\\,$(PATH_ROOT))/src/VBox/Artwork/win
 
 # Icon include file.
@@ -39 +39 @@
   # Hack: rc.exe on OSE build boxes don't support Vista icons; so
   # use a special icon version (without the 256x256 size) instead.
-  VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-vbox.ico
-  VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-vbox-extpack.ico
-  VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-ova.ico
-  VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_RESOURCES_PATH_WIN)/OSE/virtualbox-ovf.ico
-  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vdi.ico
-  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vmdk.ico
-  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vhd.ico
-  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-hdd.ico
+  VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-vbox.ico
+  VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-vbox-extpack.ico
+  VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-ova.ico
+  VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_ARTWORK_PATH_WIN)/OSE/virtualbox-ovf.ico
+  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vdi.ico
+  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vmdk.ico
+  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vhd.ico
+  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-hdd.ico
 else
-  VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vbox.ico
-  VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vbox-extpack.ico
-  VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-ova.ico
-  VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-ovf.ico
-  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vdi.ico
-  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vmdk.ico
-  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-vhd.ico
-  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_RESOURCES_PATH_WIN)/virtualbox-hdd.ico
+  VBOX_WINDOWS_ICON_EXT_VBOX    := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-vbox.ico
+  VBOX_WINDOWS_ICON_EXT_EXTPACK := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-vbox-extpack.ico
+  VBOX_WINDOWS_ICON_EXT_OVA     := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-ova.ico
+  VBOX_WINDOWS_ICON_EXT_OVF     := $(VBOX_ARTWORK_PATH_WIN)/NonOSE/virtualbox-ovf.ico
+  VBOX_WINDOWS_ICON_EXT_VDI     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vdi.ico
+  VBOX_WINDOWS_ICON_EXT_VMDK    := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vmdk.ico
+  VBOX_WINDOWS_ICON_EXT_VHD     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-vhd.ico
+  VBOX_WINDOWS_ICON_EXT_HDD     := $(VBOX_ARTWORK_PATH_WIN)/virtualbox-hdd.ico
 endif