jvanzyl 02/02/17 15:00:59
Modified: . Tag: rundata_security_changes build-test.xml
build.xml default.properties
Removed: . Tag: rundata_security_changes deps.list
jar.resources runtime-test.resources src.aspect.set
src.set
Log:
- moving all the little crappy descriptors into a separate project directory.
the amalgamation is coming. i think i have most of the hardwiring out of
the build files. now i'm going to try to come up with some decent names
for the patterns, targets, and refids then i'm going to take pete up on
his offer to document it ;-)
Revision Changes Path
No revision
No revision
1.11.2.6 +9 -25 jakarta-turbine-3/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build-test.xml,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- build-test.xml 17 Feb 2002 21:10:47 -0000 1.11.2.5
+++ build-test.xml 17 Feb 2002 23:00:59 -0000 1.11.2.6
@@ -8,34 +8,23 @@
<property file="build.properties" />
<!-- Set default values for the build -->
<property file="default.properties" />
- <property file="aspects.properties" />
- <property file="classpath.properties"/>
<target
name="init">
<taskdef
name="create-path"
- classname="org.apache.tdk.task.CreatePath">
- <classpath refid="tool-classpath"/>
+ classname="org.apache.maven.CreatePath">
</taskdef>
<taskdef
name="create-patternset"
- classname="org.apache.tdk.task.CreatePatternSet">
- <classpath refid="tool-classpath"/>
+ classname="org.apache.maven.CreatePatternSet">
</taskdef>
- <create-path
- rid="classpath"
- descriptor="deps.list"
- basedir="${lib.repo}"
- />
-
- <create-patternset
- rid="runtime.test.set"
- descriptor="runtime-test.resources"
- />
+ <create-path rid="classpath" descriptor="${deps}" basedir="${lib.repo}"/>
+ <create-patternset rid="runtime.test.set"
descriptor="${project.defs}/runtime-test.resources"/>
+ <create-path rid="test.src.set" descriptor="${project.defs}/test.src.set"/>
</target>
@@ -48,16 +37,8 @@
depends="init"
description="==> compiles the test source code">
- <ant antfile="build.xml" target="compile"/>
-
- <copy todir="${build.src}/org">
- <fileset dir="${test.dir}/org"/>
- <fileset dir="${rttest.dir}/org"/>
- </copy>
-
- <javac srcdir="${build.src}"
+ <javac
destdir="${build.dest}"
- includes="**/*Test.java"
excludes="**/package.html"
debug="${debug}"
deprecation="${deprecation}"
@@ -66,6 +47,9 @@
<classpath>
<pathelement path="${build.dest}"/>
</classpath>
+ <src>
+ <path refid="test.src.set"/>
+ </src>
</javac>
</target>
1.20.2.17 +5 -6 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.20.2.16
retrieving revision 1.20.2.17
diff -u -r1.20.2.16 -r1.20.2.17
--- build.xml 17 Feb 2002 22:08:30 -0000 1.20.2.16
+++ build.xml 17 Feb 2002 23:00:59 -0000 1.20.2.17
@@ -45,10 +45,10 @@
classname="org.apache.maven.CreatePatternSet">
</taskdef>
- <create-path rid="classpath" descriptor="deps.list" basedir="${lib.repo}"/>
- <create-patternset rid="jar.resources.set" descriptor="jar.resources"/>
- <create-path rid="src.set" descriptor="src.set"/>
- <create-path rid="src.aspect.set" descriptor="src.aspect.set"/>
+ <create-path rid="classpath" descriptor="${deps}" basedir="${lib.repo}"/>
+ <create-patternset rid="jar.resources.set"
descriptor="${project.defs}/jar.resources"/>
+ <create-path rid="src.set" descriptor="${project.defs}/src.set"/>
+ <create-path rid="src.aspect.set" descriptor="${project.defs}/src.aspect.set"/>
</target>
@@ -62,7 +62,6 @@
<taskdef
name="httpget"
className="org.apache.tdk.task.Get">
- <classpath refid="tool-classpath"/>
</taskdef>
<!-- If you need proxy support you'll have to manually add:
@@ -76,7 +75,7 @@
<httpget
baseUrl="http://jakarta.apache.org/turbine/jars/";
dest="${lib.repo}"
- dependencyFile="deps.list"
+ dependencyFile="${deps}"
/>
</target>
1.12.2.10 +6 -5 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.12.2.9
retrieving revision 1.12.2.10
diff -u -r1.12.2.9 -r1.12.2.10
--- default.properties 17 Feb 2002 21:11:48 -0000 1.12.2.9
+++ default.properties 17 Feb 2002 23:00:59 -0000 1.12.2.10
@@ -19,13 +19,14 @@
optimize = off
deprecation = off
-src.java.dir = ${src.dir}/java
-src.tool.dir = ${src.dir}/tool
-src.test.dir = ${src.dir}/test
-src.adapter.dir = ${src.dir}/adapter
+# -------------------------------------------------------------------
+# P R O J E C T D E F S
+# -------------------------------------------------------------------
+project.defs = ${basedir}/project
+deps = ${project.defs}/deps.list
+
final.name = ${project}-${version}
final.dir =.${basedir}/${final.name}
-src.aspects.dir = ${src.dir}/aspects
# -------------------------------------------------------------------
# J A R R E S O U R C E S
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
