Author: nickboldt Date: 2010-05-26 17:40:51 -0400 (Wed, 26 May 2010) New Revision: 22345 Modified: trunk/build/build.xml trunk/drools/build.xml Log: drools custom build can't find build/build.xml when using shared checkout location in Hudson Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2010-05-26 20:51:10 UTC (rev 22344) +++ trunk/build/build.xml 2010-05-26 21:40:51 UTC (rev 22345) @@ -660,6 +660,7 @@ <ant antfile=&quot;${WORKINGDIR}/(a){COMPONENT}/build.xml&quot;&gt; <property name="COMPONENT" value="@{COMPONENT}" /> <property name="basedir" value="${WORKINGDIR}/@{COMPONENT}" /> + <property name="build.xml" value="${ant.file}"/> </ant> </then> </if> Modified: trunk/drools/build.xml =================================================================== --- trunk/drools/build.xml 2010-05-26 20:51:10 UTC (rev 22344) +++ trunk/drools/build.xml 2010-05-26 21:40:51 UTC (rev 22345) @@ -24,12 +24,16 @@ <mkdir dir="${COMMON_TOOLS}" /> <echo level="info">COMMON_TOOLS = ${COMMON_TOOLS}</echo> - <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources"> + <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml"> <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" /> </condition> - <condition property="build.xml" value="${basedir}/../build/build.xml" else="${basedir}/../build.xml"> + <condition property="build.xml" value="${basedir}/../build/build.xml"> <available file="${basedir}/../build/build.xml" type="file" /> </condition> + <condition property="build.xml" value="${basedir}/../build.xml"> + <available file="${basedir}/../build.xml" type="file" /> + </condition> + <!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script --> <target name="custom.build" description="fetch latest drools from their Hudson build + selectively unpack it"