You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ch...@apache.org on 2005/11/14 16:38:57 UTC
svn commit: r344146 - in /xmlgraphics/fop/trunk: build.xml forrest.properties
Author: chrisg
Date: Mon Nov 14 07:38:47 2005
New Revision: 344146
URL: http://svn.apache.org/viewcvs?rev=344146&view=rev
Log:
docs building with a simple forrest call instead of using import
(because of problems with plugin download and validation)
Modified:
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/forrest.properties
Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/build.xml?rev=344146&r1=344145&r2=344146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Mon Nov 14 07:38:47 2005
@@ -62,7 +62,7 @@
<fileset dir="${basedir}" id="dist.bin">
<include name="conf/**"/>
- <include name="docs/**"/>
+ <include name="build/site/**"/>
<include name="CHANGES"/>
<include name="LICENSE"/>
<include name="README"/>
@@ -72,7 +72,6 @@
<exclude name="docs/**"/>
<exclude name="src/**"/>
<exclude name="dist/**"/>
- <exclude name="build/**"/>
<exclude name="lib/**"/>
</fileset>
@@ -94,7 +93,7 @@
<exclude name="lib/classes/**"/>
<exclude name="lib/org/**"/>
<exclude name="lib/src/**"/>
- <exclude name="build/**"/>
+ <include name="build/site/**"/>
<include name="src/**"/>
<include name="conf/**"/>
<include name="hyph/hyphenation.dtd"/>
@@ -106,7 +105,7 @@
<include name="LICENSE"/>
<include name="README"/>
<include name="STATUS"/>
- <include name="build*"/>
+ <include name="build.*"/>
<include name="fop.bat"/>
<include name="fop"/>
</fileset>
@@ -194,9 +193,11 @@
<property name="dist.src.result.dir" value="${dist.src.dir}/${name}-${version}"/>
<!-- Importing Apache Forrest for building the docs -->
+ <!--
<property environment="env"/>
<property name="forrest.home" value="${env.FORREST_HOME}"/>
<import file="${env.FORREST_HOME}/main/forrest.build.xml" optional="true"/>
+ -->
<!-- =================================================================== -->
<!-- Initialization target -->
@@ -1028,11 +1029,15 @@
<!-- =================================================================== -->
<target name="docs" description="Generates documentation">
<echo message="Building documentation with Forrest..."/>
+ <!--
<echo message="Make sure that you have installed Apache Forrest and"/>
<echo message="the FORREST_HOME environment variable is set (see http://forrest.apache.org/)"/>
<echo message="FORREST_HOME = ${forrest.home}"/>
+ -->
+ <echo message="Make sure you have a propper Forrest installation (see http://forrest.apache.org/)"/>
- <antcall target="site"/>
+ <!--<antcall target="site"/>-->
+ <exec executable="forrest"/>
</target>
<!-- =================================================================== -->
@@ -1040,7 +1045,7 @@
<!-- =================================================================== -->
<target name="dist" depends="dist-src,dist-bin" description="Generates the distribution package"/>
- <target name="dist-bin" depends="all">
+ <target name="dist-bin" depends="all,docs">
<echo message="Building the binary distribution files (zip,tar)"/>
<fail message="A complete binary build requires Jimi" unless="jimi.present"/>
<fail message="A complete binary build requires JAI" unless="jai.present"/>
@@ -1069,7 +1074,7 @@
<delete file="${name}-${version}-bin.tar"/>
</target>
- <target name="dist-src" depends="all, javadocs">
+ <target name="dist-src" depends="all, javadocs, docs">
<echo message="Building the source distribution files (zip,tar)"/>
<mkdir dir="${dist.src.result.dir}"/>
<copy todir="${dist.src.result.dir}">
Modified: xmlgraphics/fop/trunk/forrest.properties
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/forrest.properties?rev=344146&r1=344145&r2=344146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/forrest.properties (original)
+++ xmlgraphics/fop/trunk/forrest.properties Mon Nov 14 07:38:47 2005
@@ -64,12 +64,13 @@
# validation properties
#forrest.validate=true
-#forrest.validate.xdocs=${forrest.validate}
-#forrest.validate.skinconf=${forrest.validate}
-#forrest.validate.sitemap=${forrest.validate}
-#forrest.validate.stylesheets=${forrest.validate}
-#forrest.validate.skins=${forrest.validate}
-#forrest.validate.skins.stylesheets=${forrest.validate.skins}
+forrest.validate=false
+forrest.validate.xdocs=${forrest.validate}
+forrest.validate.skinconf=${forrest.validate}
+forrest.validate.sitemap=${forrest.validate}
+forrest.validate.stylesheets=${forrest.validate}
+forrest.validate.skins=${forrest.validate}
+forrest.validate.skins.stylesheets=${forrest.validate.skins}
# *.failonerror=(true|false) - stop when an XML file is invalid
#forrest.validate.failonerror=true
@@ -103,3 +104,4 @@
# The names of plugins that are required to build the project
# comma separated list (no spaces)
# project.required.plugins=
+project.required.plugins=org.apache.forrest.plugin.output.pdf-0.1
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org