You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jt...@apache.org on 2002/02/14 16:53:49 UTC
cvs commit: jakarta-turbine-3 build-test.xml build.xml default.properties
jtaylor 02/02/14 07:53:49
Modified: . Tag: rundata_security_changes build-test.xml
build.xml default.properties
Log:
Better aspect building. Set the property 'build.includes.aspects' to true and
both build.xml and build-test.xml will behave appropriately. This seems to
work, but I can't test completely since FulcrumRunData is missing, which
prevents most of the security.fulcrum package from building, which is required
for the test pipeline.
Revision Changes Path
No revision
No revision
1.11.2.4 +1 -1 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.3
retrieving revision 1.11.2.4
diff -u -r1.11.2.3 -r1.11.2.4
--- build-test.xml 13 Feb 2002 18:40:48 -0000 1.11.2.3
+++ build-test.xml 14 Feb 2002 15:53:49 -0000 1.11.2.4
@@ -270,7 +270,7 @@
<target
name="copy-aspectj-runtime"
- if="develop.with.aspects">
+ if="build.includes.aspects">
<copy file="${aspectjrt.jar}" todir="${build.dir}/rttest/lib"/>
1.20.2.11 +31 -10 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.20.2.10
retrieving revision 1.20.2.11
diff -u -r1.20.2.10 -r1.20.2.11
--- build.xml 13 Feb 2002 15:02:56 -0000 1.20.2.10
+++ build.xml 14 Feb 2002 15:53:49 -0000 1.20.2.11
@@ -129,8 +129,17 @@
<target
name="compile"
+ depends="javac.compile,aspectj.compile"/>
+
+ <!-- ================================================================== -->
+ <!-- J A V A C C O M P I L E -->
+ <!-- ================================================================== -->
+
+ <target
+ name="javac.compile"
+ unless="build.includes.aspects"
depends="env"
- description="--> compiles the source code">
+ description="--> compiles the source code with javac">
<mkdir dir="${build.dest}"/>
@@ -150,25 +159,37 @@
<!-- =================================================================== -->
<target
- name="acompile">
+ name="aspectj.compile"
+ if="build.includes.aspects"
+ depends="env"
+ description="--> compiles the source code with ajc">
- <!-- Move aspects into the build cycle -->
+ <!-- Move aspects into the build cycle
<copy todir="${build.src}/org" filtering="yes">
<fileset dir="${src.aspects.dir}/org">
<include name="**/*.java"/>
</fileset>
- </copy>
+ </copy> -->
<taskdef
name="ajc"
classname="org.aspectj.tools.ant.taskdefs.Ajc"/>
- <ajc srcdir="${build.src}"
- destdir="${build.dest}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
- <classpath refid="classpath"/>
+ <ajc destdir="${build.dest}"
+ excludes="**/package.html"
+ debug="${debug}"
+ deprecation="${deprecation}"
+ optimize="${optimize}">
+ <src>
+ <pathelement location="${src.java.dir}"/>
+ <pathelement location="${src.tool.dir}"/>
+ <pathelement location="${src.aspects.dir}"/>
+ </src>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${aspectjrt.jar}"/>
+ <pathelement location="${aspectjtools.jar}"/>
+ </classpath>
</ajc>
</target>
1.12.2.7 +4 -3 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.12.2.6
retrieving revision 1.12.2.7
diff -u -r1.12.2.6 -r1.12.2.7
--- default.properties 12 Feb 2002 18:28:45 -0000 1.12.2.6
+++ default.properties 14 Feb 2002 15:53:49 -0000 1.12.2.7
@@ -19,14 +19,15 @@
optimize = off
deprecation = off
-src.java.dir =${src.dir}/java
-src.test.dir =${src.dir}/test
+src.java.dir = ${src.dir}/java
+src.tool.dir = ${src.dir}/tool
+src.test.dir = ${src.dir}/test
src.adapter.dir = ${src.dir}/adapter
final.name = ${project}-${version}
final.dir =../${final.name}
src.aspects.dir = ${src.dir}/aspects
-srcdir = ${src.java.dir}/org:${src.dir}/tool/org
+srcdir = ${src.java.dir}/org:${src.tool.dir}/org
# -------------------------------------------------------------------
# J A R R E S O U R C E S
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>