MAVEN-909

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114162 13f79535-47bb-0310-9956-ffa450edef68

ant/project.xml

@@ -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>

ant/src/plugin-resources/templates/build.jelly

@@ -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}">

ant/xdocs/changes.xml

@@ -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