Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:20:55 -0400 (Sat, 12 Apr 2008)
New Revision: 6382
Modified:
framework/trunk/ant-import/build-hudson.xml
Log:
Remove dependency on output
Modified: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml 2008-04-12 12:17:56 UTC (rev 6381)
+++ framework/trunk/ant-import/build-hudson.xml 2008-04-12 12:20:55 UTC (rev 6382)
@@ -31,8 +31,7 @@
<property name="hudson.password.${hudson.password}"
value="true"/>
<fail message="Cannot use default hudson password: ${hudson.password}"
if="hudson.password.changeme"/>
- <property name="thirdparty.dir"
value="${framework.dir}/thirdparty"/>
- <mkdir dir="${framework.dir}/output"/>
+ <property name="thirdparty.dir"
value="${framework.target.dir}/thirdparty"/>
<mkdir dir="${thirdparty.dir}"/>
</target>
@@ -85,11 +84,11 @@
description="Setup the Hudson QA environment">
<!-- get the svn url -->
- <exec dir="${framework.dir}" executable="svn"
failonerror="true" output="${framework.dir}/output/svn-info.xml">
+ <exec dir="${framework.dir}" executable="svn"
failonerror="true" output="${framework.target.dir}/svn-info.xml">
<arg line="info"/>
<arg line="--xml"/>
</exec>
- <xmlproperty file="${framework.dir}/output/svn-info.xml"/>
+ <xmlproperty file="${framework.target.dir}/svn-info.xml"/>
<property name="hudson.framework.url"
value="${info.entry.url}"/>
<!-- Configure Hudson -->
@@ -149,8 +148,7 @@
</exec>
-->
- <mkdir dir="${framework.dir}/output"/>
- <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true" output="${framework.dir}/output/hudson.log">
+ <exec executable="${hudson.tomcat}/bin/catalina.sh"
failonerror="true" output="${framework.target.dir}/hudson.log">
<env key="CATALINA_OPTS" value="-Xmx512m
-Djava.awt.headless=true"/>
<arg line="start"/>
</exec>
Show replies by date