You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ca...@apache.org on 2004/07/04 17:31:22 UTC
cvs commit: maven-plugins/ant/src/plugin-test maven.xml
carlos 2004/07/04 08:31:22
Modified: ant/src/plugin-test maven.xml
Log:
Use relative paths in directory properties. Issue MPANT-16
Revision Changes Path
1.6 +12 -5 maven-plugins/ant/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ant/src/plugin-test/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 22 May 2004 03:00:20 -0000 1.5
+++ maven.xml 4 Jul 2004 15:31:22 -0000 1.6
@@ -18,6 +18,7 @@
<project xmlns:util="jelly:util"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven"
xmlns:assert="assert">
<goal name="testPlugin" prereqs="test-ant">
@@ -31,12 +32,18 @@
<ant:property name="noget" value="noget" />
<ant:ant/>
-
- <assert:assertFileExists file="${maven.build.dest}/directory-1/file1.properties"/>
- <assert:assertFileExists file="${maven.build.dest}/file2.properties"/>
- <assert:assertFileExists file="${maven.test.dest}/directory-1/file1.properties"/>
- <assert:assertFileExists file="${maven.test.dest}/file2.properties"/>
+
+ <!-- use relative paths -->
+ <j:set var="baseDirFile" value="${pom.file.canonicalFile.parentFile}"/>
+ <maven:makeRelativePath basedir="${baseDirFile}" path="${maven.build.dest}" separator="/" var="classesdir"/>
+ <maven:makeRelativePath basedir="${baseDirFile}" path="${maven.test.dest}" separator="/" var="testclassesdir"/>
+
+ <assert:assertFileExists file="${classesdir}/directory-1/file1.properties"/>
+ <assert:assertFileExists file="${classesdir}/file2.properties"/>
+ <assert:assertFileExists file="${testclassesdir}/directory-1/file1.properties"/>
+ <assert:assertFileExists file="${testclassesdir}/file2.properties"/>
<delete file="${basedir}/build.xml"/>
</goal>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org