jvanzyl 01/09/14 18:46:31
Modified: src/tdk build.xml
Log:
- restoring the class build
now for turbine 2.x the sample app functions in classic mode where
the sample application is located within the TDK structure, and the
cvslayout mode works where the sample application is located in
a directory located in parallel with the TDK structure.
Revision Changes Path
1.7 +9 -8 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2001/09/15 01:17:43 1.6
+++ build.xml 2001/09/15 01:46:31 1.7
@@ -15,22 +15,23 @@
<property file="tdk/build-classic.properties"/>
</target>
- <target name="cvs-layout" depends="cvs-layout-properties,properties">
+ <target name="cvslayout" depends="cvslayout-properties,properties">
<antcall target="build-base"/>
+ <antcall target="name-project-conf-files"/>
<antcall target="libs"/>
<antcall target="deployment-descriptor"/>
<antcall target="turbine-resources"/>
+ <antcall target="message"/>
<mkdir dir="webapps/${turbine.app}/WEB-INF/classes"/>
</target>
- <target name="cvs-layout-properties">
+ <target name="cvslayout-properties">
<property file="tdk/build-cvslayout.properties"/>
</target>
<target name="build-base">
<antcall target="webapp-structure"/>
<antcall target="application-template"/>
- <antcall target="name-project-conf-files"/>
</target>
<!-- =================================================================== -->
@@ -39,10 +40,11 @@
<target name="application" depends="properties">
<antcall target="build-base"/>
+ <antcall target="adjust-for-classic"/>
+ <antcall target="name-project-conf-files"/>
<antcall target="libs"/>
<antcall target="deployment-descriptor"/>
- <mkdir dir="${app.classes}"/>
- <antcall target="name-project-conf-files"/>
+ <mkdir dir="webapps/${turbine.app}/WEB-INF/classes"/>
<antcall target="turbine-resources"/>
<antcall target="message"/>
</target>
@@ -137,10 +139,7 @@
<!-- =================================================================== -->
<target name="webapp-structure">
-
<mkdir dir="${app.home}"/>
- <mkdir dir="${app.logs}"/>
-
</target>
<!-- ================================================================= -->
@@ -184,6 +183,8 @@
<filter token="CONF_DIR" value="${conf.dir}"/>
<filter token="TDK_HOME" value="${tdk.home}"/>
<filter token="TURBINE_VERSION" value="${turbine.version}"/>
+
+ <echo message="${app.home}"/>
<copy todir="${app.home}" filtering="yes">
<fileset dir="${app.src}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
