dion 2003/10/07 22:54:22
Modified: ant/src/plugin-resources/templates build.jelly
ant project.xml
ant/xdocs changes.xml
Log:
MAVEN-909
Revision Changes Path
1.4 +13 -11 maven-plugins/ant/src/plugin-resources/templates/build.jelly
Index: build.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ant/src/plugin-resources/templates/build.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.jelly 19 Aug 2003 04:43:58 -0000 1.3
+++ build.jelly 8 Oct 2003 05:54:22 -0000 1.4
@@ -3,12 +3,17 @@
xmlns:j="jelly:core"
xmlns:u="jelly:util"
xmlns:x="jelly:xml"
+ xmlns:maven="jelly:maven"
xmlns="dummy">
<ant:tstamp />
<!-- get first repo in the list -->
<u:tokenize var="repos" delim=",">${maven.repo.remote}</u:tokenize>
<j:set var="repo">${repos[0]}</j:set>
+ <!-- set up relative paths -->
+ <maven:makeRelativePath var="srcDir" basedir="${basedir}"
path="${pom.build.sourceDirectory}" separator="/"/>
+ <maven:makeRelativePath var="testSrcDir" basedir="${basedir}"
path="${pom.build.unitTestSourceDirectory}" separator="/"/>
+
<x:comment>
build.xml generated by maven from project.xml version ${pom.currentVersion}
@@ -50,7 +55,7 @@
deprecation="true"
optimize="false">
<src>
- <pathelement location="${pom.build.sourceDirectory}"/>
+ <pathelement location="${srcDir}"/>
</src>
<classpath>
<fileset dir="$${libdir}">
@@ -67,7 +72,8 @@
<copy todir="$${classesdir}">
- <j:set var="dir" value="${resource.directory}"/>
+ <maven:makeRelativePath var="dir" basedir="${basedir}"
path="${resource.directory}" separator="/"/>
+
<j:if test="${empty dir}">
<j:set var="dir" value="."/>
</j:if>
@@ -90,7 +96,8 @@
<copy todir="$${testclassesdir}">
- <j:set var="dir" value="${resource.directory}"/>
+ <maven:makeRelativePath var="dir" basedir="${basedir}"
path="${resource.directory}" separator="/"/>
+
<j:if test="${empty dir}">
<j:set var="dir" value="."/>
</j:if>
@@ -158,12 +165,7 @@
failureproperty="test.failure"
fork="true"
dir="./">
-<!--
- I think the following is wrong
- <sysproperty key="basedir" value="${pom.build.unitTestSourceDirectory}"/>
- <sysproperty key="basedir" value="${basedir}"/> // this gives a full path
- including the C:\ on windows
--->
+
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
@@ -175,7 +177,7 @@
<pathelement path="$${classesdir}"/>
</classpath>
<batchtest todir="$${testreportdir}">
- <fileset dir="${pom.build.unitTestSourceDirectory}">
+ <fileset dir="${testSrcDir}">
<j:forEach var="pat" items="${pom.build.unitTest.includes}">
<include name="${pat}"/>
</j:forEach>
@@ -208,7 +210,7 @@
deprecation="true"
optimize="false">
<src>
- <pathelement location="${pom.build.unitTestSourceDirectory}"/>
+ <pathelement location="${testSrcDir}"/>
</src>
<classpath>
<fileset dir="$${libdir}">
1.20 +1 -1 maven-plugins/ant/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 29 Sep 2003 05:19:10 -0000 1.19
+++ project.xml 8 Oct 2003 05:54:22 -0000 1.20
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-ant-plugin</id>
<name>Maven Ant Plug-in</name>
- <currentVersion>1.4</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<description>Generates ant build files from a maven project, so that plain ant
users can build your project</description>
<shortDescription>Generate Ant build file</shortDescription>
<url>http://maven.apache.org/reference/plugins/ant/</url>
1.7 +7 -0 maven-plugins/ant/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 29 Sep 2003 06:09:54 -0000 1.6
+++ changes.xml 8 Oct 2003 05:54:22 -0000 1.7
@@ -6,6 +6,13 @@
</properties>
<body>
+
+ <release version="1.5" date="in CVS">
+ <action dev="dion" type="fix">
+ Make relative paths output for various pom values. MAVEN-909
+ </action>
+ </release>
+
<release version="1.4" date="2003-09-29">
<action dev="dion" type="update">
Added test project
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
