PR: MPJAVA-42
Also check for ${maven.gen.src} before compiling.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@379596 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user