jvanzyl 02/03/27 08:31:31
Modified: src/dvsl/gump convert-project.dvsl
Log:
Fix the name of the generated JAR.
Revision Changes Path
1.11 +11 -14 jakarta-turbine-maven/src/dvsl/gump/convert-project.dvsl
Index: convert-project.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/gump/convert-project.dvsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- convert-project.dvsl 27 Mar 2002 05:53:34 -0000 1.10
+++ convert-project.dvsl 27 Mar 2002 16:31:31 -0000 1.11
@@ -1,22 +1,25 @@
#match("project")
<module name="$context.applyTemplates("name")">
-
- <description>$context.applyTemplates("shortDescription")</description>
- <url href="$context.applyTemplates("url")"/>
+
+ #set ($projectName = $context.node.name)
+ #set ($projectId = $context.node.id)
+
+ <description>$context.node.shortDescription</description>
+ <url href="$context.node.url"/>
<cvs repository="$context.node.gumpRepositoryId"/>
<!-- This is really the cvs module. We need to change this but -->
<!-- I will leave this for now until everything works. -->
- #set ($projectName = $context.applyTemplates("name"))
-
<project name="$projectName">
<!-- Standard Maven target to produce Javadocs, source -->
<!-- and binary distributions. -->
- <ant buildfile="build-maven.xml" target="dist"/>
+ <ant buildfile="build-maven.xml" targetj="maven:jar">
+ <property name="final.name" value="${projectId}-@@DATE@@"/>
+ </ant>
<!--
<depend project="${projectName}-gump-descriptor"/>
@@ -35,7 +38,7 @@
$context.applyTemplates("//dependencies/dependency")
<work nested="target/classes"/>
<home nested="target"/>
- <jar name="$context.applyTemplates("id")-@@DATE@@.jar"/>
+ <jar name="${projectId}-@@DATE@@.jar"/>
<javadoc nested="docs/apidocs"/>
<!-- Nag entry -->
@@ -53,12 +56,6 @@
</module>
#end
-#match("shortDescription")$context.node#end
-#match("name")$context.node#end
-#match("id")$context.node#end
-#match("url")$context.node#end
-#match("repository")$attrib.id#end
-
#match("dependency")
- <depend project="$context.applyTemplates("name")"/>
+ <depend project="$context.node.name"/>
#end
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
