jvanzyl 01/09/24 11:44:15
Modified: src/tdk build.xml
src/tdk/apps/2 build.xml
src/tdk/apps/3 build.xml
Log:
- adding checks to the compile phase for a cvslayout app to make sure
that the WEB-INF directory is properly setup for testing and deployment.
Revision Changes Path
1.20 +5 -6 jakarta-turbine-tdk/src/tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 2001/09/24 17:12:51 1.19
+++ build.xml 2001/09/24 18:44:15 1.20
@@ -53,11 +53,7 @@
<antcall target="name-project-conf-files"/>
<antcall target="turbine-resources"/>
<antcall target="message"/>
-
- <mkdir dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/classes"/>
- <mkdir dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/db"/>
- <antcall target="deployment-descriptor"/>
- <antcall target="libs"/>
+ <antcall target="setup-webinf"/>
</target>
<target name="cvslayout-properties">
@@ -84,7 +80,10 @@
<antcall target="name-project-conf-files"/>
<antcall target="turbine-resources"/>
<antcall target="message"/>
-
+ <antcall target="setup-webinf"/>
+ </target>
+
+ <target name="setup-webinf">
<mkdir dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/db"/>
<mkdir dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/classes"/>
<antcall target="deployment-descriptor"/>
1.22 +21 -1 jakarta-turbine-tdk/src/tdk/apps/2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2001/09/24 16:49:49 1.21
+++ build.xml 2001/09/24 18:44:15 1.22
@@ -561,10 +561,30 @@
<!-- =================================================================== -->
<!-- C O M P I L E -->
<!-- =================================================================== -->
+
+ <target
+ name="check-webinf-exists">
+
+ <available
+ property="webinf-exists"
+ file="${tdk.home}/webapps/${tdk.project}/WEB-INF"
+ />
+ </target>
+
+ <!-- Setup the WEB-INF directory in the webapp if it already hasn't
+ been done. -->
+
+ <target
+ name="setup-webinf"
+ depends="check-webinf-exists"
+ unless="webinf-exists">
+
+ <ant dir="${tdk.home}" target="setup-webinf"/>
+ </target>
<target
name="compile"
- depends="setup"
+ depends="setup,setup-webinf"
description="--> compiles the source code">
<javac srcdir="${src.dir}/java"
1.12 +24 -1 jakarta-turbine-tdk/src/tdk/apps/3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/3/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 2001/09/22 18:14:58 1.11
+++ build.xml 2001/09/24 18:44:15 1.12
@@ -481,8 +481,31 @@
<!-- =================================================================== -->
<!-- C O M P I L E -->
<!-- =================================================================== -->
+
+ <target
+ name="check-webinf-exists">
+
+ <available
+ property="webinf-exists"
+ file="${tdk.home}/webapps/${tdk.project}/WEB-INF"
+ />
+ </target>
+
+ <!-- Setup the WEB-INF directory in the webapp if it already hasn't
+ been done. -->
+
+ <target
+ name="setup-webinf"
+ depends="check-webinf-exists"
+ unless="webinf-exists">
+
+ <ant dir="${tdk.home}" target="setup-webinf"/>
+ </target>
- <target name="compile" depends="setup" description="--> compiles the source code">
+ <target
+ name="compile"
+ depends="setup,setup-webinf"
+ description="--> compiles the source code">
<javac srcdir="${src.dir}/java"
destdir="${build.dest}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
