Update of /var/cvs/all
In directory james.mmbase.org:/tmp/cvs-serv18204
Modified Files:
.cvsignore project.properties maven.xml build.xml project.xml
Added Files:
build-xslt.xml build-documentation.xml
build-documentation.properties.default
Log Message:
Improvements in maven build for site and documentation generation
See also: http://cvs.mmbase.org/viewcvs/all
build-xslt.xml is new
build-documentation.xml is new
build-documentation.properties.default is new
Index: .cvsignore
===================================================================
RCS file: /var/cvs/all/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- .cvsignore 26 Nov 2005 17:49:45 -0000 1.5
+++ .cvsignore 25 Mar 2008 21:03:08 -0000 1.6
@@ -2,6 +2,6 @@
build.properties
download
.DS_Store
-.classpath
-.project
target
\ No newline at end of file
+.settings
+javacc
Index: project.properties
===================================================================
RCS file: /var/cvs/all/project.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- project.properties 21 Mar 2008 11:57:02 -0000 1.10
+++ project.properties 25 Mar 2008 21:03:08 -0000 1.11
@@ -20,3 +20,5 @@
maven.jar.manifest.MMBase.attributes.list = Vendor,URL,Comment,Version
maven.jar.manifest.MMBase.attribute.Vendor = MMBase Community
maven.jar.manifest.MMBase.attribute.Comment = The MMBase Content Management
System
+
+maven.sdocbook.files =
*.xml,administrators/**/*.xml,applications/**/*.xml,backenddevelopers/**/*.xml,frontenddevelopers/**/*.xml,general/**/*.xml,informationanalysts/**/*.xml,javadoc/**/*.xml,managers/**/*.xml,mmbase.org/**/*.xml,modules/**/*.xml
\ No newline at end of file
Index: maven.xml
===================================================================
RCS file: /var/cvs/all/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- maven.xml 21 Mar 2008 11:57:02 -0000 1.4
+++ maven.xml 25 Mar 2008 21:03:08 -0000 1.5
@@ -42,20 +42,19 @@
</preGoal>
-<!-- disabled documentation, because documentation dir contains xml's which
are not docs.
- <preGoal name="site"> -->
+ <preGoal name="site">
<!-- 1.5 TransformerFactory class -->
${systemScope.setProperty('javax.xml.transform.TransformerFactory','com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl')}
<!-- 1.4 TransformerFactory class
${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
-->
-<!-- disabled
+
<ant:xslt in="${basedir}/config/datatypes.xml"
out="${basedir}/documentation/build/datatypes.docbook.xml"
style="${basedir}/documentation/datatypes2docbook.xslt"
processor="trax">
</ant:xslt>
</preGoal>
--->
+
</project>
\ No newline at end of file
Index: build.xml
===================================================================
RCS file: /var/cvs/all/build.xml,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- build.xml 19 Mar 2008 11:39:31 -0000 1.168
+++ build.xml 25 Mar 2008 21:03:08 -0000 1.169
@@ -2,7 +2,7 @@
MMBase Build File
-$Id: build.xml,v 1.168 2008/03/19 11:39:31 pierre Exp $
+$Id: build.xml,v 1.169 2008/03/25 21:03:08 nklasens Exp $
=================
This build file can be used to build the following from CVS or from the source
@@ -747,6 +747,23 @@
</antcall>
<mkdir dir="${mmdocs.dir}/javadoc/complete" />
<echo message="Generating javadocs for ${javadoc.packages} to
${mmdocs.dir}/javadoc/complete" />
+ <!--
+ <packageset dir="${contributions.home}/aselect/src"
defaultexcludes="yes" />
+ <packageset dir="${contributions.home}/lucene/src"
defaultexcludes="yes" />
+ <packageset dir="${contributions.home}/mmbob/src"
defaultexcludes="yes" />
+ <packageset dir="${contributions.home}/thememanager/src"
defaultexcludes="yes" />
+ <packageset dir="${contributions.home}/multilanguagegui/src"
defaultexcludes="yes" />
+
+ <fileset dir="${contributions.home}/lucene/">
+ <include name="**/*.jar"/>
+ <include name="**/*.zip"/>
+ </fileset>
+ <fileset dir="${contributions.home}/aselect/">
+ <include name="**/*.jar"/>
+ <include name="**/*.zip"/>
+ </fileset>
+ -->
+
<javadoc packagenames="${javadoc.packages}"
destdir="${mmdocs.dir}/javadoc/complete"
author="true"
@@ -766,11 +783,6 @@
<link offline="true"
packagelistLoc="${expand.dir}/${log4j.fullversion}/docs/api"
href="http://logging.apache.org/log4j/docs/api/"; />
<packageset dir="${source.dir}/src" defaultexcludes="yes" />
<packageset dir="${generated-source-src.dir}" defaultexcludes="yes" />
- <packageset dir="${contributions.home}/aselect/src"
defaultexcludes="yes" />
- <packageset dir="${contributions.home}/lucene/src" defaultexcludes="yes"
/>
- <packageset dir="${contributions.home}/mmbob/src" defaultexcludes="yes"
/>
- <packageset dir="${contributions.home}/thememanager/src"
defaultexcludes="yes" />
- <packageset dir="${contributions.home}/multilanguagegui/src"
defaultexcludes="yes" />
<packageset dir="${applications.home}/cloudcontext/src"
defaultexcludes="yes" />
<packageset dir="${applications.home}/clustering/src"
defaultexcludes="yes" />
<packageset dir="${applications.home}/crontab/src" defaultexcludes="yes"
/>
@@ -806,14 +818,6 @@
<include name="**/*.jar"/>
<include name="**/*.zip"/>
</fileset>
- <fileset dir="${contributions.home}/lucene/">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
- <fileset dir="${contributions.home}/aselect/">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
<fileset dir="${applications.home}/scan/"> <!-- to avoid warning in
xmlimporter javadoc -->
<include name="**/*.jar"/>
<include name="**/*.zip"/>
@@ -1092,7 +1096,7 @@
<ant dir="${applications.home}" target="install">
<property name="build.documentation" value="true" />
</ant>
- <ant dir="${documentation.home}" target="documentation">
+ <ant target="documentation" antfile="build-documentation.xml">
<property name="mmbase.default.dir" value=".." />
<property name="download.dir" value="${download.dir}" />
<property name="documentation.dest.dir" value="${mmdocs.dir}"/>
@@ -1124,7 +1128,7 @@
<!-- Clean the documentation directory -->
<!-- =================================================================== -->
<target name="clean.documentation" description="Clean the generated
documentation">
- <ant dir="${documentation.home}" target="clean">
+ <ant target="clean" antfile="build-documentation.xml">
<property name="mmbase.default.dir" value=".." />
<property name="download.dir" value="${download.dir}" />
<property name="documentation.dest.dir" value="${mmdocs.dir}"/>
Index: project.xml
===================================================================
RCS file: /var/cvs/all/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- project.xml 21 Mar 2008 13:42:12 -0000 1.7
+++ project.xml 25 Mar 2008 21:03:08 -0000 1.8
@@ -56,15 +56,21 @@
</includes>
<filtering>false</filtering>
</resource>
-<!-- This does not work the same way as the ant build does.
- We have to change more in the build to get it working
--->
+ <resource>
+ <targetPath>${basedir}/META-INF</targetPath>
+ <directory>META-INF</directory>
+ <excludes>
+ <exclude>"**/CVS"</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ </resource>
<resource>
<targetPath>org/mmbase/config</targetPath>
<directory>config</directory>
<excludes>
<exclude>"**/CVS"</exclude>
</excludes>
+ <filtering>false</filtering>
</resource>
</resources>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
