The property maven.ant.generatebuild.file is replaced by properties maven.ant.generate.dir, maven.ant.generate.script. The generated script is ${maven.ant.generate.dir}/${maven.ant.generate.script}.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@405222 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
f010fba57a
commit
eb7608270d
4 files changed
+36
-18
No files matched your search
+3
-3
@@ -41,11 +41,11 @@
|
||||
name="ant:generate-build"
|
||||
description="Generate an Ant build file">
|
||||
|
||||
<ant:echo>Generating ${maven.ant.generatebuild.file} ...</ant:echo>
|
||||
<j:file name="${maven.ant.generatebuild.file}" prettyPrint="true">
|
||||
<ant:echo>Generating ${maven.ant.generate.dir}/${maven.ant.generate.script} ...</ant:echo>
|
||||
<j:file name="${maven.ant.generate.dir}/${maven.ant.generate.script}" prettyPrint="true">
|
||||
<j:import file="${plugin.resources}/templates/build.jelly" inherit="true"/>
|
||||
</j:file>
|
||||
<ant:echo>${maven.ant.generatebuild.file} generated.</ant:echo>
|
||||
<ant:echo>${maven.ant.generate.dir}/${maven.ant.generate.script} generated.</ant:echo>
|
||||
</goal>
|
||||
|
||||
<goal
|
||||
|
||||
@@ -21,11 +21,13 @@
|
||||
# keep them apart from the project specific properties.
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
maven.ant.execute.script = build.xml
|
||||
maven.ant.execute.dir = ${basedir}
|
||||
maven.ant.generate.script = build.xml
|
||||
maven.ant.generate.dir = ${basedir}
|
||||
|
||||
maven.ant.execute.script = ${maven.ant.generate.script}
|
||||
maven.ant.execute.dir = ${maven.ant.generate.dir}
|
||||
maven.ant.execute.target =
|
||||
|
||||
maven.ant.generatebuild.file = ${basedir}/build.xml
|
||||
maven.ant.compatibility = 1.6
|
||||
|
||||
maven.ant.use.properties = true
|
||||
|
||||
@@ -26,6 +26,8 @@
|
||||
</properties>
|
||||
<body>
|
||||
<release version="1.10-SNAPSHOT" date="In SVN">
|
||||
<action dev="aheritier" type="update">The property maven.ant.generatebuild.file is replaced by properties maven.ant.generate.dir, maven.ant.generate.script. The generated script is ${maven.ant.generate.dir}/${maven.ant.generate.script}.</action>
|
||||
<action dev="aheritier" type="del">The property maven.ant.generatebuild.file is removed.</action>
|
||||
<action dev="aheritier" type="add" issue="MPANT-25">Add a new goal (ant:execute) to execute a build.xml file from maven.</action>
|
||||
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : commons-jelly-tags-xml v1.0 to v1.1.</action>
|
||||
</release>
|
||||
|
||||
+26
-12
@@ -33,6 +33,20 @@
|
||||
<th>Optional?</th>
|
||||
<th>Default value</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.generate.script</td>
|
||||
<td>The filename to use. Defaults to "build.xml". This file is expected to be a filename relative to the "maven.ant.generate.dir" property given.</td>
|
||||
<td>since 1.10</td>
|
||||
<td>Yes</td>
|
||||
<td>"build.xml"</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.generate.dir</td>
|
||||
<td>The directory where to generate the Ant script. Defaults to the current project's basedir.</td>
|
||||
<td>since 1.10</td>
|
||||
<td>Yes</td>
|
||||
<td>${basedir}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.excludeTests</td>
|
||||
<td>Holds a comma separated list of source file patterns that will be excluded in the generated Ant build, e.g.</td>
|
||||
@@ -45,13 +59,6 @@
|
||||
<source>maven.ant.excludeTests=**/*Test.java,**/*Suite.java</source>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.generatebuild.file</td>
|
||||
<td>Sets the name of the ant buildfile to create.</td>
|
||||
<td>since 1.0</td>
|
||||
<td>Yes</td>
|
||||
<td>${basedir}/build.xml</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.use.properties</td>
|
||||
<td>
|
||||
@@ -73,25 +80,32 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.execute.script</td>
|
||||
<td>The buildfile to use. Defaults to "build.xml". This file is expected to be a filename relative to the "maven.ant.execute.dir" property given.</td>
|
||||
<td>The buildfile to use. Defaults to ${maven.ant.generate.script}. This file is expected to be a filename relative to the "maven.ant.execute.dir" property given.</td>
|
||||
<td>since 1.10</td>
|
||||
<td>Yes</td>
|
||||
<td>"build.xml"</td>
|
||||
<td>${maven.ant.generate.script}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.execute.dir</td>
|
||||
<td>The directory to use as a basedir for the Ant project. Defaults to the current project's basedir. This will override the basedir setting of the called project.</td>
|
||||
<td>The directory to use as a basedir for the Ant project. Defaults to ${maven.ant.generate.dir}. This will override the basedir setting of the called project.</td>
|
||||
<td>since 1.10</td>
|
||||
<td>Yes</td>
|
||||
<td>${basedir}</td>
|
||||
<td>${maven.ant.generate.dir}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.execute.target</td>
|
||||
<td>The target of the Ant project that should be executed. Defaults to the project's default target.</td>
|
||||
<td>since 1.9</td>
|
||||
<td>since 1.10</td>
|
||||
<td>Yes</td>
|
||||
<td><i><empty></i></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>maven.ant.generatebuild.file</td>
|
||||
<td><b>!! REMOVED !!</b> Sets the name of the ant buildfile to create. Use "maven.ant.generate.script" and "maven.ant.generate.dir" instead.</td>
|
||||
<td>since 1.0, removed in 1.10.</td>
|
||||
<td>Yes</td>
|
||||
<td>${basedir}/build.xml</td>
|
||||
</tr>
|
||||
</table>
|
||||
</section>
|
||||
</body>
|
||||
|
||||
Reference in new issue
Block a user