Changeset 4252 in josm

Timestamp:

Jul 16, 2011 7:49:06 PM (23 months ago)

Author:

bastiK

Message:

removed autogenerated code - can be build without problems using javacc.jar in tools folder

Location:

trunk

Files:

• build.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (copied) (copied from trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/mapcss/parser (deleted)
• tools/javacc.jar (added)

trunk/build.xml

@@ -11 +11 @@
 -->
 <project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" basedir=".">
-    <property name="test.dir" value="test"/>
-    <property name="src.dir" value="src"/>
-    <property name="build.dir" value="build"/>
+    <property name="test.dir" location="test"/>
+    <property name="src.dir" location="src"/>
+    <property name="build.dir" location="build"/>
+    <property name="javacc.home" location="tools"/>
+    <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
     <!-- build parameter: compression level (ant -Dclevel=N)
              N ranges from 0 (no compression) to 9 (maximum compression)
@@ -21 +23 @@
     </condition>
     <!-- Java classpath addition (all jar files to compile tests with this) -->
-    <!-- <path id="classpath">
+    <path id="classpath">
         <fileset dir="lib">
             <include name="**/*.jar"/>
         </fileset>
-    </path> -->
+    </path>
+
     <!--
           ** Used by Eclipse ant builder for updating
@@ -105 +108 @@
         </zip>
     </target>
-    <target name="compile" depends="init">
-        <javac srcdir="src" includes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
-        <javac srcdir="src" excludes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
+    <target name="javacc">
+        <mkdir dir="${mapcss.dir}/parsergen"/>
+        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>
+    </target>
+    <target name="compile" depends="javacc,init">
+        <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
+        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
@@ -119 +126 @@
         <delete dir="build"/>
         <delete dir="dist"/>
-    </target>
-    <target name="javacc">
-        <exec executable="javacc">
-            <arg value="-debug_parser=false"/>
-            <arg value="-debug_lookahead=false"/>
-            <arg value="-debug_token_manager=false"/>
-            <arg value="-output_directory=${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss/parser"/>
-            <arg value="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj"/>
-        </exec>
+        <delete dir="${mapcss.dir}/parsergen"/>
     </target>
     <path id="test.classpath">

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -5 +5 @@
 
 PARSER_BEGIN(MapCSSParser)
-package org.openstreetmap.josm.gui.mappaint.mapcss.parser;
+package org.openstreetmap.josm.gui.mappaint.mapcss.parsergen;
 
 import java.awt.Color;

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
-import org.openstreetmap.josm.gui.mappaint.mapcss.parser.MapCSSParser;
-import org.openstreetmap.josm.gui.mappaint.mapcss.parser.ParseException;
-import org.openstreetmap.josm.gui.mappaint.mapcss.parser.TokenMgrError;
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.TokenMgrError;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.io.MirroredInputStream;