jvanzyl 01/09/17 14:27:49
Modified: . README.txt build.xml
src/tdk build.properties build.xml
src/tdk/apps/2 build.xml
src/tdk/apps/3 build.xml
Removed: . build-test.xml
Log:
- applying jeff's patche to make sure that tdk.home is defined.
Revision Changes Path
1.2 +0 -5 jakarta-turbine-tdk/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.txt 2001/09/07 01:40:04 1.1
+++ README.txt 2001/09/17 21:27:48 1.2
@@ -9,13 +9,8 @@
Please consult the documentation in each of the lower level directories for
information that is specific to their contents.
-build/ This is where the build scripts live.
-docs/ This is where the documentation lives.
xdocs/ This is the new XML based documentation that uses Anakia.
src/ This is where all of the source code for TDK lives.
-lib/ This is where the libraries necessary to build and run the
- sample application in the TDK.
-test/ Information about testers.
If you have sucessfully built the TDK before, the tdkcurrent.sh
file will automate your builds from now on. Documentation on
1.10 +7 -0 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 2001/09/15 14:29:20 1.9
+++ build.xml 2001/09/17 21:27:48 1.10
@@ -82,4 +82,11 @@
<target name="clean">
<delete dir="${tdk.base}"/>
</target>
+
+ <target name="test">
+ <antcall target="test-dist"/>
+ <ant dir="dist/tdk"/>
+ <ant dir="dist/tdk/webapps/newapp/WEB-INF/build" target="init"/>
+ </target>
+
</project>
1.6 +0 -2 jakarta-turbine-tdk/src/tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties 2001/09/17 18:45:07 1.5
+++ build.properties 2001/09/17 21:27:49 1.6
@@ -9,12 +9,10 @@
target.directory = org/mycompany/newapp
# -------------------------------------------------------------------------
-# If you move the tdk location, define an absolute path here.
# If you want to change where the generated applications are placed, use
# and absolute path here.
# -------------------------------------------------------------------------
-tdk.home = ${user.home}/tdk
turbine.app.loc = ${tdk.home}/..
# -------------------------------------------------------------------------
1.10 +29 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 2001/09/17 18:45:07 1.9
+++ build.xml 2001/09/17 21:27:49 1.10
@@ -7,6 +7,33 @@
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
+ <!-- ================================================================ -->
+ <!-- S E T U P T A R G E T -->
+ <!-- ================================================================ -->
+ <!-- Check that properties are defined correctly. -->
+ <!-- ================================================================ -->
+
+ <target name="setup">
+ <!-- Verify tdk.home has been set -->
+ <available file="${tdk.home}" type="dir" property="tdk.home.defined"/>
+ <!-- Emit warning if need properties have not been set -->
+ <antcall target="check_tdk.home"/>
+ </target>
+
+ <target name="check_tdk.home" unless="tdk.home.defined">
+ <echo>
+ ***
+ * ERROR : The 'tdk.home' property is not defined or
+ * is pointing to an invalid directory.
+ *
+ * In your personal build.properties define tdk.home to
+ * point to an absolute path where your tdk is installed.
+ * Example: tdk.home=${user.home}/tdk
+ ***
+ </echo>
+ <fail message="ERROR: tdk.home not defined properly: ${tdk.home}"/>
+ </target>
+
<!-- =================================================================== -->
<!-- P R O P E R T I E S -->
<!-- =================================================================== -->
@@ -15,7 +42,7 @@
<property file="tdk/build-classic.properties"/>
</target>
- <target name="cvslayout" depends="cvslayout-properties,properties">
+ <target name="cvslayout" depends="setup,cvslayout-properties,properties">
<antcall target="build-base"/>
<antcall target="name-project-conf-files"/>
<antcall target="libs"/>
@@ -38,7 +65,7 @@
<!-- S A M P L E A P P L I C A T I O N -->
<!-- =================================================================== -->
- <target name="application" depends="properties">
+ <target name="application" depends="setup,properties">
<antcall target="build-base"/>
<antcall target="adjust-for-classic"/>
<antcall target="name-project-conf-files"/>
1.9 +31 -4 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/09/17 18:45:07 1.8
+++ build.xml 2001/09/17 21:27:49 1.9
@@ -16,13 +16,40 @@
</path>
<!-- ================================================================ -->
+ <!-- S E T U P T A R G E T -->
+ <!-- ================================================================ -->
+ <!-- Check that properties are defined correctly. -->
+ <!-- ================================================================ -->
+
+ <target name="setup">
+ <!-- Verify tdk.home has been set -->
+ <available file="${tdk.home}" type="dir" property="tdk.home.defined"/>
+ <!-- Emit warning if need properties have not been set -->
+ <antcall target="check_tdk.home"/>
+ </target>
+
+ <target name="check_tdk.home" unless="tdk.home.defined">
+ <echo>
+ ***
+ * ERROR : The 'tdk.home' property is not defined or
+ * is pointing to an invalid directory.
+ *
+ * In your personal build.properties define tdk.home to
+ * point to an absolute path where your tdk is installed.
+ * Example: tdk.home=${user.home}/tdk
+ ***
+ </echo>
+ <fail message="ERROR: tdk.home not defined properly: ${tdk.home}"/>
+ </target>
+
+ <!-- ================================================================ -->
<!-- I N I T T A S K T A R G E T -->
<!-- ================================================================ -->
<!-- Taskdefs are defined inside this target as Ant seems to have -->
<!-- problems defining them at the top level. -->
<!-- ================================================================ -->
- <target name="init-tasks">
+ <target name="init-tasks" depends="setup">
<taskdef name="torque-sql"
classname="org.apache.turbine.torque.TorqueSQLTask">
<classpath refid="classpath"/>
@@ -425,7 +452,7 @@
<!-- C O M P I L E -->
<!-- =================================================================== -->
- <target name="compile" description="--> compiles the source code">
+ <target name="compile" depends="setup" description="--> compiles the source code">
<javac srcdir="${src.dir}"
destdir="${build.dest}"
@@ -443,7 +470,7 @@
<!-- C O M P I L E T E S T S -->
<!-- =================================================================== -->
- <target name="compile-tests" description="--> compiles the test code">
+ <target name="compile-tests" depends="setup" description="--> compiles the test
code">
<javac srcdir="${test.src.dir}"
destdir="${build.dest}"
@@ -461,7 +488,7 @@
<!-- T E S T -->
<!-- =================================================================== -->
- <target name="test" description="--> runs the tests">
+ <target name="test" depends="setup" description="--> runs the tests">
<junit printsummary="yes" >
<formatter type="plain" />
1.6 +31 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/09/17 18:45:07 1.5
+++ build.xml 2001/09/17 21:27:49 1.6
@@ -17,13 +17,40 @@
</path>
<!-- ================================================================ -->
+ <!-- S E T U P T A R G E T -->
+ <!-- ================================================================ -->
+ <!-- Check that properties are defined correctly. -->
+ <!-- ================================================================ -->
+
+ <target name="setup">
+ <!-- Verify tdk.home has been set -->
+ <available file="${tdk.home}" type="dir" property="tdk.home.defined"/>
+ <!-- Emit warning if need properties have not been set -->
+ <antcall target="check_tdk.home"/>
+ </target>
+
+ <target name="check_tdk.home" unless="tdk.home.defined">
+ <echo>
+ ***
+ * ERROR : The 'tdk.home' property is not defined or
+ * is pointing to an invalid directory.
+ *
+ * In your personal build.properties define tdk.home to
+ * point to an absolute path where your tdk is installed.
+ * Example: tdk.home=${user.home}/tdk
+ ***
+ </echo>
+ <fail message="ERROR: tdk.home not defined properly: ${tdk.home}"/>
+ </target>
+
+ <!-- ================================================================ -->
<!-- I N I T T A S K T A R G E T -->
<!-- ================================================================ -->
<!-- Taskdefs are defined inside this target as Ant seems to have -->
<!-- problems defining them at the top level. -->
<!-- ================================================================ -->
- <target name="init-tasks">
+ <target name="init-tasks" depends="setup">
<taskdef name="torque-sql"
classname="org.apache.torque.task.TorqueSQLTask">
@@ -448,7 +475,7 @@
<!-- C O M P I L E -->
<!-- =================================================================== -->
- <target name="compile" description="--> compiles the source code">
+ <target name="compile" depends="setup" description="--> compiles the source code">
<javac srcdir="${src.dir}"
destdir="${build.dest}"
@@ -466,7 +493,7 @@
<!-- C O M P I L E T E S T S -->
<!-- =================================================================== -->
- <target name="compile-tests" description="--> compiles the test code">
+ <target name="compile-tests" depends="setup" description="--> compiles the test
code">
<javac srcdir="${test.src.dir}"
destdir="${build.dest}"
@@ -484,7 +511,7 @@
<!-- T E S T -->
<!-- =================================================================== -->
- <target name="test" description="--> runs the tests">
+ <target name="test" depends="setup" description="--> runs the tests">
<junit printsummary="yes" >
<formatter type="plain" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
