Changeset 6702 in josm for trunk/netbeans

Timestamp:

2014-01-16T12:59:09+01:00 (10 years ago)

Author:

akks

Message:

Netbeans project fixes (update javacc compilation)

Location:

trunk/netbeans

Files:

• nbbuild.xml (modified) (2 diffs)
• nbproject/genfiles.properties (modified) (1 diff)

trunk/netbeans/nbbuild.xml

@@ -100 +100 @@
         </target>
 
-    <target name="-pre-compile">
+    <target name="check-javacc">
+        <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
+            <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
+        </uptodate>
+    </target>   
+    <target name="javacc" depends="check-javacc" unless="javacc.notRequired">
         <mkdir dir="${mapcss.dir}/parsergen"/>
         <exec append="false" executable="java" failifexecutionfails="true">
@@ -107 +112 @@
             <arg value="javacc"/>
             <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
+            <arg value="-JDK_VERSION=1.6"/>
+            <arg value="-GRAMMAR_ENCODING=UTF-8"/>
             <arg value="${mapcss.dir}/MapCSSParser.jj"/>
         </exec>
+    </target>
+    <target name="-pre-compile" depends="javacc">
 <!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
     </target>    

trunk/netbeans/nbproject/genfiles.properties

@@ -4 +4 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=2a1d7942
-nbproject/build-impl.xml.script.CRC32=ba6a6ad8
-nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
+nbproject/build-impl.xml.data.CRC32=e047155d
+nbproject/build-impl.xml.script.CRC32=63445536
+nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46