jon 01/06/29 14:23:59
Modified: build build-turbine-om.xml build-turbine-sql.xml
build.xml
Log:
need to set paths to things so that external entities (like scarab) can
call scripts to get things to compile properly.
the sad thing is that this is getting to be a bit of black magic and very
complicated. :-( tracing down problems is very hard. ug.
Revision Changes Path
1.3 +5 -5 jakarta-turbine/build/build-turbine-om.xml
Index: build-turbine-om.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build-turbine-om.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-turbine-om.xml 2001/06/26 23:07:54 1.2
+++ build-turbine-om.xml 2001/06/29 21:23:52 1.3
@@ -16,16 +16,16 @@
<taskdef name="torque-om"
classname="org.apache.turbine.torque.TorqueObjectModelTask">
<classpath>
- <pathelement location="../bin/classes"/>
- <fileset dir="../lib">
+ <pathelement location="${build.dest}"/>
+ <fileset dir="${turbine.jars}">
<include name="*.jar"/>
</fileset>
</classpath>
</taskdef>
- <property name="schemaDirectory" value="../conf/master"/>
+ <property name="schemaDirectory" value="${basedir}/../conf/master"/>
<property name="OMControlTemplate" value="om/Control.vm"/>
- <property name="templatePath" value="../conf/torque/templates"/>
+ <property name="templatePath" value="${basedir}/../conf/torque/templates"/>
</target>
@@ -40,7 +40,7 @@
<torque-om
contextProperties="torque.properties"
controlTemplate="${OMControlTemplate}"
- outputDirectory="../bin/src"
+ outputDirectory="${build.src}"
templatePath="${templatePath}"
outputFile="report.turbine.om.generation"
targetPackage="org.apache.om.security"
1.10 +7 -7 jakarta-turbine/build/build-turbine-sql.xml
Index: build-turbine-sql.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build-turbine-sql.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build-turbine-sql.xml 2001/06/13 16:32:36 1.9
+++ build-turbine-sql.xml 2001/06/29 21:23:53 1.10
@@ -15,19 +15,19 @@
<taskdef name="torque-sql" classname="org.apache.turbine.torque.TorqueSQLTask">
<classpath>
- <pathelement location="../bin/classes"/>
- <fileset dir="../lib">
+ <pathelement location="${build.dest}"/>
+ <fileset dir="${turbine.jars}">
<include name="*.jar"/>
</fileset>
</classpath>
</taskdef>
- <property name="schemaDirectory" value="../conf/master"/>
+ <property name="schemaDirectory" value="${basedir}/../conf/master"/>
<property name="SQLControlTemplate" value="sql/base/Control.vm"/>
<property name="idTableControlTemplate" value="sql/id-table/Control.vm"/>
<property name="securityControlTemplate" value="sql/security/Control.vm"/>
- <property name="outputDirectory" value="../src/sql"/>
- <property name="templatePath" value="../conf/torque/templates"/>
+ <property name="outputDirectory" value="${basedir}/../src/sql"/>
+ <property name="templatePath" value="${basedir}/../conf/torque/templates"/>
</target>
@@ -230,7 +230,7 @@
<echo message="+------------------------------------------+"/>
<torque-sql
- contextProperties="../conf/torque/templates/sql/id-table/turbine.props"
+
contextProperties="${basedir}/../conf/torque/templates/sql/id-table/turbine.props"
controlTemplate="${idTableControlTemplate}"
outputDirectory="${outputDirectory}"
templatePath="${templatePath}"
@@ -256,7 +256,7 @@
<!-- This could probably be a simple texen task -->
<torque-sql
- contextProperties="../conf/torque/templates/sql/id-table/project.props"
+
contextProperties="${basedir}/../conf/torque/templates/sql/id-table/project.props"
controlTemplate="${securityControlTemplate}"
outputDirectory="${outputDirectory}"
templatePath="${templatePath}"
1.14 +4 -2 jakarta-turbine/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/build/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 2001/06/26 23:07:55 1.13
+++ build.xml 2001/06/29 21:23:55 1.14
@@ -329,7 +329,8 @@
<target name="turbine-sql"
depends="compile"
description="--> generates the Turbine SQL for all the supported DBs">
- <ant antfile="build-turbine-sql.xml"/>
+ <ant antfile="build-turbine-sql.xml"
+ dir="${basedir}"/>
</target>
<!-- ================================================================== -->
@@ -337,7 +338,8 @@
<!-- ================================================================== -->
<target name="turbine-om" depends="torque-compile"
description="--> generates the Turbine OM/Peer classes">
- <ant antfile="build-turbine-om.xml"/>
+ <ant antfile="build-turbine-om.xml"
+ dir="${basedir}"/>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
