the doc builds again, reference and dev guide, in trunk
Benjamin Shine <ben <at> laszlosystems.com>
2006-07-06 03:06:08 GMT
As of rev 1258, the reference and dev guide build again.
Starting from a working svn-based build, svn up your vendor directory
to get docbook-xsl-1.65.1.
Then update openlaszlo/trunk/docs
then good old "ant doc" from LPS_HOME should build the doc.
Mamye, could you please check that the doc is included in the windows
and linux installers?
The mac installer didn't appear in the download directory, and I'm
not sure why, but that is a challenge for another day. Anyone who
builds on a mac should still be able to build the doc.
I haven't turned on javadoc building; that is also a task for another
day.
Thanks to Yossie for suggesting the particular sledgehammer I used to
get rid of the relative paths in the xsl... This relies on some since-
ant-1.6.3 features.
>> + <!--
>> + little tweak to refer to the location of docbook-xsl-1.65.1
>> relative to
>> + ${docbook-xsl} based on environment variables defined in
>> init task.
>> + -->
>> + <target name="fix-docbook-references" depends="init">
>> + <copy todir="xsl">
>> + <fileset dir="xsl" />
>> + <!-- copy the offending files from .xsl.proto to .xsl -->
>> + <globmapper from="*.xsl.proto" to="*.xsl"/>
>> + <!-- As we copy, replace the token
>> @LZ_DOCBOOK_XSL_HOME@ with
>> + the installation-dependent value for ${docbook-xsl}
>> -->
>> + <filterset>
>> + <filter token="LZ_DOCBOOK_XSL_HOME" value="${docbook-
>> xsl}" />
>> + </filterset>
>> + </copy>
>> + </target>
>> +
Begin forwarded message:
> From: Jim Grandy <jgrandy <at> openlaszlo.org>
> Date: July 5, 2006 7:35:39 PM PDT
> To: Ben Shine <ben <at> laszlosystems.com>
> Subject: Re: [Laszlo-checkins] r1259 - in openlaszlo/trunk: . docs/
> src docs/src/xsl docs/src/xsl/lib
>
> Yay!
>
> On Jul 5, 2006, at 5:32 PM, ben <at> openlaszlo.org wrote:
>
>> Author: ben
>> Date: 2006-07-05 20:32:51 -0400 (Wed, 05 Jul 2006)
>> New Revision: 1259
>>
>> Added:
>> openlaszlo/trunk/docs/src/xsl/common-html.xsl.proto
>> openlaszlo/trunk/docs/src/xsl/dguide-chm.xsl.proto
>> openlaszlo/trunk/docs/src/xsl/fast-dguide.xsl.proto
>> openlaszlo/trunk/docs/src/xsl/print.xsl.proto
>> Removed:
>> openlaszlo/trunk/docs/src/xsl/common-html.xsl
>> openlaszlo/trunk/docs/src/xsl/dguide-chm.xsl
>> openlaszlo/trunk/docs/src/xsl/fast-dguide.xsl
>> openlaszlo/trunk/docs/src/xsl/lib/lib.xsl
>> openlaszlo/trunk/docs/src/xsl/print.xsl
>> Modified:
>> openlaszlo/trunk/build.xml
>> openlaszlo/trunk/docs/src/build.xml
>> Log:
>> Reference guide, dev guide, deployer's guide, designer's guide all
>> build. Requires update to r1258 or later of your /home/ben/src/svn/
>> vendor directory, so you get docbook-xsl-1.65.1.
>>
>> Modified: openlaszlo/trunk/build.xml
>> ===================================================================
>> --- openlaszlo/trunk/build.xml 2006-07-06 00:00:06 UTC (rev 1258)
>> +++ openlaszlo/trunk/build.xml 2006-07-06 00:32:51 UTC (rev 1259)
>> @@ -236,7 +236,6 @@
>> <echo message=" platform: is ${build.platform}" />
>> <echo message=" Skipping prefetch is ${skip.prefetch}" />
>> <echo message=" Skipping wrappertest is $
>> {skip.wrappertest}" />
>> - <echo message=" classpath is ${my.classpath}" />
>>
>> <!-- We only support Java 1.4 and Java 1.5. This condition is
>> a bit loose
>> in that it only makes sure the java version _contains_
>> 1.4 or 1.5, not
>> @@ -511,15 +510,14 @@
>>
>> <!--================ Target [doc] ==============-->
>> <target name="doc"
>> - description="Build documentation BUT DON'T RIGHT NOW"
>> + description="Build documentation"
>> depends="init" unless="done.doc,skip.doc">
>> - <echo message="Building the reference." />
>> + <echo message="Building the reference, devguide, designer's
>> guide, and deployer's guide." />
>>
>> - <!-- Build the LZX reference -->
>> - <ant dir="docs/src" target="reference" />
>> + <ant dir="docs/src" />
>> +
>> + <echo message="skipping javadoc and lzx-catalog [bshine
>> 7.5.06]" />
>>
>> - <echo message="Skipping javadoc and lzx-catalog build
>> [bshine 6.28.06]" />
>> - <echo message="Skipping devguide. [bshine 6.28.06]" />
>> <?ignore
>> <!-- Build the public javadocs -->
>> <ant dir="WEB-INF/lps/server" target="javadoc-public" />
>>
>> Modified: openlaszlo/trunk/docs/src/build.xml
>> ===================================================================
>> --- openlaszlo/trunk/docs/src/build.xml 2006-07-06 00:00:06 UTC
>> (rev 1258)
>> +++ openlaszlo/trunk/docs/src/build.xml 2006-07-06 00:32:51 UTC
>> (rev 1259)
>> @@ -24,7 +24,10 @@
>> <pathelement path="../../3rd-party/jars/dev/xercesImpl.jar"/>
>> <pathelement path="${docbook-xsl}/extensions/saxon651.jar" />
>> </path>
>> -
>> +
>> + <!-- Lets us get environment variables so we know where to look
>> for docbook stuff. -->
>> + <property environment="env" />
>> +
>> <!-- Format a single html file and extract its examples. This
>> is a
>> helper target for the reference and tutorials builds. -->
>> <target name="format-one" depends="init">
>> @@ -59,7 +62,7 @@
>> <property file="${LPS_HOME}/build.properties"/>
>>
>> <!-- doc build properties -->
>> - <property name="docbook-xsl" value="${LZ_VENDOR_ROOT}/
>> docbook-xsl-1.65.1"/>
>> + <property name="docbook-xsl" value="${env.LZ_VENDOR_ROOT}/
>> docbook-xsl-1.65.1"/>
>> <property name="docs.output.dir" value="${LPS_HOME}/docs" />
>> <if><equals arg1="${release}" arg2="Production"
>> casesensitive="true"/>
>> <then>
>> @@ -145,6 +148,23 @@
>> <property name="docs.src.done.init" value="true" />
>> </target>
>>
>> + <!--
>> + little tweak to refer to the location of docbook-xsl-1.65.1
>> relative to
>> + ${docbook-xsl} based on environment variables defined in
>> init task.
>> + -->
>> + <target name="fix-docbook-references" depends="init">
>> + <copy todir="xsl">
>> + <fileset dir="xsl" />
>> + <!-- copy the offending files from .xsl.proto to .xsl -->
>> + <globmapper from="*.xsl.proto" to="*.xsl"/>
>> + <!-- As we copy, replace the token
>> @LZ_DOCBOOK_XSL_HOME@ with
>> + the installation-dependent value for ${docbook-xsl}
>> -->
>> + <filterset>
>> + <filter token="LZ_DOCBOOK_XSL_HOME" value="${docbook-
>> xsl}" />
>> + </filterset>
>> + </copy>
>> + </target>
>> +
>> <!--
>> targets relating to the reference:
>> -->
>> @@ -398,7 +418,7 @@
>> -->
>>
>> <target name="dguide-or-tutorials" description="Build the
>> tutorials"
>> - depends="init">
>> + depends="init,fix-docbook-references">
>> <!-- Copy the input files to the build directory. The
>> stylesheet
>> formats them and extracts the lzx programs as *.in
>> files. -->
>> <mkdir dir="${local.build.dir}"/>
>> @@ -555,7 +575,7 @@
>>
>> <!-- A parameterized target called by *.preprocess. Inputs are
>> local.input.dir, local.input.index, and local.build.dir -->
>> - <target name="book.preprocess"
>> depends="init,reference.target.db.exists">
>> + <target name="book.preprocess"
>> depends="init,reference.target.db.exists,fix-docbook-references">
>> <mkdir dir="${local.build.dir}"/>
>> <outofdate>
>> <sourcefiles>
>> @@ -949,7 +969,7 @@
>> -->
>>
>> <target name="build" description="Make the documentation"
>> - depends="reference,dguide,deployers,designers"/>
>> + depends="reference,dguide,deployers,designers"/>
>>
>> <target name="clean" depends="clean-reference,clean-
>> dguide,clean-deployers,clean-designers,clean-tutorials"
>> description="clean up generated files">
[...snip...]
benjamin shine
software engineer
ben <at> laszlosystems.com
RSS Feed