Update of /var/cvs/all/maven-base
In directory james.mmbase.org:/tmp/cvs-serv4391/maven-base
Modified Files:
maven.xml
Log Message:
MMB-1475 Nightly build does not contain generated documentation any more.
See also: http://cvs.mmbase.org/viewcvs/all/maven-base
See also: http://www.mmbase.org/jira/browse/MMB-1475
Index: maven.xml
===================================================================
RCS file: /var/cvs/all/maven-base/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- maven.xml 27 Mar 2008 20:53:38 -0000 1.12
+++ maven.xml 25 Apr 2008 15:19:07 -0000 1.13
@@ -225,7 +225,12 @@
<j:set var="rootString" value="./"/>
- <j:if test="${docfile.parent.length() > srcdir.length()}">
+ <!-- mu;tiproject adds some relativeness to the path which breaks the
calculations of the output file -->
+ <ant:dirname property="projectdir" file="${srcdir}" />
+ <ant:basename property="projectdoc" file="${srcdir}" />
+ <j:set var="docdir">${projectdir}/${projectdoc}</j:set>
+
+ <j:if test="${docfile.parent.length() > docdir.length()}">
<maven:get var="generatedir"
plugin="maven-sdocbook-plugin"
property="maven.sdocbook.generated"/>
@@ -233,7 +238,7 @@
plugin="maven-sdocbook-plugin"
property="maven.sdocbook.out"/>
- <j:set var="inputdir"
value="${docfile.parent.substring(srcdir.length())}"/>
+ <j:set var="inputdir"
value="${docfile.parent.substring(docdir.length())}"/>
<j:set var="outputname"
value="${outpath.substring(generatedir.length())}"/>
<mkdir dir="${generatedir}${inputdir}"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
