jvanzyl 01/09/21 17:56:48
Modified: src/tdk build.properties build.xml
src/tdk/apps/2 build.xml
Log:
- trying to simplify some of the properties.
Revision Changes Path
1.8 +0 -9 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties 2001/09/21 06:49:00 1.7
+++ build.properties 2001/09/22 00:56:48 1.8
@@ -14,12 +14,3 @@
# -------------------------------------------------------------------------
turbine.app.loc = ${tdk.home}/..
-
-# -------------------------------------------------------------------------
-# As a user of the TDK you do not need to edit these.
-# This is for external turbine app integration.
-# -------------------------------------------------------------------------
-
-app.src = tdk/apps/${tdk.turbineVersion}
-ancillary.dir = tdk/ancillary
-lib.dir = tdk/lib
1.15 +6 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 2001/09/21 16:32:54 1.14
+++ build.xml 2001/09/22 00:56:48 1.15
@@ -6,7 +6,12 @@
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
-
+
+ <!-- Do not edit these values -->
+ <property name="app.src" value="tdk/apps/${tdk.turbineVersion}"/>
+ <property name="ancillary.dir" value="tdk/ancillary"/>
+ <property name="lib.dir" value="tdk/lib"/>
+
<!-- ================================================================ -->
<!-- S E T U P T A R G E T -->
<!-- ================================================================ -->
@@ -269,7 +274,6 @@
<fileset dir="${test.directory}"/>
</copy>
</target>
-
<!-- ================================================================= -->
<!-- D E P L O Y M E N T D E S C R I P T O R -->
1.17 +100 -41 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2001/09/21 16:32:54 1.16
+++ build.xml 2001/09/22 00:56:48 1.17
@@ -89,7 +89,10 @@
<!-- your sources for you and compile them. -->
<!-- ================================================================ -->
- <target name="init" description="--> generates the full application">
+ <target
+ name="init"
+ description="--> generates the full application">
+
<antcall target="create-database"/>
<antcall target="turbine-sql"/>
<antcall target="turbine-id-table-sql"/>
@@ -108,7 +111,10 @@
<!-- are made to the project XML database schema. -->
<!-- ================================================================ -->
- <target name="project" description="--> run when XML schema is changed">
+ <target
+ name="project"
+ description="--> run when XML schema is changed">
+
<antcall target="project-sql"/>
<antcall target="project-id-table-init-sql"/>
<antcall target="project-insert-sql"/>
@@ -163,8 +169,10 @@
<!-- project should be specified in project-schema.xml. -->
<!-- ================================================================ -->
- <target name="project-sql" depends="init-tasks"
- description="--> generates the sql-script for your project">
+ <target
+ name="project-sql"
+ depends="init-tasks"
+ description="--> generates the sql-script for your project">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -192,8 +200,10 @@
<!-- These are in addition to the base Turbine OM! -->
<!-- ================================================================ -->
- <target name="project-om" depends="init-tasks"
- description="--> generates the peer-based object model for your project">
+ <target
+ name="project-om"
+ depends="init-tasks"
+ description="--> generates the peer-based object model for your project">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -231,8 +241,10 @@
<!-- app to run with multiple DBs. -->
<!-- ================================================================ -->
- <target name="turbine-sql" depends="init-tasks"
- description="--> generates the sql-script for the Turbine base system">
+ <target
+ name="turbine-sql"
+ depends="init-tasks"
+ description="--> generates the sql-script for the Turbine base system">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -259,7 +271,9 @@
<!-- project should be specified in project-schema.xml. -->
<!-- ================================================================ -->
- <target name="turbine-id-table-sql" depends="init-tasks">
+ <target
+ name="turbine-id-table-sql"
+ depends="init-tasks">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -283,7 +297,9 @@
<!-- G E N E R A T E T U R B I N E I D B R O K E R I N I T S Q L -->
<!-- ================================================================ -->
- <target name="turbine-id-table-init-sql" depends="init-tasks">
+ <target
+ name="turbine-id-table-init-sql"
+ depends="init-tasks">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -308,7 +324,9 @@
<!-- G E N E R A T E P R O J E C T I D B R O K E R I N I T S Q L -->
<!-- ================================================================ -->
- <target name="project-id-table-init-sql" depends="init-tasks">
+ <target
+ name="project-id-table-init-sql"
+ depends="init-tasks">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -333,7 +351,9 @@
<!-- T U R B I N E S E C U R I T Y S Y S T E M S Q L -->
<!-- ================================================================ -->
- <target name="turbine-security-sql" depends="init-tasks">
+ <target
+ name="turbine-security-sql"
+ depends="init-tasks">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -359,7 +379,9 @@
<!-- I N S E R T T U R B I N E S Q L -->
<!-- ================================================================ -->
- <target name="turbine-insert-sql" description="--> insert turbine sql">
+ <target
+ name="turbine-insert-sql"
+ description="--> insert turbine sql">
<antcall target="insert-sql-file">
<param name="sqlFile" value="${src.dir}/sql/turbine-schema.sql"/>
@@ -383,7 +405,9 @@
<!-- I N S E R T P R O J E C T S Q L -->
<!-- ================================================================ -->
- <target name="project-insert-sql" description="--> insert project sql">
+ <target
+ name="project-insert-sql"
+ description="--> insert project sql">
<antcall target="insert-sql-file">
<param name="sqlFile" value="${src.dir}/sql/${project}-schema.sql"/>
@@ -399,11 +423,17 @@
<!-- I N S E R T S I N G L E S Q L F I L E -->
<!-- ================================================================ -->
- <target name="setDatabaseUrl" if="build.databaseUrl">
+ <target
+ name="setDatabaseUrl"
+ if="build.databaseUrl">
+
<property name="sqlInsert.databaseUrl" value="${build.databaseUrl}"/>
</target>
- <target name="insert-sql-file" depends="setDatabaseUrl">
+ <target
+ name="insert-sql-file"
+ depends="setDatabaseUrl">
+
<property name="sqlInsert.databaseUrl" value="${databaseUrl}"/>
<sql
driver="${databaseDriver}"
@@ -428,7 +458,8 @@
unify this in a less hack-ass manner next round :-)
-->
- <target name="update-tr-props">
+ <target
+ name="update-tr-props">
<filter token="DATABASE" value="${database}"/>
<filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
@@ -462,7 +493,10 @@
<!-- C O M P I L E -->
<!-- =================================================================== -->
- <target name="compile" depends="setup" description="--> compiles the source code">
+ <target
+ name="compile"
+ depends="setup"
+ description="--> compiles the source code">
<javac srcdir="${src.dir}/java"
destdir="${build.dest}"
@@ -480,45 +514,46 @@
<!-- C O M P I L E T E S T S -->
<!-- =================================================================== -->
- <target name="compile-tests" depends="setup" description="--> compiles the test
code">
+ <target
+ name="compile-tests"
+ depends="setup"
+ description="--> compiles the test code">
<javac srcdir="${test.src.dir}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
optimize="${optimize}">
-
<classpath refid="classpath"/>
-
</javac>
-
</target>
<!-- =================================================================== -->
<!-- T E S T -->
<!-- =================================================================== -->
- <target name="test" depends="setup" description="--> runs the tests">
+ <target
+ name="test"
+ depends="setup"
+ description="--> runs the tests">
<junit printsummary="yes" >
<formatter type="plain" />
<classpath refid="classpath"/>
<test name="org.apache.turbine.test.TestLoginLogout"/>
</junit>
-
</target>
-
-
<!-- ================================================================ -->
<!-- C L E A N -->
<!-- ================================================================ -->
- <target name="clean" description="--> cleans up the build directory">
+ <target
+ name="clean"
+ description="--> cleans up the build directory">
<delete dir="${build.dest}"/>
<mkdir dir="${build.dest}"/>
-
</target>
<!-- =================================================================== -->
@@ -529,26 +564,27 @@
<!-- outputFile: The file where the xml schema will be written -->
<!-- =================================================================== -->
- <target name="sql2xml">
+ <target
+ name="sql2xml">
<sql-xml
inputFile="${conf.dir}/schema.sql"
outputFile="${conf.dir}/schema.xml"
/>
-
</target>
<!-- =================================================================== -->
<!-- J A R -->
<!-- =================================================================== -->
- <target name="jar" depends="compile">
+ <target
+ name="jar"
+ depends="compile">
<jar jarfile="../${final.name}.jar"
basedir="${build.dest}"
excludes="**/package.html"
/>
-
</target>
<!-- =================================================================== -->
@@ -558,34 +594,57 @@
<!-- for their target platform. Ant can do it just peachy. -->
<!-- =================================================================== -->
- <target name="ext" depends="set-os,windows-ext">
+ <target
+ name="ext"
+ depends="set-os,windows-ext">
<echo message="Platform = ${platform}"/>
<echo message="Extension = ${ext}"/>
</target>
- <target name="set-os">
+ <target
+ name="set-os">
<property name="is${os.name}" value="true"/>
</target>
- <target name="windows-ext" depends="unix-ext" unless="ext">
+ <target
+ name="windows-ext"
+ depends="unix-ext"
+ unless="ext">
<property name="platform" value="windows"/>
<property name="ext" value="bat"/>
</target>
- <target name="unix-ext" depends="set-unix" if="is.Unix">
+ <target
+ name="unix-ext"
+ depends="set-unix"
+ if="is.Unix">
<property name="platform" value="unix"/>
<property name="ext" value="sh"/>
</target>
- <target name="set-unix" depends="set-windows98" unless="is.Windows">
+ <target
+ name="set-unix"
+ depends="set-windows98"
+ unless="is.Windows">
<property name="is.Unix" value="true" />
</target>
- <target name="set-windows98" depends="set-windowsNT" if="isWindows 98">
+ <target
+ name="set-windows98"
+ depends="set-windowsNT"
+ if="isWindows 98">
<property name="is.Windows" value="true" />
</target>
- <target name="set-windowsNT" depends="set-windows2000" if="isWindows NT">
+ <target
+ name="set-windowsNT"
+ depends="set-windows2000"
+ if="isWindows NT">
<property name="is.Windows" value="true" />
</target>
- <target name="set-windows2000" depends="set-windowsME" if="isWindows 2000">
+ <target
+ name="set-windows2000"
+ depends="set-windowsME"
+ if="isWindows 2000">
<property name="is.Windows" value="true" />
</target>
- <target name="set-windowsME" if="isWindows Me">
+ <target
+ name="set-windowsME"
+ if="isWindows Me">
<property name="is.Windows" value="true" />
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
