bwalding 2003/08/22 15:56:57
Modified: src/plugins-build/jxr plugin.jelly
Log:
Now copies stylesheet into jxr test output
PR: MAVEN-713
Submitted by: Unknown
Revision Changes Path
1.16 +19 -2 maven/src/plugins-build/jxr/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jxr/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 19 Aug 2003 04:45:06 -0000 1.15
+++ plugin.jelly 22 Aug 2003 22:56:57 -0000 1.16
@@ -72,8 +72,16 @@
<ant:copy file="${maven.jxr.stylesheet}"
tofile="${maven.jxr.destdir}/stylesheet.css"/>
+ <!-- XXX This is a dirty hack until the semantics of
pom.build.sourceDirectory are cleared up -->
+ <j:set var="sourceDir" value="${pom.build.sourceDirectory}"/>
+ <util:file var="sourceDirFile" name="${sourceDir}"/>
+
+ <j:if test="${!sourceDirFile.isAbsolute()}">
+ <j:set var="sourceDir" value="${basedir}/${sourceDir}"/>
+ </j:if>
+
<jxr:jxr
- sourceDir="${pom.build.sourceDirectory}"
+ sourceDir="${sourceDir}"
destDir="${maven.jxr.destdir}"
templateDir="${maven.jxr.templateDir}"
javadocDir="${javadocDestdir}"
@@ -84,9 +92,18 @@
<j:if test="${unitTestSourcesPresent == 'true'}">
<ant:mkdir dir="${maven.jxr.destdir.test}"/>
+ <j:set var="testSourceDir" value="${pom.build.unitTestSourceDirectory}"/>
+ <util:file var="testSourceDirFile" name="${testSourceDir}"/>
+
+ <j:if test="${!testSourceDirFile.isAbsolute()}">
+ <j:set var="testSourceDir" value="${basedir}/${testSourceDir}"/>
+ </j:if>
+
+ <ant:copy file="${maven.jxr.stylesheet}"
+ tofile="${maven.jxr.destdir.test}/stylesheet.css"/>
<jxr:jxr
- sourceDir="${pom.build.unitTestSourceDirectory}"
+ sourceDir="${testSourceDir}"
destDir="${maven.jxr.destdir.test}"
templateDir="${maven.jxr.templateDir}"
javadocDir="${null}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
