epugh 2004/11/16 10:26:32
Modified: cruisecontrol/xdocs changes.xml
cruisecontrol/src/plugin-resources cruisecontrol.jsl
cruisecontrol plugin.jelly
Log:
MPCRUISECONTROL-15 Lost script extension
when use "maven cruisecontrol:configure" command
Revision Changes Path
1.19 +1 -0 maven-plugins/cruisecontrol/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/xdocs/changes.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- changes.xml 19 Oct 2004 16:10:44 -0000 1.18
+++ changes.xml 16 Nov 2004 18:26:32 -0000 1.19
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6" date="in cvs">
+ <action dev="epugh" type="add" issue="MPCRUISECONTROL-15">Lost script
extension when use "maven cruisecontrol:configure" command</action>
<action dev="epugh" type="add" issue="MPCRUISECONTROL-14"
due-to="Marcin Gurbisz">Add more configuration, especially better handling of
emails.</action>
<action dev="evenisse" type="add" issue="MPCRUISECONTROL-12"
due-to="Alexandre Vivien">Add new properties to the maven cruisecontrol plugin.
Ftp publisher, Scp publisher.</action>
</release>
1.15 +2 -2
maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
Index: cruisecontrol.jsl
===================================================================
RCS file:
/home/cvs/maven-plugins/cruisecontrol/src/plugin-resources/cruisecontrol.jsl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cruisecontrol.jsl 19 Oct 2004 16:10:44 -0000 1.14
+++ cruisecontrol.jsl 16 Nov 2004 18:26:32 -0000 1.15
@@ -67,7 +67,7 @@
<j:when test="${type == 'time'}">
<schedule>
<maven
- mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven"
+
mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven${mavenScriptExtension}"
time="${maven.cruisecontrol.schedule.time}"
goal="${maven.cruisecontrol.goals}"
projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
@@ -76,7 +76,7 @@
<j:otherwise>
<schedule interval="${maven.cruisecontrol.schedule.interval}">
<maven
- mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven"
+
mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven${mavenScriptExtension}"
goal="${maven.cruisecontrol.goals}"
projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
</schedule>
1.10 +9 -0 maven-plugins/cruisecontrol/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 23 Jul 2004 09:05:21 -0000 1.9
+++ plugin.jelly 16 Nov 2004 18:26:32 -0000 1.10
@@ -55,6 +55,15 @@
<goal name="cruisecontrol:configure"
description="Update a Cruise Control configuration file with this
project"
prereqs="cruisecontrol:validate">
+
+ <j:choose>
+ <j:when test="${systemScope['os.name'].startsWith('Windows')}">
+ <j:set var="mavenScriptExtension" value=".bat"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="mavenScriptExtension" value=".sh"/>
+ </j:otherwise>
+ </j:choose>
<x:parse var="doc"><cruisecontrol></cruisecontrol></x:parse>
<util:available file="${maven.cruisecontrol.config}">
<util:file var="inputFile" name="${maven.cruisecontrol.config}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
