carlos 2004/07/03 10:49:14
Modified: ant/src/plugin-resources/templates build.jelly
ant/xdocs changes.xml
Log:
Use relative paths in directory properties. Issue MPANT-16
Revision Changes Path
1.16 +12 -6 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.jelly 18 May 2004 21:16:04 -0000 1.15
+++ build.jelly 3 Jul 2004 17:49:14 -0000 1.16
@@ -42,15 +42,21 @@
<project name="${pom.artifactId}" default="jar" basedir=".">
- <property name="defaulttargetdir" value="${maven.build.dir}"/>
- <property name="libdir" value="${maven.build.dir}/lib" />
- <property name="classesdir" value="${maven.build.dest}" />
- <property name="testclassesdir" value="${maven.test.dest}" />
+ <j:set var="baseDirFile" value="${pom.file.canonicalFile.parentFile}"/>
+ <maven:makeRelativePath basedir="${baseDirFile}" path="${maven.build.dir}"
separator="/" var="defaulttargetdir"/>
+ <property name="defaulttargetdir" value="${defaulttargetdir}"/>
+ <property name="libdir" value="${defaulttargetdir}/lib" />
+
+ <maven:makeRelativePath basedir="${baseDirFile}" path="${maven.build.dest}"
separator="/" var="classesdir"/>
+ <property name="classesdir" value="${classesdir}" />
<j:if test="${unitTestSourcesPresent == 'true'}">
- <maven:pluginVar plugin="maven-test-plugin" property="maven.test.dest"
var="testclassesdir" />
+ <maven:pluginVar plugin="maven-test-plugin" property="maven.test.dest"
var="abstestclassesdir" />
+ <maven:makeRelativePath basedir="${baseDirFile}" path="${abstestclassesdir}"
separator="/" var="testclassesdir"/>
<property name="testclassesdir" value="${testclassesdir}" />
- <maven:pluginVar plugin="maven-test-plugin"
property="maven.test.reportsDirectory" var="testreportdir" />
+
+ <maven:pluginVar plugin="maven-test-plugin"
property="maven.test.reportsDirectory" var="abstestreportdir" />
+ <maven:makeRelativePath basedir="${baseDirFile}" path="${abstestreportdir}"
separator="/" var="testreportdir"/>
<property name="testreportdir" value="${testreportdir}" />
</j:if>
1.23 +1 -0 maven-plugins/ant/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/xdocs/changes.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- changes.xml 18 May 2004 21:29:51 -0000 1.22
+++ changes.xml 3 Jul 2004 17:49:14 -0000 1.23
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.8-SNAPSHOT" date="In CVS">
+ <action dev="carlos" type="fix" issue="MPANT-16" due-to="Brent Worden"
due-to-email="[EMAIL PROTECTED]">Use relative paths in directory properties.</action>
<action dev="aheritier" type="update">Run Junit only if present in ANT
(display a warning otherwise).</action>
</release>
<release version="1.7" date="2004-05-15">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
