You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ni...@apache.org on 2005/05/17 21:58:07 UTC
svn commit: r170648 - in /cocoon/trunk/tools/targets: admin-build.xml
compile-build.xml dist-build.xml docs-build.xml forrest-build.xml
ide-build.xml init-build.xml samples-build.xml standalone-demo-build.xml
test-build.xml validate-build.xml webapp-build.xml
Author: nicolaken
Date: Tue May 17 12:58:06 2005
New Revision: 170648
URL: http://svn.apache.org/viewcvs?rev=170648&view=rev
Log:
Removed targets: init, init-tasks, prepare
Made them top-level tasks
This makes the results of the above targets available to the whole build without having to declare a formal dependency.
Modified:
cocoon/trunk/tools/targets/admin-build.xml
cocoon/trunk/tools/targets/compile-build.xml
cocoon/trunk/tools/targets/dist-build.xml
cocoon/trunk/tools/targets/docs-build.xml
cocoon/trunk/tools/targets/forrest-build.xml
cocoon/trunk/tools/targets/ide-build.xml
cocoon/trunk/tools/targets/init-build.xml
cocoon/trunk/tools/targets/samples-build.xml
cocoon/trunk/tools/targets/standalone-demo-build.xml
cocoon/trunk/tools/targets/test-build.xml
cocoon/trunk/tools/targets/validate-build.xml
cocoon/trunk/tools/targets/webapp-build.xml
Modified: cocoon/trunk/tools/targets/admin-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/admin-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/admin-build.xml (original)
+++ cocoon/trunk/tools/targets/admin-build.xml Tue May 17 12:58:06 2005
@@ -38,7 +38,7 @@
force="true"/>
</target>
- <target name="generate-blocks.properties" depends="init">
+ <target name="generate-blocks.properties">
<xslt in="gump.xml"
out="blocks.properties"
style="${tools.src}/gump2blocks.properties.xsl"
Modified: cocoon/trunk/tools/targets/compile-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/compile-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/compile-build.xml (original)
+++ cocoon/trunk/tools/targets/compile-build.xml Tue May 17 12:58:06 2005
@@ -26,7 +26,7 @@
depends="compile-core, compile-deprecated, compile-tests"/>
<!-- compiles mocks -->
- <target name="compile-mocks" depends="prepare">
+ <target name="compile-mocks">
<mkdir dir="${build.mocks}"/>
<javac srcdir="${mocks}"
destdir="${build.mocks}"
@@ -63,7 +63,7 @@
</target>
<!-- compiles deprecated code -->
- <target name="compile-deprecated" depends="prepare, clover.off"
+ <target name="compile-deprecated" depends="clover.off"
unless="internal.exclude.deprecated">
<mkdir dir="${build.deprecated}"/>
<!--
@@ -212,7 +212,7 @@
<!-- === Block Targets =================================================== -->
<!-- prepares the blocks build -->
- <target name="prepare-blocks" depends="prepare">
+ <target name="prepare-blocks">
<mkdir dir="${build.blocks}"/>
<copy file="${gump.descriptor}" tofile="${build.temp}/gump.xml" overwrite="true"/>
@@ -240,7 +240,7 @@
target="compile"/>
</target>
- <target name="call-block-target" depends="prepare">
+ <target name="call-block-target">
<ant antfile="${build.temp}/blocks-build.xml"
inheritAll="true"
inheritRefs="false"
Modified: cocoon/trunk/tools/targets/dist-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/dist-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/dist-build.xml (original)
+++ cocoon/trunk/tools/targets/dist-build.xml Tue May 17 12:58:06 2005
@@ -21,7 +21,7 @@
Distribution targets
</description>
- <target name="dist" depends="init" description="[admin] Builds the distribution">
+ <target name="dist" description="[admin] Builds the distribution">
<mkdir dir="${dist.root}"/>
<mkdir dir="${dist}"/>
Modified: cocoon/trunk/tools/targets/docs-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/docs-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/docs-build.xml (original)
+++ cocoon/trunk/tools/targets/docs-build.xml Tue May 17 12:58:06 2005
@@ -42,7 +42,7 @@
<!-- tbd -->
</target>
- <target name="prepare-docs" unless="exclude.documentation" depends="init-tasks"
+ <target name="prepare-docs" unless="exclude.documentation"
description="Test documentation target">
<!-- create sitemap components: Task has to be rewritten -->
<!--sitemap-components docDir="build/xdocs/userdocs" source="./src/java"/-->
@@ -162,7 +162,7 @@
-->
<!-- Set a variable if the generated printer docs are already up-to-date. -->
<!--
- <target name="printer-docs_check" depends="prepare">
+ <target name="printer-docs_check">
<uptodate property="printer-docs.notrequired" targetfile="${build.docs.printer}/index.html" >
<srcfiles dir="." includes="status.xml"/>
<srcfiles dir="${docs}" includes="**/*.xml"/>
@@ -215,7 +215,7 @@
-->
<!-- Creates Javadocs -->
<!-- Obsolete:
- <target name="javadocs" depends="prepare, javadocs-check" unless="javadocs.notrequired" description="Builds the API documentation (javadocs)">
+ <target name="javadocs" depends="javadocs-check" unless="javadocs.notrequired" description="Builds the API documentation (javadocs)">
<condition property="javadoc.additionalparam" value="-breakiterator -tag todo:all:Todo:">
<equals arg1="1.4" arg2="${ant.java.version}"/>
Modified: cocoon/trunk/tools/targets/forrest-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/forrest-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/forrest-build.xml (original)
+++ cocoon/trunk/tools/targets/forrest-build.xml Tue May 17 12:58:06 2005
@@ -36,7 +36,7 @@
<import file="${env.FORREST_HOME}/forrest.build.xml" optional="true"/>
-->
- <target name="do-forrest" depends="prepare-extra-docs, prepare, prepare-docs, validate-jars, javadocs" unless="exclude.documentation" description="Generates static HTML documentation">
+ <target name="do-forrest" depends="prepare-extra-docs, prepare-docs, validate-jars, javadocs" unless="exclude.documentation" description="Generates static HTML documentation">
<antcall target="site"/>
</target>
Modified: cocoon/trunk/tools/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/ide-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/ide-build.xml (original)
+++ cocoon/trunk/tools/targets/ide-build.xml Tue May 17 12:58:06 2005
@@ -22,7 +22,7 @@
</description>
<!-- Build the Eclipse customized project's files -->
- <target name="eclipse-customized-project" depends="prepare" description="Generate the Eclipse customized project files (using local.block.properties)">
+ <target name="eclipse-customized-project" description="Generate the Eclipse customized project files (using local.block.properties)">
<echo message="Building Eclipse Customized Project Files"/>
<xslt in="${gump.descriptor}"
out="${build.temp}/blocks-eclipse.xml"
@@ -35,7 +35,7 @@
</target>
<!-- Generate the Emacs JDE project file -->
- <target name="emacs-project" depends="prepare" description="Generate the Emacs project files">
+ <target name="emacs-project" description="Generate the Emacs project files">
<path id="jar.files">
<fileset dir="${build.webapp}/WEB-INF/lib">
<include name="*.jar"/>
@@ -53,7 +53,7 @@
</target>
<!-- Build the Eclipse projects files -->
- <target name="eclipse-project" depends="prepare" description="Generate the Eclipse project files">
+ <target name="eclipse-project" description="Generate the Eclipse project files">
<echo message="Building Eclipse Project Files"/>
@@ -155,13 +155,13 @@
<target name="eclipse-webapp-prepare" depends="eclipse-webapp-delete-jars, eclipse-webapp-restore-roles"
description="Prepares the webapp directory to make it usable within Eclipse"/>
- <target name="eclipse-webapp-restore-roles" depends="prepare" description="Restore cocoon.roles (for use with eclipse)">
+ <target name="eclipse-webapp-restore-roles" description="Restore cocoon.roles (for use with eclipse)">
<copy file="${build.dest}/org/apache/cocoon/cocoon.roles"
tofile="${build.webapp}/WEB-INF/classes/org/apache/cocoon/cocoon.roles"
overwrite="yes"/>
</target>
- <target name="eclipse-webapp-delete-jars" depends="prepare">
+ <target name="eclipse-webapp-delete-jars">
<!-- delete all jars and class files, they are already included in the project -->
<delete>
<fileset dir="${build.webapp}/WEB-INF">
Modified: cocoon/trunk/tools/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/init-build.xml (original)
+++ cocoon/trunk/tools/targets/init-build.xml Tue May 17 12:58:06 2005
@@ -21,8 +21,6 @@
Initialization Targets
</description>
- <target name="init">
-
<!-- Set the timestamps -->
<tstamp/>
@@ -131,9 +129,6 @@
<path location="${build.dest}"/>
</path>
- </target>
-
- <target name="init-tasks" depends="init">
<!-- Set classpath for building ant tasks -->
<path id="tasks.classpath">
<path refid="classpath"/>
@@ -191,12 +186,10 @@
<pathelement location="tools/lib/ant-contrib-0.6.jar"/>
</classpath>
</taskdef>
- </target>
<!-- === Preparation Targets ============================================= -->
<!-- Prepare the build directory -->
- <target name="prepare" depends="init-tasks">
<echo>====================================================================
${fullname} ${version} [${year}]
====================================================================
@@ -210,7 +203,6 @@
- deprecation ... [${compiler.deprecation}]
====================================================================</echo>
<mkdir dir="${build}"/>
- </target>
<!-- === Clean Targets =================================================== -->
@@ -220,17 +212,17 @@
description="Cleans the cocoon build, webapp and standalone-demo"/>
<!-- Clean the cocoon build directory -->
- <target name="clean-cocoon" depends="init" description="Cleans the cocoon build">
+ <target name="clean-cocoon" description="Cleans the cocoon build">
<delete dir="${build}"/>
</target>
<!-- Clean the webapp -->
- <target name="clean-webapp" depends="init" description="Cleans the webapp">
+ <target name="clean-webapp" description="Cleans the webapp">
<delete dir="${build.webapp}"/>
</target>
<!-- Clean the standalone demo -->
- <target name="clean-standalone-demo" depends="init" description="Cleans the standalone-demo">
+ <target name="clean-standalone-demo" description="Cleans the standalone-demo">
<delete dir="${build.standalone.demo}"/>
</target>
</project>
Modified: cocoon/trunk/tools/targets/samples-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/samples-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/samples-build.xml (original)
+++ cocoon/trunk/tools/targets/samples-build.xml Tue May 17 12:58:06 2005
@@ -21,7 +21,7 @@
Samples Targets
</description>
- <target name="samples" depends="prepare, clover.off"
+ <target name="samples" depends="clover.off"
unless="internal.exclude.webapp.samples">
<mkdir dir="${build.samples}"/>
@@ -72,7 +72,7 @@
includes="**/*.xwelcome"/>
</target>
- <target name="block-samples" depends="prepare" unless="internal.exclude.webapp.samples">
+ <target name="block-samples" unless="internal.exclude.webapp.samples">
<ant antfile="${build.temp}/blocks-build.xml"
inheritAll="true"
inheritRefs="false"
Modified: cocoon/trunk/tools/targets/standalone-demo-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/standalone-demo-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/standalone-demo-build.xml (original)
+++ cocoon/trunk/tools/targets/standalone-demo-build.xml Tue May 17 12:58:06 2005
@@ -21,7 +21,7 @@
@author bdelacretaz@codeconsult.ch
-->
-<target name="standalone-demo" depends="init, webapp" description="build webapp and copy files for standalone demo">
+<target name="standalone-demo" depends="webapp" description="build webapp and copy files for standalone demo">
<!-- setup -->
<mkdir dir="${build.standalone.demo}"/>
Modified: cocoon/trunk/tools/targets/test-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/test-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/test-build.xml (original)
+++ cocoon/trunk/tools/targets/test-build.xml Tue May 17 12:58:06 2005
@@ -105,7 +105,7 @@
target="tests"/>
</target>
- <target name="junit-tests-report" depends="init">
+ <target name="junit-tests-report">
<mkdir dir="${build.test.report}"/>
<junitreport todir="${build.test.output}">
<fileset dir="${build.test.output}">
@@ -223,7 +223,7 @@
<clover-historypoint historyDir="${build}/clover/history"/>
</target>
- <target name="clover.report" depends="init, clover.on" if="clover.present">
+ <target name="clover.report" depends="clover.on" if="clover.present">
<clover-report>
<current outfile="${build}/clover-report">
<format type="html"/>
Modified: cocoon/trunk/tools/targets/validate-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/validate-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/validate-build.xml (original)
+++ cocoon/trunk/tools/targets/validate-build.xml Tue May 17 12:58:06 2005
@@ -22,7 +22,7 @@
</description>
<!-- Check if all the JAR files are properly declared in lib/jars.xml -->
- <target name="validate-jars" depends="prepare" unless="internal.exclude.validate.jars">
+ <target name="validate-jars" unless="internal.exclude.validate.jars">
<path id="all.jars">
<fileset dir="${lib}">
<include name="**/*.jar"/>
@@ -79,7 +79,7 @@
This needs to be done at the end of the build, because the cocoon.xconf
and cocoon.roles are automatically constructed.
-->
- <target name="validate-config" depends="prepare" unless="internal.exclude.validate.config">
+ <target name="validate-config" unless="internal.exclude.validate.config">
<echo message="Validating some important configuration files"/>
<echo message="Validating cocoon.xconf using a very basic RELAX NG grammar ..."/>
@@ -123,7 +123,7 @@
</target>
- <target name="validate-sitemaps" depends="init-tasks"
+ <target name="validate-sitemaps"
description="Standalone target to validate all sitemaps">
<echo message="Validating all sitemap.xmap using RELAX NG ..."/>
<echo>Note: This is experimental.
@@ -143,7 +143,7 @@
</jing>
</target>
- <target name="validate-stylesheets" depends="init-tasks"
+ <target name="validate-stylesheets"
description="Standalone target to validate all stylesheets">
<echo message="Validating all XSLT stylesheets using RELAX NG ..."/>
<jing rngfile="${webapp}/WEB-INF/entities/xslt-20020523.rng">
Modified: cocoon/trunk/tools/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/webapp-build.xml?rev=170648&r1=170647&r2=170648&view=diff
==============================================================================
--- cocoon/trunk/tools/targets/webapp-build.xml (original)
+++ cocoon/trunk/tools/targets/webapp-build.xml Tue May 17 12:58:06 2005
@@ -188,7 +188,7 @@
</jar>
</target>
- <target name="custom-conf" depends="init-tasks" description="Uses Cocoon's xpatch task to customize runtime configuration">
+ <target name="custom-conf" description="Uses Cocoon's xpatch task to customize runtime configuration">
<xpatch file="${build.webapp}/sitemap.xmap" srcdir="">
<include name="${customconf}/*.xmap" />
<include name="${customconf}/*.xpipe" />