You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2001/12/15 06:19:00 UTC
cvs commit: jakarta-avalon-phoenix docs.xml build.xml
donaldp 01/12/14 21:19:00
Modified: . docs.xml build.xml
Log:
Remove redundencies between build.xml and docs.xml and make build.xml delegate to docs.xml
Revision Changes Path
1.2 +5 -3 jakarta-avalon-phoenix/docs.xml
Index: docs.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/docs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docs.xml 2001/12/14 23:22:11 1.1
+++ docs.xml 2001/12/15 05:19:00 1.2
@@ -32,6 +32,7 @@
<property name="announce2readme" value="${tools.dir}/announcement2readme.xsl"/>
<property name="announce2site" value="${tools.dir}/announcement2site.xsl"/>
+ <property name="tools.dir" value="../jakarta-avalon/tools"/>
<property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
<path id="project.class.path">
@@ -40,6 +41,7 @@
</path>
<path id="tools.class.path">
+ <path refid="project.class.path"/>
<pathelement location="${xerces.jar}"/>
<pathelement location="${xalan.jar}"/>
<pathelement location="${tools.jar}"/>
@@ -112,9 +114,9 @@
<fileset dir="${xdocs.dir}"/>
</copy>
- <style style="${announce2txt}" in="${build.context}/xdocs/announcement.xml"
+ <style style="${announce2txt}" in="${build.context}/xdocs/announcement.xml"
out="Announcement.txt"/>
- <style style="${announce2header}" in="${build.context}/xdocs/announcement.xml"
+ <style style="${announce2header}" in="${build.context}/xdocs/announcement.xml"
out="${dist.base}/HEADER.html"/>
<style style="${announce2readme}" in="${build.context}/xdocs/announcement.xml"
out="${dist.base}/README.html"/>
@@ -138,7 +140,7 @@
<param name="-version"/>
<param name="-doctitle" value="${Name}"/>
<param name="-windowtitle" value="${Name} API"/>
- <param name="-bottom"
+ <param name="-bottom"
value=""Copyright © ${year} Apache Jakarta Project. All Rights Reserved.""/>
</doclet>
</javadoc>
1.92 +20 -231 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- build.xml 2001/12/15 04:59:43 1.91
+++ build.xml 2001/12/15 05:19:00 1.92
@@ -37,10 +37,6 @@
<property name="build.lib" value="${build.dir}/lib"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
- <property name="build.javadocs" value="${build.dir}/javadocs"/>
- <property name="build.docs" value="${build.dir}/docs"/>
- <property name="build.context" value="${build.dir}/documentation"/>
- <property name="build.xdocs" value="${build.context}/xdocs"/>
<!-- Set the properties for source directories -->
<property name="src.dir" value="src"/>
@@ -50,12 +46,6 @@
<property name="manifest.dir" value="${src.dir}/manifest"/>
<property name="lib.dir" value="lib"/>
<property name="tools.dir" value="../jakarta-avalon/tools"/>
- <property name="docs.dir" value="docs"/>
- <property name="www.dir" value="../jakarta-avalon-site/docs/${name}"/>
- <property name="avalon.skin" value="${tools.dir}/lib/jakarta-style.jar"/>
- <property name="xdocs.dir" value="${src.dir}/xdocs"/>
- <property name="javadocs.dir" value="${docs.dir}/api"/>
- <property name="context.dir" value="../jakarta-avalon/src/documentation"/>
<property name="dist.name" value="${name}-${version}"/>
<property name="dist.base" value="distributions"/>
@@ -75,11 +65,6 @@
<property name="jmxtools.jar" value="${lib.dir}/jmxtools.jar"/>
<property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
- <property name="announce2txt" value="${tools.dir}/announcement2txt.xsl"/>
- <property name="announce2header" value="${tools.dir}/announcement2header.xsl"/>
- <property name="announce2readme" value="${tools.dir}/announcement2readme.xsl"/>
- <property name="announce2site" value="${tools.dir}/announcement2site.xsl"/>
-
<path id="project.class.path">
<pathelement location="${xerces.jar}"/>
<pathelement location="${framework.jar}"/>
@@ -96,25 +81,17 @@
<pathelement path="${build.classes}" />
</path>
- <path id="tools.class.path">
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xalan.jar}"/>
- <pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib">
- <exclude name="ant.jar" />
- </fileset>
- </path>
-
<!-- Main target -->
<target name="main" depends="wrapper-dist"
description="generates the Phoenix distribution without the javadocs"/>
- <target name="all" depends="dist-lite,docs" description="generates the Phoenix distribution" />
+ <target name="all" depends="dist-lite" description="generates the Phoenix distribution">
+ <ant target="docs" antfile="docs.xml" inheritall="false" />
+ </target>
<!-- Help on usage -->
<target name="usage">
<echo message="Use the -projecthelp option instead"/>
</target>
-
<target name="help" depends="usage"/>
<!-- Check requirements of environment -->
@@ -131,31 +108,6 @@
</available>
</target>
- <!-- Setup the filters -->
- <target name="setup-filters">
- <filter token="Name" value="Avalon Phoenix"/>
- <filter token="name" value="phoenix"/>
- <filter token="version" value="${version}"/>
- <filter token="year" value="${year}"/>
- <filter token="status" value="${status}"/>
- <filter token="release" value="${release}"/>
- <filter token="short-version" value="${short.version}"/>
-
- <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
- <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
- <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
- <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
- <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
- <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
-
- <filter token="year" value="${year}"/>
- <filter token="AVALON_BASE" value="${avalon.base}"/>
- <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
- <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
- <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
- <filter token="LOGKIT_BASE" value="${logkit.base}"/>
- <filter token="TESTLET_BASE" value="${testlet.base}"/>
- </target>
<!-- Prepares the build directory -->
<target name="prepare" depends="check-environment">
@@ -174,52 +126,7 @@
</target>
- <!-- Create the announcements and HEADER.html -->
- <target name="changelog" depends="setup-filters">
-
- <taskdef name="clog" classname="org.apache.tools.ant.taskdefs.ChangeLog">
- <classpath refid="tools.class.path"/>
- </taskdef>
-
- <!-- Build change log -->
- <clog basedir="." output="ChangeLog" userlist="${tools.dir}/Users.properties" />
-
- <style in="ChangeLog" style="${tools.dir}/changelog.xsl" out="ChangeLog.html">
- <param name="module" expression="'jakarta-avalon-phoenix'"/>
- <param name="cvsweb" expression="'http://cvs.apache.org/viewcvs.cgi'"/>
- </style>
-
- </target>
-
- <!-- Create the announcements and HEADER.html -->
- <target name="announcement" depends="setup-filters">
-
- <mkdir dir="${build.dir}" />
- <mkdir dir="${dist.base}" />
-
- <copy todir="${build.context}" filtering="on">
- <fileset dir="${context.dir}">
- <exclude name="diagrams/**"/>
- <exclude name="resources/**"/>
- <exclude name="xdocs/**"/>
- </fileset>
- </copy>
-
- <copy todir="${build.xdocs}" filtering="on">
- <fileset dir="${xdocs.dir}"/>
- </copy>
- <style style="${announce2txt}" in="${build.context}/xdocs/announcement.xml"
- out="Announcement.txt"/>
- <style style="${announce2header}" in="${build.context}/xdocs/announcement.xml"
- out="${dist.base}/HEADER.html"/>
- <style style="${announce2readme}" in="${build.context}/xdocs/announcement.xml"
- out="${dist.base}/README.html"/>
- <style style="${announce2site}" in="${build.context}/xdocs/announcement.xml"
- out="jakarta-news.xml"/>
-
- </target>
-
<!-- Compiles the source code -->
<target name="compile" depends="prepare" description="compiles the source code">
@@ -262,124 +169,6 @@
</target>
- <!-- Create the API documentation -->
- <target name="javadocs" description="generates the API documentation">
-
- <delete dir="${build.javadocs}"/>
- <mkdir dir="${build.javadocs}"/>
-
- <javadoc packagenames="org.apache.*"
- sourcepath="${java.dir}"
- destdir="${build.javadocs}">
- <classpath refid="project.class.path" />
- <doclet name="com.sun.tools.doclets.standard.Standard">
- <param name="-author"/>
- <param name="-version"/>
- <param name="-doctitle" value="${Name}"/>
- <param name="-windowtitle" value="${Name} API"/>
- <param name="-bottom"
- value=""Copyright © 2001 Apache Jakarta Project. All Rights Reserved.""/>
- </doclet>
- </javadoc>
-
- </target>
-
- <!-- Create the Local API documentation -->
- <target name="local-javadocs" depends="javadocs">
-
- <delete dir="${javadocs.dir}"/>
- <mkdir dir="${javadocs.dir}"/>
-
- <copy todir="${javadocs.dir}">
- <fileset dir="${build.javadocs}" />
- </copy>
-
- </target>
-
- <target name="printer-friendly" depends="javadocs">
- <echo message="Printer friendly documentation is not available right now."/>
- </target>
-
- <!-- Prepares the documentation directory -->
- <target name="docs" depends="setup-filters,javadocs" description="generates the Phoenix documentation">
-
- <mkdir dir="${build.context}"/>
- <mkdir dir="${build.xdocs}"/>
- <mkdir dir="${build.docs}"/>
- <mkdir dir="${build.dir}/work"/>
-
- <!-- Base pointers for non-xdocs documentation. Override these in .ant.properties to link to local docs -->
- <copy todir="${build.context}" filtering="on">
- <fileset dir="${context.dir}">
- <exclude name="diagrams/**"/>
- <exclude name="resources/**"/>
- <exclude name="xdocs"/>
- </fileset>
- </copy>
-
- <copy todir="${build.context}/xdocs" filtering="on" overwrite="yes">
- <fileset dir="${xdocs.dir}"/>
- </copy>
-
- <copy todir="${build.context}/resources" filtering="off" overwrite="yes">
- <fileset dir="${context.dir}/resources"/>
- <fileset dir="${xdocs.dir}">
- <include name="**/images/**"/>
- </fileset>
- </copy>
-
- <java classname="org.apache.cocoon.Main" fork="true">
- <arg value="-c${build.context}/"/>
- <arg value="-d${build.docs}"/>
- <arg value="-w${build.dir}/work"/>
- <arg value="-l${build.dir}/work/cocoon.log"/>
- <arg value="-uINFO"/>
- <arg value="-f${xdocs.dir}/phoenix.uris"/>
- <classpath>
- <path refid="tools.class.path"/>
- <fileset dir="${tools.dir}/ext"/>
- </classpath>
- </java>
- </target>
-
- <!-- Create the Local site documentation -->
- <target name="local-xdocs" depends="docs">
-
- <delete>
- <fileset dir="${docs.dir}">
- <exclude name="api/**"/>
- </fileset>
- </delete>
- <mkdir dir="${docs.dir}"/>
-
- <copy todir="${docs.dir}">
- <fileset dir="${build.docs}" />
- </copy>
-
- </target>
-
- <target name="local-docs" depends="local-javadocs,local-xdocs"/>
-
- <!-- Update the www directory -->
- <target name="site-docs" depends="local-docs">
-
- <mkdir dir="${www.dir}"/>
-
- <!-- delete all old documents but keep CVS directories -->
- <!-- note that by doing an include the defaultexcludes (CVS dirs) will be kept -->
- <delete>
- <fileset dir="${www.dir}">
- <include name="**"/>
- </fileset>
- </delete>
-
- <mkdir dir="${www.dir}"/>
- <copy todir="${www.dir}">
- <fileset dir="${docs.dir}" />
- </copy>
-
- </target>
-
<!-- Creates all the .jar files -->
<target name="jars" depends="rmic">
@@ -477,11 +266,8 @@
<copy file="${wrapper.dll}" todir="${bin.dist.bin}"/>
<copy file="${conf.dir}/wrapper.conf" todir="${bin.dist.bin}"/>
</target>
-
- <target name="install" depends="wrapper-dist,install-check-cjan,install-check-phoenix">
- <mkdir dir="${cjan.lib}" />
- <copy file="${build.lib}/phoenix-client.jar" todir="${cjan.lib}"/>
+ <target name="install" depends="wrapper-dist,install-check-phoenix">
<mkdir dir="${phoenix.home}" />
@@ -494,16 +280,12 @@
</target>
- <target name="install-check-cjan" unless="cjan.lib">
- <fail message="cjan.lib not specified." />
- </target>
-
<target name="install-check-phoenix" unless="phoenix.home">
<fail message="phoenix.home not specified." />
</target>
<!-- Create the distribution -->
- <target name="bin-dist" depends="all,setup-filters">
+ <target name="bin-dist" depends="all">
<property name="bin.dist.docs" value="${bin.dist.dir}/docs"/>
<property name="bin.dist.javadocs" value="${bin.dist.dir}/docs/api"/>
@@ -512,18 +294,20 @@
<mkdir dir="${bin.dist.javadocs}"/>
<copy todir="${bin.dist.docs}">
- <fileset dir="${build.docs}"/>
+ <fileset dir="${build.dir}/docs"/>
</copy>
<copy todir="${bin.dist.javadocs}">
- <fileset dir="${build.javadocs}"/>
+ <fileset dir="${build.dir}/javadocs"/>
</copy>
+ <filter name="version" value="${version}"/>
+ <filter name="dist.name" value="${dist.name}"/>
<copy todir="${bin.dist.dir}" filtering="on">
<fileset dir=".">
<include name="README.txt"/>
<include name="WARNING.txt"/>
- <include name="LICENSE"/>
+ <include name="LICENSE.txt"/>
</fileset>
</copy>
@@ -532,7 +316,7 @@
</target>
<!-- Create the source distribution -->
- <target name="src-dist" depends="setup-filters">
+ <target name="src-dist">
<property name="src.dist.src" value="${src.dist.dir}/src"/>
<property name="src.dist.docs" value="${src.dist.dir}/docs"/>
@@ -562,11 +346,13 @@
<fileset dir="${build.javadocs}"/>
</copy>
+ <filter name="version" value="${version}"/>
+ <filter name="dist.name" value="${dist.name}"/>
<copy todir="${src.dist.dir}" filtering="on">
<fileset dir=".">
<include name="README.txt"/>
<include name="WARNING.txt"/>
- <include name="LICENSE"/>
+ <include name="LICENSE.txt"/>
<include name="BUILDING.txt"/>
<include name="build.xml"/>
</fileset>
@@ -578,7 +364,11 @@
</target>
<!-- Completely build all dists -->
- <target name="dist" depends="announcement,site-docs" description="generates the Phoenix distribution">
+ <target name="dist" description="generates the Phoenix distribution">
+
+ <ant target="site-docs" antfile="docs.xml" inheritall="false" />
+ <ant target="announcement" antfile="docs.xml" inheritall="false" />
+
<mkdir dir="${dist.base}"/>
<antcall target="bin-dist">
@@ -658,8 +448,7 @@
<target name="distclean" depends="clean" description="cleans up all generated files and directories">
<delete dir="${docs.dir}" />
<delete dir="${dist.base}" />
- <delete file="jakarta-news.xml" />
- <delete file="Announcement.txt" />
+ <ant target="clean" antfile="docs.xml" inheritall="false" />
</target>
</project>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>