Changeset 16006 in josm for trunk/scripts

Timestamp:

2020-03-03T02:12:44+01:00 (5 years ago)

Author:

Don-vip

Message:

see #18140 - reorganization of data(_nodist), images(_nodist), styles(_nodist), IDE and native files in a more practical file tree.

• Everything belonging to the jar is now in resources (data, images, styles)
• Everything not belonging to the jar is now in nodist (data, images, styles)
• Everything related to OS native functions is now in native (linux, macosx, windows)
• Everything related to an IDE is now in ide (eclipse, netbeans)

Location:

trunk/scripts

Files:

• BuildProjectionDefinitions.java (modified) (1 diff)
• TagInfoExtract.java (modified) (2 diffs)
• geticons.pl (modified) (4 diffs)
• optimize-images (modified) (1 diff)

trunk/scripts/BuildProjectionDefinitions.java

@@ -31 +31 @@
 public final class BuildProjectionDefinitions {
 
-    private static final String PROJ_DIR = "data_nodist/projection";
+    private static final String PROJ_DIR = "nodist/data/projection";
     private static final String JOSM_EPSG_FILE = "josm-epsg";
     private static final String PROJ4_EPSG_FILE = "epsg";
     private static final String PROJ4_ESRI_FILE = "esri";
-    private static final String OUTPUT_EPSG_FILE = "data/projection/custom-epsg";
+    private static final String OUTPUT_EPSG_FILE = "resources/data/projection/custom-epsg";
 
     private static final Map<String, ProjectionDefinition> epsgProj4 = new LinkedHashMap<>();

trunk/scripts/TagInfoExtract.java

@@ -208 +208 @@
             final Path f = baseDir.resolve("images").resolve(path);
             if (Files.exists(f)) {
-                return "https://josm.openstreetmap.de/export/" + josmSvnRevision + "/josm/trunk/images/" + path;
+                return "https://josm.openstreetmap.de/export/" + josmSvnRevision + "/josm/trunk/resources/images/" + path;
             }
             throw new IllegalStateException("Cannot find image url for " + path);
@@ -226 +226 @@
                         .add("description", description)
                         .add("project_url", "https://josm.openstreetmap.de/")
-                        .add("icon_url", "https://josm.openstreetmap.de/export/7770/josm/trunk/images/logo_16x16x8.png")
+                        .add("icon_url", "https://josm.openstreetmap.de/export/7770/josm/trunk/resources/images/logo_16x16x8.png")
                         .add("contact_name", "JOSM developer team")
                         .add("contact_email", "josm-dev@openstreetmap.org");

trunk/scripts/geticons.pl

@@ -4 +4 @@
 
 my @default = (
-  "styles/standard/*.xml",
-  "styles/standard/*.mapcss",
-  "data/*.xml",
+  "resources/styles/standard/*.xml",
+  "resources/styles/standard/*.mapcss",
+  "resources/data/*.xml",
   "src/org/openstreetmap/josm/*.java",
   "src/org/openstreetmap/josm/*/*.java",
@@ -134 +134 @@
 my %haveicons;
 
-for($i = 1; my @ifiles = (glob("images".("/*" x $i).".png"), glob("images".("/*" x $i).".svg")); ++$i)
+for($i = 1; my @ifiles = (glob("resources/images".("/*" x $i).".png"), glob("resources/images".("/*" x $i).".svg")); ++$i)
 {
   for my $ifile (sort @ifiles)
   {
-    $ifile =~ s/^images\///;
+    $ifile =~ s/^resources\/images\///;
     # svg comes after png due to the glob, so only check for svg's
     if($ifile =~ /^(.*)\.svg$/)
@@ -147 +147 @@
       }
       # check for unwanted svg effects
-      if(open FILE, "<","images/$ifile")
+      if(open FILE, "<","resources/images/$ifile")
       {
         undef $/;
@@ -181 +181 @@
   if($img =~ /\.(png|svg)/)
   {
-    print STDERR "$img: File does not exist!\n" if(!-f "images/$img");
+    print STDERR "$img: File does not exist!\n" if(!-f "resources/images/$img");
     delete $haveicons{$img};
   }
   else
   {
-    print STDERR "$img(.svg|.png): File 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 "resources/images/$img.png" && !-f "resources/images/$img.svg");
     delete $haveicons{"$img.svg"};
     delete $haveicons{"$img.png"};

trunk/scripts/optimize-images

@@ -1 +1 @@
 #!/bin/sh
 
-find images/ -name "*.png" \
+find resources/images/ -name "*.png" \
   -exec echo "Processing {}" \; \
   -exec optipng -o7 -quiet "{}" \;