stefano 2003/03/17 05:23:57
Modified: . build.xml
Log:
applied patch to fix the scratchpad package and samples. Thanks to Geoff Howard for
the patch.
Revision Changes Path
1.17 +7 -3 cocoon-2.1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 17 Mar 2003 00:47:42 -0000 1.16
+++ build.xml 17 Mar 2003 13:23:57 -0000 1.17
@@ -305,7 +305,7 @@
<!-- package the scratchpad -->
<target name="package-scratchpad" depends="compile-scratchpad"
unless="unless.exclude.scratchpad">
<jar jarfile="${build}/${name}-scratchpad.jar">
- <fileset dir="${build.scratchpad}"/>
+ <fileset dir="${build.scratchpad.dest}"/>
</jar>
</target>
@@ -704,6 +704,10 @@
<target name="prepare-webapp-samples" depends="prepare-webapp, samples,
block-samples, scratchpad-samples" unless="unless.exclude.webapp.samples"/>
+ <target name="prepare-webapp-scratchpad" depends="prepare-webapp,
compile-scratchpad" unless="unless.exclude.webapp.scratchpad">
+ <copy file="${build}/${name}-scratchpad.jar"
tofile="${build.webapp.lib}/${name}-${version}-scratchpad.jar"/>
+ </target>
+
<target name="prepare-webapp-deprecated" depends="prepare-webapp,init-xpatch"
unless="unless.exclude.deprecated">
<copy file="${build}/${name}-deprecated.jar"
tofile="${build.webapp.lib}/${name}-${version}-deprecated.jar"/>
<xpatch directory="${deprecated.conf}" extension="xconf"
configuration="${build.webapp}/WEB-INF/cocoon.xconf"/>
@@ -755,7 +759,7 @@
<xpatch directory="${documentation}" extension="xwelcome"
configuration="${build.webapp}/welcome.xml"/>
</target>
- <target name="webapp"
depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-idldocs,prepare-webapp-deprecated,validate-config,init-loader"/>
+ <target name="webapp"
depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-idldocs,prepare-webapp-deprecated,prepare-webapp-scratchpad,validate-config,init-loader"/>
<target name="war" depends="webapp">
<!-- A task to create manifest for webapp. -->
