儲存庫 vbox 的更動 50142

時間撮記:

2014-1-21 下午04:44:29 (11 年 以前)

作者:

vboxsync

訊息:

Installer/linux and FE/Qt: move SVG icon to Resources and add it to the Linux installer.

位置:

trunk/src/VBox

檔案:

• Frontends/VirtualBox/Makefile.kmk (修改) (1 筆差異)
• Installer/linux/Makefile.kmk (修改) (1 筆差異)
• Installer/linux/install.sh (修改) (1 筆差異)
• Installer/linux/rpm/VirtualBox.tmpl.spec (修改) (1 筆差異)
• Installer/linux/scripts/install.sh (修改) (1 筆差異)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -850 +850 @@
 $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc: \
                 $(VBOX_VIRTUALBOX4_SRC)/VirtualBoxBrand.qrc \
+                $(PATH_ROOT)/Config.kmk \
                 | $$(dir $$@)
         $(call MSG_GENERATE,VirtualBox,$<,$@)

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

@@ -322 +322 @@
         $(addprefix $(PATH_ROOT)/src/VBox/Resources/$(if $(VBOX_OSE),OSE,NonOSE)/,\
             $(foreach s,16 20 32 40 48 64 128,\
-                virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png))
+                virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png) \
+                virtualbox.svg=>scalable/virtualbox.svg)
 
 #

trunk/src/VBox/Installer/linux/install.sh

@@ -424 +424 @@
         if [ -d /usr/share/icons/hicolor/$i ]; then
             for j in *; do
-                if [ "$j" = "virtualbox.png" ]; then
+                if expr "$j" : "virtualbox\..*" > /dev/null; then
                     dst=apps
                 else

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -105 +105 @@
 cd icons
   for i in *; do
-    if [ -f $i/virtualbox.png ]; then
+    if [ -f $i/virtualbox.* ]; then
       install -d $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps
-      mv $i/virtualbox.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps
+      mv $i/virtualbox.* $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps
     fi
     install -d $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/mimetypes

trunk/src/VBox/Installer/linux/scripts/install.sh

@@ -187 +187 @@
     for i in "${INSTALL_SOURCE}/icons/"*; do
         folder=`expr "${i}/" : '.*/\([^/][^/]*/\)/*'`
-        if test -f "${i}/virtualbox.png"; then
+        if test -f "${i}/virtualbox."*; then
             install -d -g 0 -o 0 "${PREFIX}/share/icons/hicolor/${folder}/apps"
-            mv "${i}/virtualbox.png" "${PREFIX}/share/icons/hicolor/${folder}/apps"
+            mv "${i}/virtualbox."* "${PREFIX}/share/icons/hicolor/${folder}/apps"
         fi
         install -d -g 0 -o 0 "${PREFIX}/share/icons/hicolor/${folder}/mimetypes"