Changeset 16006 in josm for trunk/nodist

Timestamp:

2020-03-03T02:12:44+01:00 (4 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/nodist

Files:

• data (moved) (moved from trunk/data_nodist )
• data/tagchecker.cfg (modified) (1 diff)
• images (moved) (moved from trunk/images_nodist )
• images/downloadprimitive.svg (modified) (1 diff)
• images/presets/passingplace.svg (modified) (2 diffs)
• styles (moved) (moved from trunk/styles_nodist )
• styles/potlatch2/README (modified) (1 diff)
• styles/potlatch2/build.xml (modified) (1 diff)

trunk/nodist/data/tagchecker.cfg

@@ -45 +45 @@
 
 
-# all former checks are now located in data/validator/*mapcss :-)
+# all former checks are now located in resources/data/validator/*mapcss :-)

trunk/nodist/images/downloadprimitive.svg

@@ -67 +67 @@
      inkscape:window-maximized="0" />
   <image
-     sodipodi:absref="C:\Documents and Settings\matthiasj\My Documents\Eclipse\core\images_nodist\..\images\download.png"
      xlink:href="..\images\download.png"
      y="4"

trunk/nodist/images/presets/passingplace.svg

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -13 +11 @@
    height="340"
    id="svg2"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Zeichnung.svg"
-   inkscape:export-filename="/home/stoecker/josm/core/images/presets/passingplace.png"
-   inkscape:export-xdpi="10.19"
-   inkscape:export-ydpi="10.19">
+   version="1.1">
   <defs
      id="defs4">

trunk/nodist/styles/potlatch2/README

@@ -3 +3 @@
 Potlatch 2's repository is git://git.openstreetmap.org/potlatch2.git
 
- * styles_nodist/potlatch2/source
+ * nodist/styles/potlatch2/source
         contains the unmodified source files copied from git.openstreetmap.org/potlatch2.git/history/master:/resources/stylesheets
-        
- * styles_nodist/potlatch2/patched
+
+ * nodist/styles/potlatch2/patched
         contains the manually edited version
-        
- * images/icons
+
+ * resources/images/icons
         copy of git.openstreetmap.org/potlatch2.git/tree/HEAD:/resources/icons
-        
- * styles/standard/potlatch2.mapcss
+
+ * resources/styles/standard/potlatch2.mapcss
         concatination of the patched files; the ant task 'assemble' helps with this (use build.xml in the current folder)
 

trunk/nodist/styles/potlatch2/build.xml

@@ -3 +3 @@
     <!--    concatinate the files to one mapcss style file     -->
     <target name="assemble">
-        <concat destfile="../../styles/standard/potlatch2.mapcss">
-            <header trimleading="yes">/* THIS FILE IS AUTO-GENERATED (SEE styles_nodist/potlatch2/README) */
+        <concat destfile="../../../resources/styles/standard/potlatch2.mapcss">
+            <header trimleading="yes">/* THIS FILE IS AUTO-GENERATED (SEE nodist/styles/potlatch2/README) */
             </header>
             <filelist dir="." files="prelude.css"/>