You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2003/05/15 16:07:37 UTC
cvs commit: cocoon-2.1/src/targets admin-build.xml docs-build.xml
vgritsenko 2003/05/15 07:07:37
Modified: . build.properties forrest.properties
src/targets admin-build.xml docs-build.xml
Log:
"build site" builds forrest site in ../cocoon-site/site/2.1/
Revision Changes Path
1.16 +3 -0 cocoon-2.1/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.properties 13 May 2003 11:28:37 -0000 1.15
+++ build.properties 15 May 2003 14:07:36 -0000 1.16
@@ -149,5 +149,8 @@
dist.name=${name}-${version}
dist.target=${dist.root}
+# Site Directory
+site=../cocoon-site/site/2.1
+
# Legal
legal=legal
1.7 +1 -0 cocoon-2.1/forrest.properties
Index: forrest.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/forrest.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- forrest.properties 12 May 2003 13:21:37 -0000 1.6
+++ forrest.properties 15 May 2003 14:07:36 -0000 1.7
@@ -58,6 +58,7 @@
# Eg, if forrest.validate=false, then all others are false unless set to true.
#forrest.validate=true
#forrest.validate.xdocs=${forrest.validate}
+forrest.validate.xdocs=false
#forrest.validate.skinconf=${forrest.validate}
forrest.validate.sitemap=false
#forrest.validate.stylesheets=${forrest.validate}
1.6 +1 -1 cocoon-2.1/src/targets/admin-build.xml
Index: admin-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/admin-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- admin-build.xml 18 Apr 2003 08:30:02 -0000 1.5
+++ admin-build.xml 15 May 2003 14:07:36 -0000 1.6
@@ -1,7 +1,7 @@
<!-- === Admin targets ===================================================== -->
<!-- Creates the web site -->
- <target name="site" depends="docs, javadocs">
+ <target name="site" depends="forrest, javadocs">
<mkdir dir="${site}"/>
<copy todir="${site}" filtering="off">
<fileset dir="${build.docs}"/>
1.12 +0 -16 cocoon-2.1/src/targets/docs-build.xml
Index: docs-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/docs-build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- docs-build.xml 6 Apr 2003 04:13:22 -0000 1.11
+++ docs-build.xml 15 May 2003 14:07:36 -0000 1.12
@@ -70,21 +70,6 @@
<!-- Create docs -->
<target name="docs" depends="prepare-docs, validate-xdocs, docs_done" unless="docs.notrequired" description="Builds the documentation">
<mkdir dir="${build.docs}"/>
-<!--
- <java classname="org.apache.cocoon.Main" fork="true" dir="${build.context}" failonerror="true" maxmemory="128m">
- <arg value="-c."/>
- <arg value="-d../docs"/>
- <arg value="-w../temp/docs"/>
- <arg value="-b../brokenlinks.txt"/>
- <arg value="-k./logkit.xconf"/>
- <arg value="-u${build.docs.loglevel}"/>
- <arg value="-V"/>
- <arg value="index.html"/>
- <classpath>
- <path refid="documentation.classpath"/>
- </classpath>
- </java>
--->
<java classname="org.apache.cocoon.Main" fork="true" dir="${build.context}" failonerror="true" maxmemory="128m">
<arg value="-u${build.docs.loglevel}"/>
@@ -94,7 +79,6 @@
<path refid="documentation.classpath"/>
</classpath>
</java>
-
</target>
<!-- Prepares the printer-docs -->