You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by gl...@apache.org on 2001/06/17 15:06:34 UTC
cvs commit: jakarta-taglibs build.xml common.xml common.properties
glenn 01/06/17 06:06:34
Modified: . build.xml common.xml common.properties
Log:
Final cleanup of building docs so that links work both from local file system and from jakarta site
Revision Changes Path
1.30 +2 -2 jakarta-taglibs/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 2001/06/13 12:48:45 1.29
+++ build.xml 2001/06/17 13:06:34 1.30
@@ -1,5 +1,5 @@
<!-- ANT Build Script for the JAKARTA-TAGLIBS Project -->
-<!-- $Id: build.xml,v 1.29 2001/06/13 12:48:45 glenn Exp $ -->
+<!-- $Id: build.xml,v 1.30 2001/06/17 13:06:34 glenn Exp $ -->
<project name="jakarta-taglibs" default="dist" basedir=".">
@@ -78,7 +78,7 @@
depends="prepare,static">
<!-- Create dynamically generated documentation -->
<style basedir="src/doc" destdir="${build.dir}/doc"
- extension=".html" style="stylesheets/taglibs.xsl" includes="*.xml"/>
+ extension=".html" style="stylesheets/taglibs.xsl" includes="*.xml" excludes="project.xml"/>
<copy todir="${build.dir}/doc">
<fileset dir="doc">
<include name="**/*.html"/>
1.8 +8 -8 jakarta-taglibs/common.xml
Index: common.xml
===================================================================
RCS file: /home/cvs/jakarta-taglibs/common.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- common.xml 2001/06/16 02:51:07 1.7
+++ common.xml 2001/06/17 13:06:34 1.8
@@ -91,7 +91,9 @@
<fileset dir="${doc.src}/conf"/>
</copy>
<style basedir="${doc.src}/web" destdir="${build.doc}"
- extension=".html" style="${taglibs.xsl}" includes="*.xml"/>
+ extension=".html" style="${taglibs.xsl}" includes="*.xml">
+ <param name="prefix" expression="../../"/>
+ </style>
<copy todir="${build.doc}">
<fileset dir="${doc.src}/web" includes="**/*.html"/>
<fileset dir="${taglib-doc-kit.dir}" includes="*.css"/>
@@ -125,7 +127,6 @@
<copy toDir="${build.examples}">
<fileset dir="${examples.src}/web"/>
</copy>
- <copy file="${source.tld}" toFile="${examples.tld}"/>
<copy file="${dist.library}/${taglib.name}.jar"
toFile="${build.examples}/WEB-INF/lib/${taglib.name}.jar"/>
<copy todir="${build.examples}" >
@@ -179,7 +180,6 @@
<!-- =================================================================== -->
<target name="library" depends="prepare">
<antcall target="${library.pre}"/>
- <copy file="${source.tld}" toFile="${library.tld}"/>
<javac srcdir="${library.src}" destdir="${build.library}"
classpath="${classpath}" debug="on"/>
<antcall target="${library.post}"/>
@@ -190,7 +190,7 @@
<!-- =================================================================== -->
<target name="documentation-dist" depends="documentation">
<antcall target="${documentation-dist.pre}"/>
- <jar jarfile="${dist.doc}" basedir="${build.doc}"/>
+ <jar jarfile="${dist.doc}" basedir="${build.doc}" excludes="intro.html"/>
<mkdir dir="${taglibs.doc}"/>
<copy todir="${taglibs.doc}">
<fileset dir="${build.doc}">
@@ -214,9 +214,10 @@
<!-- =================================================================== -->
<target name="library-dist" depends="library">
<antcall target="${library-dist.pre}"/>
+ <copy file="${examples.tld}" toFile="${library.tld}"/>
<jar jarfile="${dist.library}/${taglib.name}.jar"
basedir="${build.library}"/>
- <copy file="${source.tld}" toFile="${dist.tld}"/>
+ <copy file="${examples.tld}" toFile="${dist.tld}"/>
<antcall target="${library-dist.post}"/>
</target>
@@ -265,11 +266,10 @@
<include name="*.xml" />
</style>
<style basedir="${xml.src}"
- destdir="${doc.src}/web"
+ destdir="${build.doc}"
style="${taglib-doc.xsl}"
extension=".html">
<include name="*.xml" />
- <exclude name="**/*.css" />
</style>
- <copy file="${taglib-doc-kit.dir}/taglib.css" todir="${doc.src}/web"/>
+ <move file="${build.doc}/${taglib.name}.html" tofile="${build.doc}/index.html"/>
</target>
1.4 +0 -1 jakarta-taglibs/common.properties
Index: common.properties
===================================================================
RCS file: /home/cvs/jakarta-taglibs/common.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- common.properties 2001/06/13 12:49:06 1.3
+++ common.properties 2001/06/17 13:06:34 1.4
@@ -72,7 +72,6 @@
dist.examples = ${dist.dir}/${taglib.name}/${taglib.name}-examples.war
dist.library = ${dist.dir}/${taglib.name}
dist.tld = ${dist.dir}/${taglib.name}/${taglib.name}.tld
-source.tld = ${conf.src}/${taglib.name}.tld
examples.tld = ${build.examples}/WEB-INF/${taglib.name}.tld
library.tld = ${build.library}/META-INF/taglib.tld
dev.examples = ${examples.src}