Switch stable branch back to HEAD
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113855 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
8fb31f914f
commit
b623fe0dda
166 files changed
+2110
-827
No files matched your search
@@ -3,33 +3,19 @@
|
||||
xmlns:j="jelly:core"
|
||||
xmlns:util="jelly:util"
|
||||
xmlns:ant="jelly:ant"
|
||||
xmlns:maven="jelly:maven"
|
||||
xmlns="dummy"
|
||||
trim="true">
|
||||
|
||||
<classpath>
|
||||
<j:if test="${sourcesPresent}">
|
||||
<j:set var="srcDir" value="${pom.build.sourceDirectory}"/>
|
||||
<j:if test="${ srcDir.startsWith( basedir ) }">
|
||||
<!--ant:echo>Cutting off basedir from sourceDirectory</ant:echo-->
|
||||
<j:set var="srcDir" value="${srcDir.substring(basedir.length())}"/>
|
||||
<!--
|
||||
cut off also slash or backslash from basedir.
|
||||
Is there a way to make it in one step in Jelly?
|
||||
-->
|
||||
<j:set var="srcDir" value="${srcDir.substring(1)}"/>
|
||||
</j:if>
|
||||
<maven:make-relative-path var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}"/>
|
||||
<classpathentry kind="src" path="${srcDir}"/>
|
||||
</j:if>
|
||||
|
||||
<j:if test="${unitTestSourcesPresent}">
|
||||
<ant:echo>Contains JUnit tests</ant:echo>
|
||||
<j:set var="testSrcDir" value="${pom.build.unitTestSourceDirectory}"/>
|
||||
<j:if test="${ testSrcDir.startsWith( basedir ) }">
|
||||
<!--ant:echo>Cutting off basedir from testSourceDirectory</ant:echo-->
|
||||
<j:set var="testSrcDir" value="${testSrcDir.substring(basedir.length())}"/>
|
||||
<!-- Cut off slash or backslash from basedir -->
|
||||
<j:set var="testSrcDir" value="${testSrcDir.substring(1)}"/>
|
||||
</j:if>
|
||||
<maven:make-relative-path var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}"/>
|
||||
|
||||
<!-- Eclipse supports an output directory per input directory -->
|
||||
<j:set var="testOutputDir" value="${maven.eclipse.test.output.dir}"/>
|
||||
@@ -37,12 +23,8 @@
|
||||
<j:set var="testOutputDir"
|
||||
value="${pom.getPluginContext('maven-test-plugin').getVariable('maven.test.dest')}"/>
|
||||
</j:if>
|
||||
<j:if test="${ testOutputDir.startsWith( basedir ) }">
|
||||
<!--ant:echo>Cutting off basedir from testOutputDir</ant:echo-->
|
||||
<j:set var="testOutputDir" value="${testOutputDir.substring(basedir.length())}"/>
|
||||
<!-- Cut off slash or backslash from basedir -->
|
||||
<j:set var="testOutputDir" value="${testOutputDir.substring(1)}"/>
|
||||
</j:if>
|
||||
|
||||
<maven:make-relative-path var="testOutputDir" basedir="${basedir}" path="${testOutputDir}" />
|
||||
|
||||
<ant:echo>Setting compile of ${testSrcDir} to ${testOutputDir}</ant:echo>
|
||||
<classpathentry kind="src" path="${testSrcDir}" output="${testOutputDir}"/>
|
||||
@@ -83,13 +65,7 @@
|
||||
|
||||
<j:if test="${cactusSourcePresent == 'true'}">
|
||||
<ant:echo>Contains Cactus Tests!</ant:echo>
|
||||
<j:set var="testSrcDir" value="${cactusSrcDir}"/>
|
||||
<j:if test="${ testSrcDir.startsWith( basedir ) }">
|
||||
<ant:echo>Cutting off basedir from Cactus source directory</ant:echo>
|
||||
<j:set var="testSrcDir" value="${testSrcDir.substring(basedir.length())}"/>
|
||||
<!-- cut off also slash or backslash -->
|
||||
<j:set var="testSrcDir" value="${testSrcDir.substring(1)}"/>
|
||||
</j:if>
|
||||
<maven:make-relative-path var="testSrcDir" basedir="${basedir}" path="${cactusSrcDir}" />
|
||||
<classpathentry kind="src" path="${testSrcDir}"/>
|
||||
|
||||
<j:set var="depVersion">${pom.getPluginContext('maven-cactus-plugin').getVariable('plugin').getDependency('cactus').getVersion()}</j:set>
|
||||
@@ -119,14 +95,9 @@
|
||||
<j:if test="${empty outputDir}">
|
||||
<j:set var="outputDir" value="${maven.build.dest}"/>
|
||||
</j:if>
|
||||
<j:if test="${ outputDir.startsWith( basedir ) }">
|
||||
<!-- Cutting off basedir from outputDir -->
|
||||
<j:set var="outputDir" value="${outputDir.substring(basedir.length())}"/>
|
||||
<!-- Cut off slash or backslash from basedir -->
|
||||
<j:set var="outputDir" value="${outputDir.substring(1)}"/>
|
||||
</j:if>
|
||||
<maven:make-relative-path var="outputDir" basedir="${basedir}" path="${outputDir}" />
|
||||
<classpathentry kind="output" path="${outputDir}"/>
|
||||
<ant:echo>Setting default output directory to ${outputDir}</ant:echo>
|
||||
</classpath>
|
||||
|
||||
</j:whitespace>
|
||||
</j:whitespace>
|
||||
Reference in new issue
Block a user