sylvain 2004/06/07 01:55:25
Modified: . status.xml
tools/targets compile-build.xml
tools/src blocks-build.xsl
Log:
New "build.archive-sources" build property to include java source files in
jar archives.
Revision Changes Path
1.354 +6 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- status.xml 7 Jun 2004 08:18:16 -0000 1.353
+++ status.xml 7 Jun 2004 08:55:25 -0000 1.354
@@ -205,6 +205,11 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="SW" type="update">
+ A new build property, "build.archive-sources", allows to include java
source files
+ in jar archives. Useful when using a non-released version to know what
sources
+ are used.
+ </action>
<action dev="CZ" type="fix" fixes-bug="28686">
Correct redirect handling for internal redirects.
</action>
1.12 +33 -0 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compile-build.xml 24 May 2004 11:42:16 -0000 1.11
+++ compile-build.xml 7 Jun 2004 08:55:25 -0000 1.12
@@ -123,6 +123,17 @@
<exclude name="**/Manifest.mf"/>
</fileset>
</jar>
+ <!-- optionally add source files to the core jar -->
+ <if>
+ <istrue value="${build.archive-sources}"/>
+ <then>
+ <jar jarfile="${build}/${name}.jar" update="yes">
+ <fileset dir="${java}">
+ <include name="**/*.java"/>
+ </fileset>
+ </jar>
+ </then>
+ </if>
</target>
<!-- package deprecated code -->
@@ -131,6 +142,17 @@
<jar jarfile="${build}/${name}-deprecated.jar" index="true">
<fileset dir="${build.deprecated}"/>
</jar>
+ <!-- optionally add source files to the jar -->
+ <if>
+ <istrue value="${build.archive-sources}"/>
+ <then>
+ <jar jarfile="${build}/${name}-deprecated.jar" update="yes">
+ <fileset dir="${deprecated.src}">
+ <include name="**/*.java"/>
+ </fileset>
+ </jar>
+ </then>
+ </if>
</target>
<!-- package testcase code -->
@@ -143,6 +165,17 @@
<include name="org/apache/cocoon/xml/WhitespaceFilter*"/>
</fileset>
</jar>
+ <!-- optionally add source files to the jar -->
+ <if>
+ <istrue value="${build.archive-sources}"/>
+ <then>
+ <jar jarfile="${build}/${name}-testcase.jar" update="yes">
+ <fileset dir="${test}">
+ <include name="**/*.java"/>
+ </fileset>
+ </jar>
+ </then>
+ </if>
</target>
<!-- === Block Targets ===================================================
-->
1.71 +11 -0 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.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- blocks-build.xsl 25 May 2004 12:53:43 -0000 1.70
+++ blocks-build.xsl 7 Jun 2004 08:55:25 -0000 1.71
@@ -438,6 +438,17 @@
</fileset>
</jar>
+ <if>
+ <istrue value="${{build.archive-sources}}"/>
+ <then>
+ <jar jarfile="${{build.blocks}}/{$block-name}-block.jar"
update="true">
+ <fileset dir="${{blocks}}/{$block-name}/java">
+ <include name="**/*.java"/>
+ </fileset>
+ </jar>
+ </then>
+ </if>
+
<!-- exclude sample classes from the block package -->
<mkdir dir="${{build.blocks}}/{$block-name}/samples"/>
<javac destdir="${{build.blocks}}/{$block-name}/samples"
