Changeset 4252 in josm


Ignore:
Timestamp:
2011-07-16T19:49:06+02:00 (7 years ago)
Author:
bastiK
Message:

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

Location:
trunk
Files:
1 added
1 deleted
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r4243 r4252  
    1111-->
    1212<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" basedir=".">
    13     <property name="test.dir" value="test"/>
    14     <property name="src.dir" value="src"/>
    15     <property name="build.dir" value="build"/>
     13    <property name="test.dir" location="test"/>
     14    <property name="src.dir" location="src"/>
     15    <property name="build.dir" location="build"/>
     16    <property name="javacc.home" location="tools"/>
     17    <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
    1618    <!-- build parameter: compression level (ant -Dclevel=N)
    1719             N ranges from 0 (no compression) to 9 (maximum compression)
     
    2123    </condition>
    2224    <!-- Java classpath addition (all jar files to compile tests with this) -->
    23     <!-- <path id="classpath">
     25    <path id="classpath">
    2426        <fileset dir="lib">
    2527            <include name="**/*.jar"/>
    2628        </fileset>
    27     </path> -->
     29    </path>
     30
    2831    <!--
    2932          ** Used by Eclipse ant builder for updating
     
    105108        </zip>
    106109    </target>
    107     <target name="compile" depends="init">
    108         <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"/>
    109         <javac srcdir="src" excludes="com/drew/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
     110    <target name="javacc">
     111        <mkdir dir="${mapcss.dir}/parsergen"/>
     112        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>
     113    </target>
     114    <target name="compile" depends="javacc,init">
     115        <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
     116        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
    110117            <compilerarg value="-Xlint:deprecation"/>
    111118            <compilerarg value="-Xlint:unchecked"/>
     
    119126        <delete dir="build"/>
    120127        <delete dir="dist"/>
    121     </target>
    122     <target name="javacc">
    123         <exec executable="javacc">
    124             <arg value="-debug_parser=false"/>
    125             <arg value="-debug_lookahead=false"/>
    126             <arg value="-debug_token_manager=false"/>
    127             <arg value="-output_directory=${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss/parser"/>
    128             <arg value="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.jj"/>
    129         </exec>
     128        <delete dir="${mapcss.dir}/parsergen"/>
    130129    </target>
    131130    <path id="test.classpath">
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

    r4250 r4252  
    55
    66PARSER_BEGIN(MapCSSParser)
    7 package org.openstreetmap.josm.gui.mappaint.mapcss.parser;
     7package org.openstreetmap.josm.gui.mappaint.mapcss.parsergen;
    88
    99import java.awt.Color;
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

    r4191 r4252  
    2020import org.openstreetmap.josm.gui.mappaint.StyleSource;
    2121import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
    22 import org.openstreetmap.josm.gui.mappaint.mapcss.parser.MapCSSParser;
    23 import org.openstreetmap.josm.gui.mappaint.mapcss.parser.ParseException;
    24 import org.openstreetmap.josm.gui.mappaint.mapcss.parser.TokenMgrError;
     22import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
     23import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
     24import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.TokenMgrError;
    2525import org.openstreetmap.josm.gui.preferences.SourceEntry;
    2626import org.openstreetmap.josm.io.MirroredInputStream;
Note: See TracChangeset for help on using the changeset viewer.