[jbosstools-commits] JBoss Tools SVN: r21994 - branches/modular_build/build.
Author: nickboldt
Date: 2010-05-10 11:59:56 -0400 (Mon, 10 May 2010)
New Revision: 21994
Modified:
branches/modular_build/build/build.xml
Log:
add -Dhudson.managed.sources=true option (for running on Windows slave)
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-05-10 15:57:06 UTC (rev 21993)
+++ branches/modular_build/build/build.xml 2010-05-10 15:59:56 UTC (rev 21994)
@@ -82,7 +82,11 @@
ant -DCOMPONENT=jmx create.update.site; \
ant -DCOMPONENT=jbpm create.update.site
-Note: if tests stall on Linux, install Xvfb and this script will use that to run Maven.
+To have hudson manage sources (rather than having this script checkout/update them) use:
+ -Dhudson.managed.sources=true
+
+Note: if tests stall on Linux, install Xvfb and this script will use that to run Maven,
unless use:
+ -DnoXvfb=true
Here is the order in which components must be built:
</echo>
@@ -164,10 +168,7 @@
<echo level="debug">${os.name}, ${os.arch}, ${os.version},
${osgi.os}</echo>
<property name="SVNANT_MIRROR"
value="http://www.tigris.org/files/documents/906/46267" />
<if>
- <or>
- <os family="windows" />
- <contains string="${os.name}" substring="windows"
casesensitive="false" />
- </or>
+ <istrue value="${isWindows}" />
<then>
<var name="svnant.enabled" unset="true" />
<var name="svnant.enabled" value="false" />
@@ -254,6 +255,13 @@
</sequential>
</macrodef>
+ <condition property="isWindows" value="true"
else="false">
+ <or>
+ <os family="windows" />
+ <contains string="${os.name}" substring="windows"
casesensitive="false" />
+ </or>
+ </condition>
+
<!-- https://jira.jboss.org/jira/browse/JBQA-3313 Use static, shared space outside
workspace, instead of working directly in the workspace -->
<condition property="WORKINGDIR"
value="/home/hudson/static_build_env/jbds/tools/sources"
else="${basedir}">
<available file="/home/hudson/static_build_env/jbds" type="dir"
/>
@@ -293,7 +301,7 @@
<antcall target="get.maven" />
</target>
- <target name="get.sources" description="if sources not already on
disk, fetch them">
+ <target name="get.sources" description="if sources not already on
disk, fetch them" unless="hudson.managed.sources">
<property name="clean.sources" value="false" />
<property name="svn.recurse" value="true" />
@@ -339,7 +347,6 @@
destpath="${WORKINGDIR}/@{component}"
/>
</svn>
-
</then>
<else>
<antcall target="mvn">