jvanzyl 02/04/19 10:06:48
Modified: . build-bootstrap.xml
src/descriptors fix-project.dvsl
src/descriptors/profile turbine.xml
src/java/org/apache/maven/project Project.java
src/templates/reactor build.vm
src/update/v2-v3 update-descriptor.dvsl
Log:
Updating reactor goodies.
Revision Changes Path
1.75 +3 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- build-bootstrap.xml 18 Apr 2002 14:50:24 -0000 1.74
+++ build-bootstrap.xml 19 Apr 2002 17:06:47 -0000 1.75
@@ -80,6 +80,9 @@
<ant antfile="build.xml" target="maven:jar"/>
<antcall target="dist"/>
<ant dir="${maven.home}/install"/>
+
+ <!-- Get rid of the generated template build files -->
+ <delete dir="maven"/>
</target>
<!-- ================================================================== -->
1.5 +2 -2 jakarta-turbine-maven/src/descriptors/fix-project.dvsl
Index: fix-project.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/fix-project.dvsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fix-project.dvsl 18 Apr 2002 13:46:17 -0000 1.4
+++ fix-project.dvsl 19 Apr 2002 17:06:48 -0000 1.5
@@ -20,8 +20,8 @@
<cvsPassword>$context.node.cvsPassword</cvsPassword>
<cvsModule>$context.node.cvsModule</cvsModule>
- </distributions>
- </branches>
+ <distributions/>
+ <branches/>
<mailingLists>
<mailingList>
1.4 +8 -10 jakarta-turbine-maven/src/descriptors/profile/turbine.xml
Index: turbine.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/descriptors/profile/turbine.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- turbine.xml 17 Apr 2002 19:04:18 -0000 1.3
+++ turbine.xml 19 Apr 2002 17:06:48 -0000 1.4
@@ -2,15 +2,13 @@
<name>turbine</name>
- <projects>
- <project id="jakarta-turbine-stratum"/>
- <project id="jakarta-turbine-torque"/>
- <project id="jakarta-turbine-fulcrum"/>
- <!--
- <project id="jakarta-turbine-jcs"/>
- -->
- <project id="jakarta-turbine-2"/>
- <project id="jakarta-turbine-3"/>
- </projects>
+ <projectIds>
+ <projectId>stratum</projectId>
+ <projectId>torque</projectId>
+ <projectId>fulcrum</projectId>
+ <projectId>jcs</projectId>
+ <projectId>turbine-2</projectId>
+ <projectId>turbine-3</projectId>
+ </projectIds>
</profile>
1.14 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Project.java 19 Apr 2002 15:39:44 -0000 1.13
+++ Project.java 19 Apr 2002 17:06:48 -0000 1.14
@@ -59,7 +59,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Project.java,v 1.13 2002/04/19 15:39:44 jvanzyl Exp $
+ * @version $Id: Project.java,v 1.14 2002/04/19 17:06:48 jvanzyl Exp $
*/
public class Project
extends BaseObject
@@ -493,7 +493,7 @@
/**
* Set cvs module.
*/
- public void setCvsModule(String module)
+ public void setCvsModule(String cvsModule)
{
this.cvsModule = cvsModule;
}
1.8 +24 -14 jakarta-turbine-maven/src/templates/reactor/build.vm
Index: build.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/reactor/build.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.vm 19 Apr 2002 15:29:42 -0000 1.7
+++ build.vm 19 Apr 2002 17:06:48 -0000 1.8
@@ -8,16 +8,30 @@
<!-- -->
<!-- ===================================================================== -->
+<target
+ name="setup-directories">
+ <mkdir dir="$workspace.baseDirectory"/>
+</target>
+
+<target
+ name="reactor">
+
+ <antcall target="co-all"/>
+ <antcall target="build-all"/>
+
+</target>
+
<target
- name="co-all">
+ name="co-all"
+ depends="setup-directories">
#foreach ($project in $workspace.profile.projects)
- <antcall target="co-$project.name"/>
+ <antcall target="co-$project.id"/>
#end
</target>
#foreach ($project in $workspace.profile.projects)
<target
- name="co-$project.name">
+ name="co-$project.id">
##if ($project.isAvailableAsSource())
<cvs
cvsRoot="$project.cvsRoot"
@@ -36,12 +50,11 @@
<!-- ===================================================================== -->
<target
- name="build-all"
- depends="co-all">
+ name="build-all">
##if ($project.isAvailableAsSource())
#foreach ($project in $workspace.profile.projects)
- <antcall target="build-$project.name"/>
+ <antcall target="build-$project.id"/>
#end
##end
</target>
@@ -49,14 +62,11 @@
#foreach ($project in $workspace.profile.projects)
##if ($project.isAvailableAsSource())
<target
- name="build-$project.name"
- depends="co-$project.name">
-#if
($files.file("$workspace.baseDirectory/$project.module/build-maven.xml").exists())
-#set ($buildFile = "$workspace.baseDirectory/$project.module/build-maven.xml")
-#else
-#set ($buildFile = "$workspace.baseDirectory/$project.module/build.xml")
-#end
- <ant antfile="$buildFile"/>
+ name="build-$project.id">
+ <ant
+ dir="$workspace.baseDirectory/$project.cvsModule"
+ target="maven:compile"
+ />
##end
</target>
1.4 +3 -5 jakarta-turbine-maven/src/update/v2-v3/update-descriptor.dvsl
Index: update-descriptor.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/update/v2-v3/update-descriptor.dvsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- update-descriptor.dvsl 18 Apr 2002 13:40:48 -0000 1.3
+++ update-descriptor.dvsl 19 Apr 2002 17:06:48 -0000 1.4
@@ -19,7 +19,6 @@
## <cvsRoot>
## <cvsModule>
## <cvsPassword>
-## <cvsTag>
##
## 4. Add a <id> element to the mailing list so that a specific mailing
## list can be used for nagging.
@@ -28,10 +27,9 @@
#match ("project")
<project>
$context.applyTemplates("*")
- <cvsRoot></cvsRoot>
- <cvsModule></cvsModule>
- <cvsPassword></cvsPassword>
- <cvsTag></cvsTag>
+ if(!$context.cvsRoot)<cvsRoot></cvsRoot>#end
+ if(!$context.cvsModule)<cvsModule></cvsModule>#end
+ if(!$context.cvsPassword)<cvsPassword></cvsPassword>#end
</project>
#end
