[MediaWiki-commits] [Gerrit] Removed some svg-to-png inkscape build commands. - change (apps...wikipedia)

[Mhurd (Code Review)]

Mhurd has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/187060

Change subject: Removed some svg-to-png inkscape build commands.
......................................................................

Removed some svg-to-png inkscape build commands.

Now uses assets catalog vector abilities. Specifically, svgs
which have been converted to pdfs (because pdf vectors have
size info).

Change-Id: I70dde4bfe95191712708596f161b60babc1de0d1
---
M Wikipedia.xcodeproj/project.pbxproj
A scripts/copy-wmflogo-to-assets.sh
M scripts/icon-svgs-to-pngs.sh
M wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
A wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent.pdf
D wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent120.png
D wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent240.png
D wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent360.png
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
A wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages.pdf
D wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
D wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
D wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages360.png
M wikipedia/Images.xcassets/WMFLogo_60.imageset/Contents.json
A wikipedia/Images.xcassets/WMFLogo_60.imageset/wmf_logo.pdf
D wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_120.png
D wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_180.png
D wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_60.png
D wikipedia/assets/images/wmflogo_120.png
D wikipedia/assets/images/wmflogo_180.png
D wikipedia/assets/images/wmflogo_60.png
D www/images/wmflogo_120.png
D www/images/wmflogo_180.png
D www/images/wmflogo_60.png
24 files changed, 75 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/60/187060/1

diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index b034866..b8e90c5 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -1785,15 +1785,16 @@
                        isa = PBXNativeTarget;
                        buildConfigurationList = D499146A181D51DF00E6073C /* 
Build configuration list for PBXNativeTarget "Wikipedia" */;
                        buildPhases = (
-                               048702AE19F75B0800B7D307 /* ShellScript */,
+                               048702AE19F75B0800B7D307 /* run-cocoapods */,
                                D4991431181D51DE00E6073C /* Sources */,
                                D4991432181D51DE00E6073C /* Frameworks */,
-                               046F268119C387BD00D7ACB3 /* ShellScript */,
-                               04272E7619404CDF00CC682F /* ShellScript */,
-                               04272E75193FF7F000CC682F /* ShellScript */,
-                               D4C16A621970946900CD91AD /* ShellScript */,
-                               D4C16A631970949A00CD91AD /* ShellScript */,
+                               04272E7619404CDF00CC682F /* run-grunt */,
+                               04272E75193FF7F000CC682F /* make-css-assets */,
+                               D4C16A621970946900CD91AD /* 
update-storyboard-strings */,
+                               D4C16A631970949A00CD91AD /* update-qqq */,
                                D4991433181D51DE00E6073C /* Resources */,
+                               046F268119C387BD00D7ACB3 /* icon-svgs-to-pngs 
*/,
+                               04E0C2771A7750AB00FE22DA /* 
copy-wmflogo-to-assets */,
                        );
                        buildRules = (
                        );
@@ -2032,7 +2033,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-               04272E75193FF7F000CC682F /* ShellScript */ = {
+               04272E75193FF7F000CC682F /* make-css-assets */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
@@ -2040,26 +2041,28 @@
                        inputPaths = (
                                "",
                        );
+                       name = "make-css-assets";
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/bash;
                        shellScript = "scripts/make-css-assets.bash";
                };
-               04272E7619404CDF00CC682F /* ShellScript */ = {
+               04272E7619404CDF00CC682F /* run-grunt */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        inputPaths = (
                        );
+                       name = "run-grunt";
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        shellScript = "scripts/run-grunt.sh";
                };
-               046F268119C387BD00D7ACB3 /* ShellScript */ = {
+               046F268119C387BD00D7ACB3 /* icon-svgs-to-pngs */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
@@ -2070,26 +2073,42 @@
                                
"$(SRCROOT)/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages.svg",
                                
"$(SRCROOT)/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmf_logo.svg",
                        );
+                       name = "icon-svgs-to-pngs";
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        shellScript = "scripts/icon-svgs-to-pngs.sh";
                };
-               048702AE19F75B0800B7D307 /* ShellScript */ = {
+               048702AE19F75B0800B7D307 /* run-cocoapods */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        inputPaths = (
                        );
+                       name = "run-cocoapods";
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        shellScript = "#scripts/run-cocoapods.sh";
                };
-               D4C16A621970946900CD91AD /* ShellScript */ = {
+               04E0C2771A7750AB00FE22DA /* copy-wmflogo-to-assets */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "copy-wmflogo-to-assets";
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "scripts/copy-wmflogo-to-assets.sh";
+               };
+               D4C16A621970946900CD91AD /* update-storyboard-strings */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
@@ -2097,6 +2116,7 @@
                        inputPaths = (
                                
"$(SRCROOT)/wikipedia/Base.lproj/Main_iPhone.storyboard",
                        );
+                       name = "update-storyboard-strings";
                        outputPaths = (
                                
"$(SRCROOT)/wikipedia/en.lproj/Main_iPhone.strings",
                        );
@@ -2104,7 +2124,7 @@
                        shellPath = /bin/sh;
                        shellScript = "scripts/update-storyboard-strings.php";
                };
-               D4C16A631970949A00CD91AD /* ShellScript */ = {
+               D4C16A631970949A00CD91AD /* update-qqq */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
@@ -2114,6 +2134,7 @@
                                
"$(SRCROOT)/wikipedia/en.lproj/InfoPlist.strings",
                                
"$(SRCROOT)/wikipedia/en.lproj/Localizable.strings",
                        );
+                       name = "update-qqq";
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
diff --git a/scripts/copy-wmflogo-to-assets.sh 
b/scripts/copy-wmflogo-to-assets.sh
new file mode 100755
index 0000000..96cdaab
--- /dev/null
+++ b/scripts/copy-wmflogo-to-assets.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# When Images.xcassets is compiled it creates 3 pngs from wmf_logo.pdf
+# This script copies those files to the "assets/images/" folder
+
+target_path="${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/"
+assets_path="${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/assets/images/"
+
+cp -v $target_path"WMFLogo_60.png" $assets_path"wmflogo_60.png"
+cp -v $target_path"wmflogo...@2x.png" $assets_path"wmflogo_120.png"
+cp -v $target_path"wmflogo...@3x.png" $assets_path"wmflogo_180.png"
\ No newline at end of file
diff --git a/scripts/icon-svgs-to-pngs.sh b/scripts/icon-svgs-to-pngs.sh
index 6c6fca9..7277ddc 100755
--- a/scripts/icon-svgs-to-pngs.sh
+++ b/scripts/icon-svgs-to-pngs.sh
@@ -3,11 +3,3 @@
 ruby -e '[29,40,50,57,58,72,76,80,87,100,114,120,144,152,180].each { |x| 
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png 
"wikipedia/Images.xcassets/AppIcon.appiconset/icon#{x}.png" -w #{x} 
'"$SCRIPT_INPUT_FILE_0"'` }'
 
 ruby -e '[120].each { |x| 
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png 
"wikipedia/Images.xcassets/AppIcon.appiconset/icon#{x}-1.png" -w #{x} 
'"$SCRIPT_INPUT_FILE_0"'` }'
-
-ruby -e '[120,240,360].each { |x| 
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png 
"wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent#{x}.png" -w #{x} 
'"$SCRIPT_INPUT_FILE_1"'` }'
-
-ruby -e '[120,240,360].each { |x| 
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png 
"wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages#{x}.png" -w #{x} 
'"$SCRIPT_INPUT_FILE_2"'` }'
-
-ruby -e '[60,120,180].each { |x| 
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png 
"wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_#{x}.png" -w #{x} 
'"$SCRIPT_INPUT_FILE_3"'` }'
-
-ruby -e '[60,120,180].each { |x| 
`/Applications/Inkscape.app/Contents/Resources/bin/inkscape --export-png 
"www/images/wmflogo_#{x}.png" -w #{x} '"$SCRIPT_INPUT_FILE_3"'` }'
diff --git a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json 
b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
index 9f8eadd..3358467 100644
--- a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
+++ b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/Contents.json
@@ -2,18 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "recent120.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "recent240.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "recent360.png"
+      "filename" : "recent.pdf"
     }
   ],
   "info" : {
diff --git a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent.pdf 
b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent.pdf
new file mode 100644
index 0000000..8fa4030
--- /dev/null
+++ b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent.pdf
Binary files differ
diff --git a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent120.png 
b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent120.png
deleted file mode 100644
index ee93cce..0000000
--- a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent120.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent240.png 
b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent240.png
deleted file mode 100644
index f2ae412..0000000
--- a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent240.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent360.png 
b/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent360.png
deleted file mode 100644
index f0dc60e..0000000
--- a/wikipedia/Images.xcassets/RecentPagesEmpty.imageset/recent360.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json 
b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
index b5589f7..0f58fe9 100644
--- a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
+++ b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/Contents.json
@@ -2,18 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "savedpages120.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "savedpages240.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "savedpages360.png"
+      "filename" : "savedpages.pdf"
     }
   ],
   "info" : {
diff --git a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages.pdf 
b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages.pdf
new file mode 100644
index 0000000..7bd63ed
--- /dev/null
+++ b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages.pdf
@@ -0,0 +1,28 @@
+%PDF-1.4
+%âãÏÓ
+1 0 obj <</Length 396/Filter/FlateDecode>>stream
+xœµTKj$1Ýë:°,ɟ²ÈÌ"‹U…™2d3×ÉvuŠ@>½
eI~ÒӓE?Ã3$d.ø×τÀùõŒø#ÜÃ5<
ã?Èxá¨à„—ps›ðÎÓóJgn+!¬(‘×÷Xæ<t¢”¤û͛óåh§fX‰z¹åuE­Ô±õŽjdËÜ@
…x3ñ       
>íQÈA뉪áH¨™Ê*4MÇÁŠÞ?t´¹€ßpuϔ·‹}•ÿ©ÐZ©µ“ÐåÎëøNEUÈä$µºŠÝ+xÏXöjqz³ù™1EÍZ»ÚɲnûÊ8ôu®\!i¾OûôŽòŸ?@içl^ЄJE¯&%
oÉÖõ¿Î`Wsöô1{ʆÝ{cÊ9qp{V°bŸh¦±2˜’ê
+K£*o˜KÌkTڀ%ÆÙz¬ªRõ®c£¬P‹Qf£TP5D“Q”ŒƒÊqT-ÇËEØûPϝhN?ÕaΔw‚T¢è =‹w;gr߅
üÚ_ÐÕøýãæç
+endstream
+endobj
+3 0 obj<</Parent 2 0 R/Contents 1 0 R/Type/Page/Resources<</ProcSet [/PDF 
/Text /ImageB /ImageC /ImageI]>>/MediaBox[0 0 120 116]>>
+endobj
+2 0 obj<</Type/Pages/Count 1/Kids[3 0 R]>>
+endobj
+4 0 obj<</Type/Catalog/Pages 2 0 R>>
+endobj
+5 0 
obj<</Creator(http://www.fileformat.info/convert/image/svg2pdf.htm)/Producer(iText1.2.3
 by lowagie.com \(based on 
itext-paulo-152\))/ModDate(D:20150120190413-05'00')/CreationDate(D:20150120190413-05'00')>>
+endobj
+xref
+0 6
+0000000000 65535 f 
+0000000015 00000 n 
+0000000616 00000 n 
+0000000478 00000 n 
+0000000666 00000 n 
+0000000710 00000 n 
+trailer
+<</Root 4 0 R/ID 
[<89ea06317ca1b56e3f0a2fa8c82ba4d0><89ea06317ca1b56e3f0a2fa8c82ba4d0>]/Info 5 0 
R/Size 6>>
+startxref
+927
+%%EOF
diff --git 
a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png 
b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
deleted file mode 100644
index 629c19d..0000000
--- a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
+++ /dev/null
Binary files differ
diff --git 
a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png 
b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
deleted file mode 100644
index 7d9e70b..0000000
--- a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
+++ /dev/null
Binary files differ
diff --git 
a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages360.png 
b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages360.png
deleted file mode 100644
index ca71a45..0000000
--- a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages360.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images.xcassets/WMFLogo_60.imageset/Contents.json 
b/wikipedia/Images.xcassets/WMFLogo_60.imageset/Contents.json
index 66256b5..a3d3b4e 100644
--- a/wikipedia/Images.xcassets/WMFLogo_60.imageset/Contents.json
+++ b/wikipedia/Images.xcassets/WMFLogo_60.imageset/Contents.json
@@ -2,18 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "wmflogo_60.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "wmflogo_120.png"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "wmflogo_180.png"
+      "filename" : "wmf_logo.pdf"
     }
   ],
   "info" : {
diff --git a/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmf_logo.pdf 
b/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmf_logo.pdf
new file mode 100644
index 0000000..3dd87c4
--- /dev/null
+++ b/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmf_logo.pdf
Binary files differ
diff --git a/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_120.png 
b/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_120.png
deleted file mode 100644
index bcf48aa..0000000
--- a/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_120.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_180.png 
b/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_180.png
deleted file mode 100644
index d525463..0000000
--- a/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_180.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_60.png 
b/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_60.png
deleted file mode 100644
index ba64109..0000000
--- a/wikipedia/Images.xcassets/WMFLogo_60.imageset/wmflogo_60.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/assets/images/wmflogo_120.png 
b/wikipedia/assets/images/wmflogo_120.png
deleted file mode 100644
index bcf48aa..0000000
--- a/wikipedia/assets/images/wmflogo_120.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/assets/images/wmflogo_180.png 
b/wikipedia/assets/images/wmflogo_180.png
deleted file mode 100644
index d525463..0000000
--- a/wikipedia/assets/images/wmflogo_180.png
+++ /dev/null
Binary files differ
diff --git a/wikipedia/assets/images/wmflogo_60.png 
b/wikipedia/assets/images/wmflogo_60.png
deleted file mode 100644
index ba64109..0000000
--- a/wikipedia/assets/images/wmflogo_60.png
+++ /dev/null
Binary files differ
diff --git a/www/images/wmflogo_120.png b/www/images/wmflogo_120.png
deleted file mode 100644
index bcf48aa..0000000
--- a/www/images/wmflogo_120.png
+++ /dev/null
Binary files differ
diff --git a/www/images/wmflogo_180.png b/www/images/wmflogo_180.png
deleted file mode 100644
index d525463..0000000
--- a/www/images/wmflogo_180.png
+++ /dev/null
Binary files differ
diff --git a/www/images/wmflogo_60.png b/www/images/wmflogo_60.png
deleted file mode 100644
index ba64109..0000000
--- a/www/images/wmflogo_60.png
+++ /dev/null
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/187060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70dde4bfe95191712708596f161b60babc1de0d1
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits