Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use relative paths in directory properties. Issue MPANT-16

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115634 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
carlos 2004-07-03 17:49:14 +00:00
parent 5269df6d5e
commit 4cd7bbcc5e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ant/src/plugin-resources/templates/build.jelly
View File

@ -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
ant/xdocs/changes.xml
View File

@ -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="brent@worden.org">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">