You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2002/02/06 15:44:21 UTC
cvs commit: jakarta-turbine-3 build.xml default.properties deps.list
jvanzyl 02/02/06 06:44:21
Modified: . Tag: rundata_security_changes build.xml
default.properties deps.list
Log:
- using dvsl to render the xdocs
- cleaning up the build
Revision Changes Path
No revision
No revision
1.20.2.2 +44 -97 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- build.xml 5 Feb 2002 15:41:30 -0000 1.20.2.1
+++ build.xml 6 Feb 2002 14:44:21 -0000 1.20.2.2
@@ -27,6 +27,7 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-util.jar}"/>
<pathelement location="${dom4j.jar}"/>
+ <pathelement location="${dvsl.jar}"/>
<pathelement location="${fulcrum.jar}"/>
<pathelement location="${jaf.jar}"/>
<pathelement location="${log4j.jar}"/>
@@ -39,11 +40,11 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-util.jar}"/>
<pathelement location="${stratum.jar}"/>
-
+
<!-- AspectJ Jars for non-invasive use of aspects -->
<pathelement location="${aspectjrt.jar}"/>
<pathelement location="${aspectjtools.jar}"/>
-
+
<!-- Required for auto jar updating -->
<pathelement location="tdk.jar"/>
</path>
@@ -78,7 +79,7 @@
</target>
<!-- ================================================================== -->
- <!-- Prints useful build environment values -->
+ <!-- E N V I R O N M E N T -->
<!-- ================================================================== -->
<target name="env">
@@ -113,10 +114,10 @@
<!-- C O M P I L E -->
<!-- ================================================================== -->
- <target
+ <target
name="compile"
description="--> compiles the source code">
-
+
<mkdir dir="${build.dest}"/>
<javac
@@ -142,9 +143,10 @@
<!-- =================================================================== -->
<!-- A S P E C T C O M P I L E -->
<!-- =================================================================== -->
- <target
+
+ <target
name="acompile">
-
+
<!-- Move aspects into the build cycle -->
<copy todir="${build.src}/org" filtering="yes">
<fileset dir="${src.aspects.dir}/org">
@@ -152,7 +154,7 @@
</fileset>
</copy>
- <taskdef
+ <taskdef
name="ajc"
classname="org.aspectj.tools.ant.taskdefs.Ajc"/>
@@ -163,14 +165,14 @@
optimize="${optimize}">
<classpath refid="classpath"/>
</ajc>
-
+
</target>
<!-- ================================================================== -->
- <!-- Compiles the source directory and creates a .jar file -->
+ <!-- J A R -->
<!-- ================================================================== -->
- <target
+ <target
name="jar"
depends="compile"
description="--> generates the turbine.jar file (default)">
@@ -186,7 +188,7 @@
<!-- D I S T R I B U T I O N S -->
<!-- ================================================================== -->
- <target
+ <target
name="dist"
depends="jar,javadocs">
@@ -199,7 +201,7 @@
| C R E A T I N G B I N A R Y D I S T R I B U T I O N |
+-------------------------------------------------------+
</echo>
-
+
<mkdir dir="${distDir}"/>
<!-- Copy README and LICENSE -->
@@ -226,10 +228,10 @@
<include name="${final.name}/**"/>
</tarfileset>
</tar>
-
+
<gzip zipfile="${final.name}.tar.gz" src="${final.name}.tar"/>
<delete file="${final.name}.tar"/>
-
+
<!-- Create a zip file -->
<zip zipfile="${final.name}.zip">
<zipfileset dir="${build.dir}">
@@ -250,7 +252,7 @@
<include name="**/*.jar"/>
</fileset>
</delete>
-
+
<copy todir="${distDir}" file="default.properties"/>
<copy todir="${distDir}" file="build.xml"/>
@@ -267,10 +269,10 @@
<include name="${final.name}/**"/>
</tarfileset>
</tar>
-
+
<gzip zipfile="${final.name}-src.tar.gz" src="${final.name}-src.tar"/>
<delete file="${final.name}-src.tar"/>
-
+
<!-- Create a zip file -->
<zip zipfile="${final.name}-src.zip">
<zipfileset dir="${build.dir}">
@@ -294,10 +296,10 @@
</target>
<!-- ================================================================== -->
- <!-- jars the source directory -->
+ <!-- J A R S O U R C E -->
<!-- ================================================================== -->
- <target
+ <target
name="jarsrc"
description="--> generates the turbine.src.jar file containing source only">
@@ -309,81 +311,36 @@
</target>
<!-- ================================================================== -->
- <!-- A N A K I A D O C U M E N T A T I O N -->
+ <!-- D V S L D O C U M E N T A T I O N -->
<!-- ================================================================== -->
<target
- name="check_for_jdom">
+ name="docs">
- <available
- property="jdom.present"
- classname="org.jdom.JDOMException">
+ <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
<classpath>
- <fileset dir="${jakarta.site2}/lib">
- <include name="*.jar"/>
- </fileset>
+ <path refid="classpath"/>
</classpath>
- </available>
- </target>
+ </taskdef>
- <target depends="check_for_jdom" 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.
+ <!-- Make sure the target directory -->
+ <mkdir dir="${docs.dest}"/>
- <http://jakarta.apache.org/site/jakarta-site2.html>
- </echo>
- </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">
- <classpath>
- <fileset dir="${jakarta.site2}/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath>
- </taskdef>
-
- <anakia
- basedir="${docs.src}"
- destdir="${docs.dest}/"
- extension=".html" style="./site.vsl"
- projectFile="stylesheets/project.xml"
- excludes="**/stylesheets/** empty.xml"
- includes="**/*.xml"
- lastModifiedCheck="true"
- templatePath="${jakarta.site2}/xdocs/stylesheets">
- </anakia>
-
- <copy todir="${docs.dest}/images" filtering="no">
- <fileset dir="${docs.src}/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>
- -->
+ <dvsl
+ basedir="${docs.src}"
+ destdir="${docs.dest}/"
+ extension=".html"
+ style="${docs.src}/stylesheets/site.dvsl"
+ excludes="**/project.xml,**/template.xml"
+ includes="**/*.xml"
+ />
</target>
<!-- ================================================================== -->
- <!-- Creates the API documentation -->
+ <!-- J A V A D O C -->
<!-- ================================================================== -->
- <target
+ <target
name="javadocs"
description="--> generates the API documentation">
@@ -406,7 +363,7 @@
</target>
<!-- ================================================================== -->
- <!-- Cleans up the build directory -->
+ <!-- CLEAN -->
<!-- ================================================================== -->
<target name="clean" description="--> cleans up the build directory">
@@ -417,24 +374,14 @@
<!-- T E S T S -->
<!-- ================================================================== -->
- <target name="test" depends="compile"
- description="--> runs turbine unit tests">
+ <target
+ name="test"
+ depends="compile"
+ description="--> runs turbine unit tests">
<ant antfile="build-test.xml">
<property file="build.properties"/>
</ant>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Create the Turbine SQL for all the supported DBs. -->
- <!-- ================================================================== -->
-
- <target name="turbine-sql"
- depends="compile"
- description="--> generates the Turbine SQL for all the supported DBs">
-
- <ant antfile="build-turbine-sql.xml" dir="${basedir}"/>
</target>
</project>
1.12.2.1 +9 -3 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- default.properties 22 Jan 2002 15:09:35 -0000 1.12
+++ default.properties 6 Feb 2002 14:44:21 -0000 1.12.2.1
@@ -17,8 +17,6 @@
conf.dir = ./conf
javadoc.destdir = ./docs/apidocs
jakarta.site2 = ../jakarta-site2
-docs.src = ./xdocs
-docs.dest = ./docs
turbine.jars = ./lib
year = 1999-2001
debug = on
@@ -26,7 +24,7 @@
deprecation = off
# Please see the BUILDING.txt file for information
-# on the locations of where to find each of these
+# on the locations of where to find each of these
# jar files
velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
@@ -43,6 +41,14 @@
dom4j.jar = ${lib.repo}/dom4j-1.1.jar
commons-beanutils.jar = ${lib.repo}/commons-beanutils.jar
httpclient.jar = ${lib.repo}/httpclient.jar
+dvsl.jar = ${lib.repo}/velocity-dvsl-0.31.jar
+
+# -------------------------------------------------------------------
+# D O C U M E N T A T I O N
+# -------------------------------------------------------------------
+
+docs.src = ./xdocs
+docs.dest = ./docs
# -------------------------------------------------------------------
# T E S T I N G
1.2.2.1 +1 -0 jakarta-turbine-3/deps.list
Index: deps.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/deps.list,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- deps.list 17 Jan 2002 16:45:01 -0000 1.2
+++ deps.list 6 Feb 2002 14:44:21 -0000 1.2.2.1
@@ -5,6 +5,7 @@
commons-collections.jar
commons-util-0.1-dev.jar
dom4j-1.1.jar
+dvsl-0.31.jar
fulcrum-1.0.jar
httpclient.jar
httpunit.jar
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>