You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/02/21 22:41:57 UTC
svn commit: r379596 - in /maven/maven-1/plugins/trunk/java: plugin.jelly xdocs/changes.xml

Author: ltheussl
Date: Tue Feb 21 13:41:56 2006
New Revision: 379596

URL: http://svn.apache.org/viewcvs?rev=379596&view=rev
Log:
PR: MPJAVA-42
Also check for ${maven.gen.src} before compiling.

Modified:
    maven/maven-1/plugins/trunk/java/plugin.jelly
    maven/maven-1/plugins/trunk/java/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/java/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/java/plugin.jelly?rev=379596&r1=379595&r2=379596&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/java/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/java/plugin.jelly Tue Feb 21 13:41:56 2006
@@ -42,9 +42,21 @@
   <goal name="java:compile"
         description="Compile the project"
         prereqs="java:prepare-filesystem">
-    <ant:echo>Compiling to ${maven.build.dest}</ant:echo>
+
+    <maven:get var="generatedSources" plugin="maven-javacc-plugin" property="maven.gen.src" />
+    <ant:available
+      property="generatedSourcesPresent"
+      file="${generatedSources}"/>
+
+    <j:if test="${generatedSourcesPresent}">
+      <ant:path id="maven.generated.src.set" location="${generatedSources}"/>
+      <maven:addPath id="maven.compile.src.set" refid="maven.generated.src.set"/>
+    </j:if>
+
     <j:choose>
-      <j:when test="${sourcesPresent == 'true'}">
+      <j:when test="${sourcesPresent == 'true' or generatedSourcesPresent == 'true'}">
+
+        <ant:echo>Compiling to ${maven.build.dest}</ant:echo>
 
         <j:if test="${context.getVariable('maven.compile.target') == null}">
           <ant:echo>

Modified: maven/maven-1/plugins/trunk/java/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/java/xdocs/changes.xml?rev=379596&r1=379595&r2=379596&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/java/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/java/xdocs/changes.xml Tue Feb 21 13:41:56 2006
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.6-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPJAVA-42">Also check for <code>${maven.gen.src}</code> before compiling.</action>
       <action dev="ltheussl" type="add" issue="MPJAVA-41">New property <code>maven.compile.failonerror</code>.</action>
       <action dev="ltheussl" type="add" issue="MPJAVA-32">New property <code>maven.compile.debuglevel</code>.</action>
       <action dev="ltheussl" type="add" issue="MPJAVA-44">New property <code>maven.compile.nowarn</code>.</action>