Update of /var/cvs/all
In directory james.mmbase.org:/tmp/cvs-serv702
Modified Files:
project.properties maven.xml
Log Message:
calling javacc.xml in maven build, so that it at least compiles again with maven
See also: http://cvs.mmbase.org/viewcvs/all
Index: project.properties
===================================================================
RCS file: /var/cvs/all/project.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- project.properties 18 Jun 2008 14:05:53 -0000 1.13
+++ project.properties 19 Jun 2008 19:15:46 -0000 1.14
@@ -10,9 +10,10 @@
-#So, how do I compile _two_ .jj files??
-maven.javacc.javacc.grammar=${basedir}/src/org/mmbase/util/dateparser/DateParser.jj
-maven.javacc.javacc.package=org.mmbase.util.dateparser
+##So, how do I compile _two_ .jj files??
+## commented out.
+#maven.javacc.javacc.grammar=${basedir}/src/org/mmbase/util/dateparser/DateParser.jj
+#maven.javacc.javacc.package=org.mmbase.util.dateparser
maven.jar.index=true
Index: maven.xml
===================================================================
RCS file: /var/cvs/all/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- maven.xml 25 Mar 2008 21:03:08 -0000 1.5
+++ maven.xml 19 Jun 2008 19:15:46 -0000 1.6
@@ -11,11 +11,21 @@
xmlns:util="jelly:util">
<preGoal name="java:compile">
- <attainGoal name="javacc"/>
+ <path id="generated-src"
location="${basedir}/target/generated-src/main/java" />
+ <ant:ant dir="${basedir}" antfile="javacc.xml">
+ <ant:property name="build.dir" location="target" />
+ <ant:property name="generated-source-src.dir"
location="target/generated-src/main/java" />
+ </ant:ant>
+ <maven:addPath id="maven.compile.src.set" refid="generated-src" />
</preGoal>
<preGoal name="maven-javadoc-plugin:report">
- <attainGoal name="javacc"/>
+ <path id="generated-src"
location="${basedir}/target/generated-src/main/java" />
+ <ant:ant dir="${basedir}" antfile="javacc.xml">
+ <ant:property name="build.dir" location="target" />
+ <ant:property name="generated-source-src.dir"
location="target/generated-src/main/java" />
+ </ant:ant>
+ <maven:addPath id="maven.compile.src.set" refid="generated-src" />
</preGoal>
<preGoal name="jar:jar">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
