Changeset 16006 in josm for trunk/scripts/geticons.pl


Ignore:
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)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/scripts/geticons.pl

    r13857 r16006  
    44
    55my @default = (
    6   "styles/standard/*.xml",
    7   "styles/standard/*.mapcss",
    8   "data/*.xml",
     6  "resources/styles/standard/*.xml",
     7  "resources/styles/standard/*.mapcss",
     8  "resources/data/*.xml",
    99  "src/org/openstreetmap/josm/*.java",
    1010  "src/org/openstreetmap/josm/*/*.java",
     
    134134my %haveicons;
    135135
    136 for($i = 1; my @ifiles = (glob("images".("/*" x $i).".png"), glob("images".("/*" x $i).".svg")); ++$i)
     136for($i = 1; my @ifiles = (glob("resources/images".("/*" x $i).".png"), glob("resources/images".("/*" x $i).".svg")); ++$i)
    137137{
    138138  for my $ifile (sort @ifiles)
    139139  {
    140     $ifile =~ s/^images\///;
     140    $ifile =~ s/^resources\/images\///;
    141141    # svg comes after png due to the glob, so only check for svg's
    142142    if($ifile =~ /^(.*)\.svg$/)
     
    147147      }
    148148      # check for unwanted svg effects
    149       if(open FILE, "<","images/$ifile")
     149      if(open FILE, "<","resources/images/$ifile")
    150150      {
    151151        undef $/;
     
    181181  if($img =~ /\.(png|svg)/)
    182182  {
    183     print STDERR "$img: File does not exist!\n" if(!-f "images/$img");
     183    print STDERR "$img: File does not exist!\n" if(!-f "resources/images/$img");
    184184    delete $haveicons{$img};
    185185  }
    186186  else
    187187  {
    188     print STDERR "$img(.svg|.png): File does not exist!\n" if(!-f "images/$img.png" && !-f "images/$img.svg");
     188    print STDERR "$img(.svg|.png): File does not exist!\n" if(!-f "resources/images/$img.png" && !-f "resources/images/$img.svg");
    189189    delete $haveicons{"$img.svg"};
    190190    delete $haveicons{"$img.png"};
Note: See TracChangeset for help on using the changeset viewer.