Author: alex.guizar(a)jboss.com
Date: 2007-01-29 14:07:29 -0500 (Mon, 29 Jan 2007)
New Revision: 2184
Modified:
branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
Log:
JBWS-1498
Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-29 17:56:40 UTC (rev
2183)
+++ branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-29 19:07:29 UTC (rev
2184)
@@ -28,6 +28,16 @@
<available file="${hudson.root}"
property="hudson.root.available"/>
<available file="${hudson.tomcat}"
property="hudson.tomcat.available"/>
<fail message="Hudson root not available"
unless="hudson.root.available"/>
+
+ <condition property="script.ext" value="bat">
+ <os family="windows"/>
+ </condition>
+ <condition property="script.ext" value="sh">
+ <not>
+ <os family="windows"/>
+ </not>
+ </condition>
+
</target>
<!--
@@ -63,12 +73,8 @@
<target name="hudson-setup"
depends="init-hudson,hudson-tomcat-setup"
description="Setup the Hudson QA environment">
- <exec executable="basename" outputproperty="svn.basename">
- <arg value="${svn.url}"/>
- </exec>
- <exec executable="dirname"
outputproperty="svn.basedir.local">
- <arg value="${basedir}"/>
- </exec>
+ <basename file="${svn.url}" property="svn.basename" />
+ <dirname file="${basedir}" property="svn.basedir.local" />
<!-- Configure Hudson -->
<copy todir="${hudson.home}" overwrite="true">
@@ -97,13 +103,13 @@
<target name="hudson-stop" depends="init-hudson"
description="Stops the Hudson QA environment">
- <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true">
+ <exec executable="${hudson.tomcat}/bin/catalina.${script.ext}"
failonerror="true" dir="${hudson.tomcat}">
<arg line="stop"/>
</exec>
<echo/>
<echo message="*************************************"/>
- <echo message="* Hudson stoped sucessfuly *"/>
+ <echo message="* Hudson stopped sucessfully *"/>
<echo message="* ant hudson-start *"/>
<echo message="*************************************"/>
<echo/>
@@ -113,13 +119,13 @@
<target name="hudson-start" depends="init-hudson"
description="Start the Hudson QA environment">
<mkdir dir="${build.output.dir}"/>
- <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true" output="${build.output.dir}/hudson.log">
+ <exec executable="${hudson.tomcat}/bin/catalina.${script.ext}"
failonerror="true" dir="${hudson.tomcat}"
output="${build.output.dir}/hudson.log">
<arg line="start"/>
</exec>
<echo/>
<echo message="*************************************"/>
- <echo message="* Hudson started sucessfuly *"/>
+ <echo message="* Hudson started successfully *"/>
<echo message="*
http://localhost:${hudson.port}/hudson *"/>
<echo message="*************************************"/>
<echo/>