antonio 2003/12/20 02:02:39
Modified: tools/targets standalone-demo-build.xml docs-build.xml
compile-build.xml webapp-build.xml
instrumentation-build.xml admin-build.xml
tools/src blocks-build.xsl
Log:
Adding index=true in jar building + some beautify
Revision Changes Path
1.2 +5 -4 cocoon-2.1/tools/targets/standalone-demo-build.xml
Index: standalone-demo-build.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/tools/targets/standalone-demo-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- standalone-demo-build.xml 18 Nov 2003 17:20:23 -0000 1.1
+++ standalone-demo-build.xml 20 Dec 2003 10:02:39 -0000 1.2
@@ -55,8 +55,9 @@
</echo>
<!-- all done -->
- <echo>--- standalone-demo build ready!
-----------------------------------------</echo>
- <echo>See ${readme.txt} for more info.</echo>
-
<echo>--------------------------------------------------------------------------</echo>
+ <echo>--- standalone-demo build ready!
-----------------------------------------
+See ${readme.txt} for more info.
+--------------------------------------------------------------------------
+ </echo>
</target>
1.3 +9 -7 cocoon-2.1/tools/targets/docs-build.xml
Index: docs-build.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/tools/targets/docs-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docs-build.xml 19 Nov 2003 20:20:50 -0000 1.2
+++ docs-build.xml 20 Dec 2003 10:02:39 -0000 1.3
@@ -63,15 +63,18 @@
<!-- If generated docs are already up-to-date, print a message saying so.
-->
<target name="docs_done" depends="docs_check" if="docs.notrequired">
- <echo
message="-------------------------------------------------------------"/>
- <echo message="Not rebuilding docs, as they are up-to-date:"/>
- <echo message=" ${build.docs}/index.html is more recent than"/>
- <echo message=" status.xml, ${documentation}/xdocs/*.xml"/>
- <echo
message="-------------------------------------------------------------"/>
+ <echo>-------------------------------------------------------------
+Not rebuilding docs, as they are up-to-date:
+ ${build.docs}/index.html is more recent than
+ status.xml, ${documentation}/xdocs/*.xml
+-------------------------------------------------------------
+</echo>
</target>
<!-- Create docs -->
- <target name="docs" depends="validate-jars, prepare-docs, validate-xdocs,
docs_done, javadocs, forrest" unless="docs.notrequired" description="Builds the
documentation">
+ <target name="docs"
+ depends="validate-jars, prepare-docs, validate-xdocs, docs_done,
javadocs, forrest"
+ unless="docs.notrequired" description="Builds the documentation">
<!-- The docs are created using forrest, so we simply copy them for now
-->
<mkdir dir="${build.docs}"/>
@@ -206,4 +209,3 @@
inheritRefs="false"
target="javadocs"/>
</target>
-
1.6 +16 -12 cocoon-2.1/tools/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/tools/targets/compile-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compile-build.xml 26 Nov 2003 16:29:57 -0000 1.5
+++ compile-build.xml 20 Dec 2003 10:02:39 -0000 1.6
@@ -1,7 +1,8 @@
-<!-- === Compilation Targets
=================================================== -->
+<!-- === Compilation Targets =============================================
-->
<!-- compiles everything -->
- <target name="compile" depends="compile-core, compile-deprecated,
compile-tests"/>
+ <target name="compile"
+ depends="compile-core, compile-deprecated, compile-tests"/>
<!-- compiles the core -->
<target name="compile-core" depends="prepare">
@@ -40,13 +41,14 @@
</target>
<!-- compiles deprecated code -->
- <target name="compile-deprecated" depends="prepare"
unless="unless.exclude.deprecated">
+ <target name="compile-deprecated" depends="prepare"
+ unless="unless.exclude.deprecated">
<mkdir dir="${build.deprecated}"/>
<xpatch file="${build.dest}/org/apache/cocoon/cocoon.roles"
srcdir="${deprecated.conf}"
includes="**/*.xroles"/>
-
+
<javac srcdir="${deprecated.src}"
destdir="${build.deprecated}"
debug="${compiler.debug}"
@@ -59,7 +61,7 @@
<target name="compile-tests" depends="compile-core, compile-deprecated">
<mkdir dir="${build.test}"/>
-
+
<!-- Copy test files to build test dir -->
<copy todir="${build.test}" filtering="on">
<fileset dir="${test}" excludes="**/*.java"/>
@@ -87,14 +89,15 @@
classpathref="test.classpath"/>
</target>
-<!-- === Package Targets
======================================================= -->
+<!-- === Package Targets =================================================
-->
<!-- packages everything -->
- <target name="package" depends="package-core, package-deprecated,
package-testcase"/>
+ <target name="package"
+ depends="package-core, package-deprecated, package-testcase"/>
<!-- package the core -->
<target name="package-core" depends="compile-core, block-roles">
- <jar jarfile="${build}/${name}.jar" manifest="${java}/Manifest.mf">
+ <jar jarfile="${build}/${name}.jar" manifest="${java}/Manifest.mf"
index="true">
<fileset dir="${build.dest}">
<exclude name="**/Manifest.mf"/>
</fileset>
@@ -102,15 +105,16 @@
</target>
<!-- package deprecated code -->
- <target name="package-deprecated" depends="compile-deprecated"
unless="unless.exclude.deprecated">
- <jar jarfile="${build}/${name}-deprecated.jar">
+ <target name="package-deprecated" depends="compile-deprecated"
+ unless="unless.exclude.deprecated">
+ <jar jarfile="${build}/${name}-deprecated.jar" index="true">
<fileset dir="${build.deprecated}"/>
</jar>
</target>
<!-- package testcase code -->
<target name="package-testcase" depends="compile-tests">
- <jar jarfile="${build}/${name}-testcase.jar">
+ <jar jarfile="${build}/${name}-testcase.jar" index="true">
<fileset dir="${build.test}">
<include name="org/apache/cocoon/environment/mock/*"/>
<include
name="org/apache/cocoon/components/source/SourceResolverAdapter*"/>
@@ -120,7 +124,7 @@
</jar>
</target>
-<!-- === Block Targets
========================================================= -->
+<!-- === Block Targets ===================================================
-->
<!-- prepares the blocks build -->
<target name="prepare-blocks" depends="prepare">
1.6 +1 -1 cocoon-2.1/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/tools/targets/webapp-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- webapp-build.xml 19 Dec 2003 08:57:31 -0000 1.5
+++ webapp-build.xml 20 Dec 2003 10:02:39 -0000 1.6
@@ -141,7 +141,7 @@
<!-- Create WAR manifest -->
<manifest directory="${build.webapp.lib}"
manifest="${build.webapp}/WEB-INF/Manifest.mf"/>
<!-- Package WAR file -->
- <jar jarfile="${build.war}"
manifest="${build.webapp}/WEB-INF/Manifest.mf">
+ <jar jarfile="${build.war}"
manifest="${build.webapp}/WEB-INF/Manifest.mf" index="true">
<fileset dir="${build.webapp}"/>
</jar>
</target>
1.2 +3 -2 cocoon-2.1/tools/targets/instrumentation-build.xml
Index: instrumentation-build.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/tools/targets/instrumentation-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- instrumentation-build.xml 18 Nov 2003 17:20:23 -0000 1.1
+++ instrumentation-build.xml 20 Dec 2003 10:02:39 -0000 1.2
@@ -1,8 +1,9 @@
<target name="start-instrumentation-client" depends="init">
<property name="lib.instrumentation" value="tools/instrumentation/lib"/>
- <echo message="The version of the altrmi server libraries in
${lib.optional} must correspond"/>
- <echo message="to the version of the altrmi client libraries in
${lib.instrumentation}."/>
+ <echo>The version of the altrmi server libraries in ${lib.optional} must
correspond
+to the version of the altrmi client libraries in ${lib.instrumentation}.
+</echo>
<java classname="org.apache.excalibur.instrument.client.Main"
fork="true">
<classpath>
1.4 +2 -2 cocoon-2.1/tools/targets/admin-build.xml
Index: admin-build.xml
===================================================================
RCS file: /home/cvs//cocoon-2.1/tools/targets/admin-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admin-build.xml 9 Dec 2003 18:00:32 -0000 1.3
+++ admin-build.xml 20 Dec 2003 10:02:39 -0000 1.4
@@ -29,7 +29,7 @@
<!-- Format source code -->
<target name="format" depends="compile">
-
+
<taskdef name="jalopy"
classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
<classpath>
@@ -38,7 +38,7 @@
</fileset>
</classpath>
</taskdef>
-
+
<jalopy convention="tools/jalopy/conf/convention.xml"
history="file"
historymethod="adler32"
1.43 +1 -1 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===================================================================
RCS file: /home/cvs//cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- blocks-build.xsl 14 Dec 2003 23:24:44 -0000 1.42
+++ blocks-build.xsl 20 Dec 2003 10:02:39 -0000 1.43
@@ -424,7 +424,7 @@
<exclude name="**/samples/**/*.java"/>
</javac>
- <jar jarfile="{string('${build.blocks}')}/{$block-name}-block.jar">
+ <jar jarfile="{string('${build.blocks}')}/{$block-name}-block.jar"
index="true">
<fileset dir="{string('${build.blocks}')}/{$block-name}/dest">
<include name="org/**"/>
<include name="META-INF/**"/>
