epugh 2004/11/17 06:17:29
Modified: cruisecontrol/src/plugin-resources cruisecontrol.jsl
cruisecontrol plugin.jelly
Log:
Don't use a .sh extension on maven on *nix, it is plain old maven. Use .bat
on
windows.
Revision Changes Path
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cruisecontrol.jsl 16 Nov 2004 18:26:32 -0000 1.15
+++ cruisecontrol.jsl 17 Nov 2004 14:17:29 -0000 1.16
@@ -67,7 +67,7 @@
<j:when test="${type == 'time'}">
<schedule>
<maven
-
mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven${mavenScriptExtension}"
+ mavenscript="${mavenScript}"
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${mavenScriptExtension}"
+ mavenscript="${mavenScript}"
goal="${maven.cruisecontrol.goals}"
projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
</schedule>
1.11 +2 -2 maven-plugins/cruisecontrol/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 16 Nov 2004 18:26:32 -0000 1.10
+++ plugin.jelly 17 Nov 2004 14:17:29 -0000 1.11
@@ -58,10 +58,10 @@
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <j:set var="mavenScriptExtension" value=".bat"/>
+ <j:set var="mavenScript"
value="${maven.cruisecontrol.mavenhome}/bin/maven.bat"/>
</j:when>
<j:otherwise>
- <j:set var="mavenScriptExtension" value=".sh"/>
+ <j:set var="mavenScript"
value="${maven.cruisecontrol.mavenhome}/bin/maven"/>
</j:otherwise>
</j:choose>
<x:parse var="doc"><cruisecontrol></cruisecontrol></x:parse>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
