Changeset 8687 in josm for trunk/scripts

Timestamp:

2015-08-24T14:41:08+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11795 - add taginfo target to Ant build

Location:

trunk

Files:

• . (modified) (1 prop)
• scripts/taginfoextract.groovy (modified) (5 diffs)

trunk

@@ -7 +7 @@
 javadoc
 checkstyle-josm.xml
+taginfo_*.json
+taginfo-img

@@ -7 +7 @@
 javadoc
 checkstyle-josm.xml
+taginfo_*.json
+taginfo-img

trunk/scripts/taginfoextract.groovy

@@ -10 +10 @@
  */
 import groovy.json.JsonBuilder
+
+import java.awt.image.BufferedImage
+import java.nio.file.FileSystems
+import java.nio.file.Files
+import java.nio.file.Path
+
+import javax.imageio.ImageIO
+
 import org.openstreetmap.josm.Main
 import org.openstreetmap.josm.data.Version
@@ -22 +30 @@
 import org.openstreetmap.josm.gui.mappaint.Environment
 import org.openstreetmap.josm.gui.mappaint.LineElemStyle
+import org.openstreetmap.josm.gui.mappaint.MultiCascade
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference
-import org.openstreetmap.josm.gui.mappaint.MultiCascade
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.SimpleKeyValueCondition
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
@@ -35 +43 @@
 import org.openstreetmap.josm.io.CachedFile
 import org.openstreetmap.josm.tools.Utils
-
-import javax.imageio.ImageIO
-import java.awt.image.BufferedImage
-import java.nio.file.FileSystems
-import java.nio.file.Files
-import java.nio.file.Path
 
 class taginfoextract {
@@ -191 +193 @@
         } else {
             System.err.println 'Invalid type ' + options.t
-            System.exit(1)
-        }
-
-        System.exit(0)
+            if (!options.noexit) {
+                System.exit(1)
+            }
+        }
+
+        if (!options.noexit) {
+            System.exit(0)
+        }
     }
 
@@ -208 +214 @@
         cli._(longOpt:'svnrev', args:1, argName:"revision", "corresponding revision of the repository https://svn.openstreetmap.org/ (optional, current revision is read from the local checkout or from the web if not given, see --svnweb)")
         cli._(longOpt:'imgdir', args:1, argName:"directory", "directory to put the generated images in (default: ./taginfo-img)")
+        cli._(longOpt:'noexit', "don't call System.exit(), for use from Ant script")
         cli._(longOpt:'svnweb', 'fetch revision of the repository https://svn.openstreetmap.org/ from web and not from the local repository')
         cli._(longOpt:'imgurlprefix', args:1, argName:'prefix', 'image URLs prefix for generated image files')

@@ -7 +7 @@
 javadoc
 checkstyle-josm.xml
+taginfo_*.json
+taginfo-img