You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2006/05/09 01:59:05 UTC
svn commit: r405234 - in /maven/maven-1/plugins/trunk/ant: plugin.jelly
src/plugin-test/ src/plugin-test/maven.xml src/plugin-test/project.properties
Author: aheritier
Date: Mon May 8 16:59:04 2006
New Revision: 405234
URL: http://svn.apache.org/viewcvs?rev=405234&view=rev
Log:
test with a given file name for the ant build script
Modified:
maven/maven-1/plugins/trunk/ant/plugin.jelly
maven/maven-1/plugins/trunk/ant/src/plugin-test/ (props changed)
maven/maven-1/plugins/trunk/ant/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties
Modified: maven/maven-1/plugins/trunk/ant/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ant/plugin.jelly?rev=405234&r1=405233&r2=405234&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ant/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/ant/plugin.jelly Mon May 8 16:59:04 2006
@@ -47,6 +47,7 @@
<ant:echo>!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</ant:echo>
</j:if>
<ant:echo>Generating ${maven.ant.generate.dir}/${maven.ant.generate.script} ...</ant:echo>
+ <ant:mkdir dir="${maven.ant.generate.dir}"/>
<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>
Propchange: maven/maven-1/plugins/trunk/ant/src/plugin-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon May 8 16:59:04 2006
@@ -2,3 +2,4 @@
target
dist
build.xml
+myBuild.xml
Modified: maven/maven-1/plugins/trunk/ant/src/plugin-test/maven.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ant/src/plugin-test/maven.xml?rev=405234&r1=405233&r2=405234&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ant/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/ant/src/plugin-test/maven.xml Mon May 8 16:59:04 2006
@@ -18,12 +18,12 @@
<project xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" xmlns:u="jelly:util" xmlns:assert="assert" xmlns:x="jelly:xml">
<goal name="testPlugin" prereqs="test-ant"/>
<goal name="test-ant" prereqs="clean">
- <delete file="${basedir}/build.xml" failonerror="false"/>
+ <delete file="${maven.ant.generate.dir}/${maven.ant.generate.script}" failonerror="false"/>
<attainGoal name="ant:generate-build"/>
- <assert:assertFileExists file="${basedir}/build.xml"/>
+ <assert:assertFileExists file="${maven.ant.generate.dir}/${maven.ant.generate.script}"/>
<attainGoal name="ant:execute"/>
<!-- load build.xml file and check that 'target' property is relative -->
- <u:file name="${basedir}/build.xml" var="buildFile"/>
+ <u:file name="${maven.ant.generate.dir}/${maven.ant.generate.script}" var="buildFile"/>
<x:parse var="buildXml" xml="${buildFile.toURL()}"/>
<x:set var="properties" select="$buildXml/project/property"/>
<j:set var="defaulttargetdirName" value="${properties[2].attribute('name').value}"/>
Modified: maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties?rev=405234&r1=405233&r2=405234&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties (original)
+++ maven/maven-1/plugins/trunk/ant/src/plugin-test/project.properties Mon May 8 16:59:04 2006
@@ -1,6 +1,8 @@
+maven.ant.generate.script = myBuild.xml
+maven.ant.generate.dir = ${basedir}
+
maven.jar.override =on
maven.jar.activation =${basedir}/lib/activation-1.0.2.jar
-
maven.license.licenseFile =${basedir}/LICENSE.txt
maven.ant.use.multirepo =false