jvanzyl 01/09/12 11:52:18
Modified: . build.xml
Added: . build-docs.xml build-test.xml
Log:
- making separate build files for the docs and test.
Revision Changes Path
1.6 +2 -156 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/09/12 18:44:18 1.5
+++ build.xml 2001/09/12 18:52:18 1.6
@@ -17,11 +17,6 @@
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
<echo message=""/>
-
- <available property="jdom.present" classname="org.jdom.JDOMException">
- <classpath path="${java.class.path}"/>
- </available>
-
</target>
<!-- =================================================================== -->
@@ -75,14 +70,6 @@
<replacevalue><![CDATA[<Context path="" docBase="site" reloadable="true"/>]]>
</replacevalue>
</replace>
-
- <!--
-
- The actual packaging of tarballs and zip files
- is dealt with in a shell script now.
-
- -->
-
</target>
<!-- =================================================================== -->
@@ -93,87 +80,10 @@
<!-- Gather all the documentation required for the TDK. -->
<!-- =================================================================== -->
- <target name="docs-prepare-error" unless="jdom.present">
-
- <echo>
- The Jakarta-Site2 module is not present! Please check
- to make sure that you have checked it out from CVS.
-
- <http://jakarta.apache.org/site/jakarta-site2.html>
- </echo>
-
+ <target name="docs">
+ <ant antfile="build-docs.xml"/>
</target>
- <target
- name="docs"
- depends="docs-prepare-error"
- description="--> generates the HTML documentation"
- if="jdom.present">
-
- <taskdef
- name="anakia"
- classname="org.apache.velocity.anakia.AnakiaTask">
- </taskdef>
-
- <mkdir dir="${tdk.site}"/>
-
- <anakia
- basedir="${tdk.xdocs}"
- destdir="${tdk.site}/"
- extension=".html" style="./site.vsl"
- projectFile="stylesheets/project.xml"
- excludes="**/stylesheets/** empty.xml"
- includes="**/*.xml"
- lastModifiedCheck="true"
- templatePath="${site2.home}/xdocs/stylesheets">
- </anakia>
-
- <copy file="${turbine.home}/docs/images/logo.gif" todir="${tdk.site}/images"/>
-
- <!-- In case we have images someday
- <copy todir="${tdk.site}/images" filtering="no">
- <fileset dir="${tdk.xdocs}/images">
- <include name="**/*.gif"/>
- <include name="**/*.jpeg"/>
- <include name="**/*.jpg"/>
- </fileset>
- </copy>
- -->
-
- <!-- In case we have CSS someday
- <copy todir="${docs.dest}" filtering="no">
- <fileset dir="${docs.src}">
- <include name="**/*.css"/>
- </fileset>
- </copy>
- -->
-
- <!-- Copy documentation files from dependent modules -->
- <copy todir="${tdk.site}/ant-docs">
- <fileset dir="${ant.docs}"/>
- </copy>
-
- <copy todir="${tdk.site}/hypersonic-docs">
- <fileset dir="${hypersonic.docs}"/>
- </copy>
-
- <copy todir="${tdk.site}/servletapi-docs">
- <fileset dir="${servletapi.docs}"/>
- </copy>
-
- <copy todir="${tdk.site}/turbine-docs/apidocs">
- <fileset dir="${turbine.home}/docs/apidocs"/>
- </copy>
-
- <copy todir="${tdk.site}/turbine-docs">
- <fileset dir="${turbine-site.docs}"/>
- </copy>
-
- <copy todir="${tdk.site}/velocity-docs">
- <fileset dir="${velocity.docs}"/>
- </copy>
- </target>
-
<!-- =================================================================== -->
<!-- C L E A N -->
<!-- =================================================================== -->
@@ -183,68 +93,4 @@
<target name="clean">
<delete dir="${tdk.base}"/>
</target>
-
- <!-- =================================================================== -->
- <!-- T E S T -->
- <!-- =================================================================== -->
- <!-- This is the start of a test harness to try and make it easy -->
- <!-- to see if the TDK is working as a whole. -->
- <!-- =================================================================== -->
-
- <target name="test">
-
- <!-- NOTE: this has stopped working now. I don't know what in ant
- has changed and I don't have time right now to figure out
- why. This has step has been replaced with the test.sh script
- in this directory. -->
-
- <!--
- 1. Setup the test distribution
- -->
-
- <antcall target="test-dist"/>
-
- <!--
- 2. Generate the default sample app.
- -->
-
- <ant dir="../dist/tdk">
- <property name="tomcat.home" value="."/>
- </ant>
-
- <!--
- 3. Run the 'init' target for the sample app. This
- requires some tinkering to get the paths right,
- and we have to introduce a new 'fullPathOutputDirectory'
- specifically for the Ant <exec> task because it is
- not obeying the 'dir' attribute. So I can't use
- the same 'outputDirectory' for both the texen task
- that creates the 'create-database.sh' script and
- the <exec> task that executes. This is admittedly
- a bit of goat fuck, but it works so that I can
- create a TDK and test the sample app very rapidly.
- This is first step in making the TDK a replicable
- testing environment for other TDK developers.
- -->
-
- <ant
- dir="../dist/tdk/webapps/newapp/WEB-INF/build"
- target="create-database">
-
- <property
- name="schemaDirectory"
- value="../dist/tdk/webapps/newapp/WEB-INF/conf"
- />
- <property
- name="outputDirectory"
- value="../src"
- />
- <property
- name="fullPathOutputDirectory"
- value="../dist/tdk/webapps/newapp/WEB-INF/src"
- />
- </ant>
-
- </target>
-
</project>
1.1 jakarta-turbine-tdk/build-docs.xml
Index: build-docs.xml
===================================================================
<?xml version="1.0"?>
<project name="docs" default="main" basedir=".">
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<target name="init-tasks">
<available property="jdom.present" classname="org.jdom.JDOMException">
<classpath path="${java.class.path}"/>
</available>
</target>
<target name="docs-prepare-error" depends="init-tasks" unless="jdom.present">
<echo>
The Jakarta-Site2 module is not present! Please check
to make sure that you have checked it out from CVS.
<http://jakarta.apache.org/site/jakarta-site2.html>
</echo>
</target>
<target
name="main"
depends="docs-prepare-error"
description="--> generates the HTML documentation"
if="jdom.present">
<taskdef
name="anakia"
classname="org.apache.velocity.anakia.AnakiaTask">
</taskdef>
<mkdir dir="${tdk.site}"/>
<anakia
basedir="${tdk.xdocs}"
destdir="${tdk.site}/"
extension=".html" style="./site.vsl"
projectFile="stylesheets/project.xml"
excludes="**/stylesheets/** empty.xml"
includes="**/*.xml"
lastModifiedCheck="true"
templatePath="${site2.home}/xdocs/stylesheets">
</anakia>
<copy file="${turbine.home}/docs/images/logo.gif" todir="${tdk.site}/images"/>
<!-- In case we have images someday
<copy todir="${tdk.site}/images" filtering="no">
<fileset dir="${tdk.xdocs}/images">
<include name="**/*.gif"/>
<include name="**/*.jpeg"/>
<include name="**/*.jpg"/>
</fileset>
</copy>
-->
<!-- In case we have CSS someday
<copy todir="${docs.dest}" filtering="no">
<fileset dir="${docs.src}">
<include name="**/*.css"/>
</fileset>
</copy>
-->
<!-- Copy documentation files from dependent modules -->
<copy todir="${tdk.site}/ant-docs">
<fileset dir="${ant.docs}"/>
</copy>
<copy todir="${tdk.site}/hypersonic-docs">
<fileset dir="${hypersonic.docs}"/>
</copy>
<copy todir="${tdk.site}/servletapi-docs">
<fileset dir="${servletapi.docs}"/>
</copy>
<copy todir="${tdk.site}/turbine-docs/apidocs">
<fileset dir="${turbine.home}/docs/apidocs"/>
</copy>
<copy todir="${tdk.site}/turbine-docs">
<fileset dir="${turbine-site.docs}"/>
</copy>
<copy todir="${tdk.site}/velocity-docs">
<fileset dir="${velocity.docs}"/>
</copy>
</target>
</project>
1.1 jakarta-turbine-tdk/build-test.xml
Index: build-test.xml
===================================================================
<?xml version="1.0"?>
<project name="test" default="main" basedir=".">
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<target name="main">
<!-- NOTE: this has stopped working now. I don't know what in ant
has changed and I don't have time right now to figure out
why. This has step has been replaced with the test.sh script
in this directory. -->
<!--
1. Setup the test distribution
-->
<antcall target="test-dist"/>
<!--
2. Generate the default sample app.
-->
<ant dir="../dist/tdk">
<property name="tomcat.home" value="."/>
</ant>
<!--
3. Run the 'init' target for the sample app. This
requires some tinkering to get the paths right,
and we have to introduce a new 'fullPathOutputDirectory'
specifically for the Ant <exec> task because it is
not obeying the 'dir' attribute. So I can't use
the same 'outputDirectory' for both the texen task
that creates the 'create-database.sh' script and
the <exec> task that executes. This is admittedly
a bit of goat fuck, but it works so that I can
create a TDK and test the sample app very rapidly.
This is first step in making the TDK a replicable
testing environment for other TDK developers.
-->
<ant
dir="../dist/tdk/webapps/newapp/WEB-INF/build"
target="create-database">
<property
name="schemaDirectory"
value="../dist/tdk/webapps/newapp/WEB-INF/conf"
/>
<property
name="outputDirectory"
value="../src"
/>
<property
name="fullPathOutputDirectory"
value="../dist/tdk/webapps/newapp/WEB-INF/src"
/>
</ant>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
