dion 2002/06/03 21:54:13
Modified: src/templates/build/plugins/reactor build.xml Control.vm
Log:
Move reactor parse-less build processing
Revision Changes Path
1.2 +50 -9
jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 15 May 2002 19:17:44 -0000 1.1
+++ build.xml 4 Jun 2002 04:54:13 -0000 1.2
@@ -1,8 +1,30 @@
<?xml version="1.0"?>
-<project name="maven" default="reactor" basedir="$antBasedir">
+<project name="maven-reactor" default="reactor" basedir="..">
- #parse("build.init.target")
+ <!-- ================================================================== -->
+ <!-- I N I T -->
+ <!-- ================================================================== -->
+ <target name="init">
+ <!-- Pick up tool default properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/default.properties"/>
+
+ <!-- define maven classpath for the build -->
+ <path id="maven-classpath">
+ <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ </path>
+
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <taskdef resource="maven-taskdefs.properties">
+ <classpath refid="maven-classpath" />
+ </taskdef>
+
+ <!-- call common build file initialization to verify project, update jars
+ etc -->
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="verify-project" inheritAll="true" inheritRefs="true"
+ exportAll="true"/>
+ </target>
<!-- ================================================================== -->
<!-- R E A C T O R G E N E R A T O R -->
@@ -14,16 +36,35 @@
<target
name="generate-reactor"
-
depends="#callback("pre-generate-reactor"),do-generate-reactor,#callback("post-generate-reactor")"/>
+ depends="pre-generate-reactor-callback, do-generate-reactor,
+ post-generate-reactor-callback"/>
+
+ <target name="pre-generate-reactor-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.reactor.callback.pre-generate-reactor.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.reactor.callback.pre-generate-reactor.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.reactor.callback.pre-generate-reactor.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-generate-reactor-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.reactor.callback.post-generate-reactor.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.reactor.callback.post-generate-reactor.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.reactor.callback.post-generate-reactor.buildTarget" />
+ </maven-ant>
+ </target>
<target name="do-generate-reactor">
- <taskdef
- name="reactor-generator"
- className="org.apache.maven.reactor.ReactorGenerator">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<reactor-generator
controlTemplate="Control.vm"
outputDirectory="${basedir}/reactor"
1.2 +1 -1
jakarta-turbine-maven/src/templates/build/plugins/reactor/Control.vm
Index: Control.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/reactor/Control.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Control.vm 15 May 2002 19:17:44 -0000 1.1
+++ Control.vm 4 Jun 2002 04:54:13 -0000 1.2
@@ -15,6 +15,6 @@
## -------------------------------------------------------
## Make the list of callbacks
## -------------------------------------------------------
-$callbacks.put( "$plugin", ["pre-generate-reactor", "post-generate-reactor" ] )
+##$callbacks.put( "$plugin", ["pre-generate-reactor", "post-generate-reactor" ] )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
