vmassol 2003/02/08 09:51:59
Modified: samples/servlet/src/scripts/share build.xml
samples/servlet build.xml
. gump.xml
Log:
Modified sample servlet build so that it works with Gump
Revision Changes Path
1.6 +3 -3 jakarta-cactus/samples/servlet/src/scripts/share/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/src/scripts/share/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 8 Feb 2003 11:17:11 -0000 1.5
+++ build.xml 8 Feb 2003 17:51:59 -0000 1.6
@@ -125,15 +125,15 @@
<pathelement location="${servlet.jar}"/>
<pathelement location="${jstl.jar}"/>
<pathelement location="${standard.jar}"/>
+
+ <!-- Add java classpath for Gump only -->
+ <path location="${java.class.path}"/>
</path>
<path id="cactus.classpath">
<pathelement location="${target.classes.java.dir}"/>
@cactus.clover.pathelement@
<path refid="project.classpath"/>
-
- <!-- Add java classpath for Gump only -->
- <path location="${java.class.path}"/>
</path>
<!--
1.6 +20 -2 jakarta-cactus/samples/servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/samples/servlet/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 8 Feb 2003 16:43:27 -0000 1.5
+++ build.xml 8 Feb 2003 17:51:59 -0000 1.6
@@ -320,7 +320,7 @@
<arg line="${test.args.list}"/>
<arg line="-buildfile ${target.sample.dir}/build.xml"/>
<arg value="test"/>
-
+
<classpath>
<pathelement path="${java.class.path}"/>
</classpath>
@@ -356,7 +356,18 @@
Generate the release
========================================================================
-->
- <target name="release" depends="clean,dist"
+ <target name="release.common" depends="dist">
+
+ <mkdir dir="${release.dir}"/>
+
+ <zip destfile="${release.dir}/${main.release.name}.zip">
+ <zipfileset dir="${dist.bin.dir}/${project.name.file}"
+ prefix="${main.release.name}"/>
+ </zip>
+
+ </target>
+
+ <target name="release" depends="clean,release.common"
description="Generate the release files">
<mkdir dir="${release.dir}"/>
@@ -366,6 +377,13 @@
prefix="${main.release.name}"/>
</zip>
+ </target>
+
+ <!-- Generate the release (for Gump). Does not clean the directories
+ because some class paths that are created by the build need to be
+ added to the Ant classpath before the build starts (because of the
+ use of build.sysclasspath=only by Gump -->
+ <target name="release.gump" depends="release.common">
</target>
</project>
1.54 +2 -2 jakarta-cactus/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/gump.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gump.xml 8 Feb 2003 16:41:01 -0000 1.53
+++ gump.xml 8 Feb 2003 17:51:59 -0000 1.54
@@ -296,7 +296,7 @@
<mkdir dir="samples/servlet/target-12/sample/target/classes/cactus"/>
<mkdir dir="samples/servlet/target-12/sample/target/conf/client"/>
- <ant buildfile="samples/servlet/build.xml" target="release">
+ <ant buildfile="samples/servlet/build.xml" target="release.gump">
<property name="project.version" value="@@DATE@@"/>
@@ -354,7 +354,7 @@
<mkdir dir="samples/servlet/target-13/sample/target/classes/cactus"/>
<mkdir dir="samples/servlet/target-13/sample/target/conf/client"/>
- <ant buildfile="samples/servlet/build.xml" target="release">
+ <ant buildfile="samples/servlet/build.xml" target="release.gump">
<property name="project.version" value="@@DATE@@"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
