Changeset 13279 in josm

Timestamp:

2018-01-04T21:02:34+01:00 (7 years ago)

Author:

stoecker

Message:

see #15734 - unify output of icon script to form name:message

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• geticons.pl (modified) (5 diffs)

trunk/build.xml

@@ -19 +19 @@
         <property name="test.dir" location="${base.dir}/test"/>
         <property name="src.dir" location="${base.dir}/src"/>
+        <property name="noJavaFX" value="1"/>
         <property name="build.dir" location="${base.dir}/build"/>
         <property name="dist.dir" location="${base.dir}/dist"/>

trunk/geticons.pl

@@ -169 +169 @@
       if($haveicons{"$1.png"})
       {
-        print STDERR "File $1 exists twice as .svg and .png.\n";
+        print STDERR "$1: File exists twice as .svg and .png.\n";
       }
       # check for unwanted svg effects
@@ -181 +181 @@
           for my $x (split(/\s*;\s*/, $1))
           {
-            print STDERR "Style starts with minus for $ifile: $x\n" if $x =~ /^-/;
+            print STDERR "$ifile: Style starts with minus: $x\n" if $x =~ /^-/;
           }
         }
@@ -187 +187 @@
         {
           my $x = $1;
-          print STDERR "ViewBox has float values for $ifile: $x\n" if $x =~ /\./;
+          print STDERR "$ifile: ViewBox has float values: $x\n" if $x =~ /\./;
         }
       }
       else
       {
-        print STDERR "Could not open file $ifile: $1";
+        print STDERR "$ifile: Could not open file: $1";
       }
     }
@@ -203 +203 @@
   if($img =~ /\.(png|svg)/)
   {
-    print STDERR "File $img does not exist!\n" if(!-f "images/$img");
+    print STDERR "$img: File does not exist!\n" if(!-f "images/$img");
     delete $haveicons{$img};
   }
   else
   {
-    print STDERR "File $img(.svg|.png) does not exist!\n" if(!-f "images/$img.png" && !-f "images/$img.svg");
+    print STDERR "$img(.svg|.png): File does not exist!\n" if(!-f "images/$img.png" && !-f "images/$img.svg");
     delete $haveicons{"$img.svg"};
     delete $haveicons{"$img.png"};
@@ -216 +216 @@
 for my $img (sort keys %haveicons)
 {
-  print "$img\n";
-}
+  print "$img: Unused image.\n";
+}