brekke 02/01/30 20:03:59
Modified: . build.xml
Added: . build.properties.sample default.properties
Removed: . build.properties
Log:
Moving t2 build forward and aligning with other Turbine family builds.
Moved the build.properties to default.properties and created a
build.properties.sample which points lib.repo to the lib directory and
defines all the current jars in that directory as an example.
The build.xml was updated to conditionally compile in the webmacro classes
only if the jar is detected in the classpath at compile time.
Revision Changes Path
1.3 +22 -3 jakarta-turbine-2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 4 Jan 2002 14:51:06 -0000 1.2
+++ build.xml 31 Jan 2002 04:03:59 -0000 1.3
@@ -7,10 +7,10 @@
<!-- Give user a chance to override without editing this file
(and without typing -D each time they invoke a target) -->
<property file="${user.home}/build.properties" />
- <property file=".ant.properties" />
+ <property file="build.properties" />
<!-- Set default values for the build -->
- <property file="build.properties" />
+ <property file="default.properties" />
<!-- Construct compile classpath -->
<path id="classpath">
@@ -65,6 +65,10 @@
classname="junit.framework.TestCase">
<classpath refid="classpath"/>
</available>
+ <available property="webmacro.present"
+ classname="org.webmacro.WebMacro">
+ <classpath refid="classpath"/>
+ </available>
<available property="freemarker.present"
classname="freemarker.template.Template">
<classpath refid="classpath"/>
@@ -98,6 +102,8 @@
<exclude name="**/jsp/**"/>
<exclude name="**/*FreeMarker*.java"/>
<exclude name="**/freemarker/**"/>
+ <exclude name="**/*WebMacro*.java"/>
+ <exclude name="**/webmacro/**"/>
<exclude name="**/assemblerbroker/util/python/*.java"/>
<exclude name="**/samples/newtorque/input/**/*.java"/>
<exclude name="**/*Test.java"/>
@@ -123,6 +129,19 @@
</target>
<!-- ================================================================== -->
+ <!-- Adds Webmacro related files to the build directory -->
+ <!-- ================================================================== -->
+ <target name="prepare-webmacro" depends="prepare"
+ if="webmacro.present">
+ <copy todir="${build.src}/org" filtering="yes">
+ <fileset dir="${src.java.dir}/org">
+ <include name="**/*WebMacro*.java"/>
+ <include name="**/webmacro/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Adds Freemarker related files to the build directory -->
<!-- ================================================================== -->
<target name="prepare-freemarker" depends="prepare"
@@ -185,7 +204,7 @@
<!-- ================================================================== -->
<target name="compile"
depends="prepare, prepare-jsp, prepare-freemarker,
- prepare-log4java, prepare-castor"
+ prepare-webmacro, prepare-log4java, prepare-castor"
description="--> compiles the source code">
<javac srcdir="${build.src}"
destdir="${build.dest}"
1.1 jakarta-turbine-2/build.properties.sample
Index: build.properties.sample
===================================================================
# -------------------------------------------------------------------
# B U I L D P R O P E R T I E S
# -------------------------------------------------------------------
# These set of jars will use the current lib directory checked in
# with the Turbine project.
# -------------------------------------------------------------------
lib.repo = lib
activation.jar = ${lib.repo}/activation-1.0.1.jar
ecs.jar = ${lib.repo}/ecs-1.4.1.jar
regexp.jar = ${lib.repo}/jakarta-regexp-1.3-dev.jar
jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
jndi.jar = ${lib.repo}/jndi-1.2.1.jar
jta.jar = ${lib.repo}/jta1.0.1.jar
junit.jar = ${lib.repo}/junit-3.2.jar
log4j.jar = ${lib.repo}/log4j-1.1.jar
javamail.jar = ${lib.repo}/mail-1.2.jar
oro.jar = ${lib.repo}/oro.jar
servlet.jar = ${lib.repo}/servlet-2.2-CVSHEAD-12-04-00.jar
velocity.jar = ${lib.repo}/velocity-1.2-dev.jar
village.jar = ${lib.repo}/village-1.5.3-dev.jar
xalan.jar = ${lib.repo}/xalan-2.0.0.jar
xerces.jar = ${lib.repo}/xerces-1.3.0.jar
xmlrpc.jar = ${lib.repo}/xmlrpc.jar
webmacro.jar = ${lib.repo}/webmacro-0.94.jar
#freemarker.jar = ${lib.repo}/freemarker.jar
#castor.jar = ${lib.repo}/castor.jar
1.1 jakarta-turbine-2/default.properties
Index: default.properties
===================================================================
# -------------------------------------------------------------------
# D E F A U L T P R O P E R T I E S
# -------------------------------------------------------------------
# These properties are used by the Turbine build, you may override
# any of these default values by placing property values in
# your ${user.home}/build.properties file.
# -------------------------------------------------------------------
name = Turbine
version = 2.2b1
project = turbine
package = org.apache.${project}
final.name = ${project}-${version}
final.dir = ${final.name}/
build.dir = ./bin
build.src = ${build.dir}/src
build.dest = ${build.dir}/classes
build.xdocs = ${build.dir}/xdocs
build.docs = ${build.dir}/docs
src.dir = ./src
src.java.dir = ${src.dir}/java
src.dtd.dir = ${src.dir}/dtd
conf.dir = ./conf
javadoc.destdir = ./docs/apidocs
jakarta.site2 = ../jakarta-site2
docs.src = ./xdocs
docs.dest = ./docs
turbine.jars = lib
year = 1999-2002
debug = on
optimize = off
deprecation = off
jdom.jar = jdom-b7.jar
# You must set values for the JAR file properties listed here, or in
# your ${user.home}/build.properties or local build.properties file in
# order to build Torque:
activation.jar = ${lib.repo}/activation-1.0.1.jar
commons-collections.jar = ${lib.repo}/commons-collections.jar
ecs.jar = ${lib.repo}/ecs-1.4.1.jar
regexp.jar = ${lib.repo}/jakarta-regexp-1.3-dev.jar
jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
jndi.jar = ${lib.repo}/jndi-1.2.1.jar
jta.jar = ${lib.repo}/jta1.0.1.jar
junit.jar = ${lib.repo}/junit-3.7.jar
log4j.jar = ${lib.repo}/log4j-1.1.3.jar
javamail.jar = ${lib.repo}/mail-1.2.jar
oro.jar = ${lib.repo}/oro.jar
servlet.jar = ${lib.repo}/servlet.jar
velocity.jar = ${lib.repo}/velocity-1.3-dev.jar
village.jar = ${lib.repo}/village-1.5.3-dev.jar
xalan.jar = ${lib.repo}/xalan-2.1.0.jar
xerces.jar = ${lib.repo}/xerces-1.4.4.jar
xmlrpc.jar = ${lib.repo}/xmlrpc-helma.jar
castor.jar = ${lib.repo}/castor.jar
freemarker.jar = ${lib.repo}/freemarker.jar
webmacro.jar = ${lib.repo}/webmacro-0.94.jar
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
