[jbosstools-commits] JBoss Tools SVN: r22020 - branches/modular_build/build.

Author: nickboldt Date: 2010-05-11 15:09:39 -0400 (Tue, 11 May 2010) New Revision: 22020 Modified: branches/modular_build/build/build.xml Log: fix bootstrapping for drools build; add constraint for custom build.xml: run only if pom.xml does not call custom build.xml directly Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-11 19:06:24 UTC (rev 22019) +++ branches/modular_build/build/build.xml 2010-05-11 19:09:39 UTC (rev 22020) @@ -574,8 +574,17 @@ </else> </if> <!-- optional extra instructions to do before a maven build --> + <loadfile property=&quot;(a){COMPONENT}.pom.xml&quot; srcfile=&quot;${WORKINGDIR}/(a){COMPONENT}/pom.xml&quot; /> <if> - <available file=&quot;${WORKINGDIR}/(a){COMPONENT}/build.xml&quot; type="file" /> + <and> + <!-- if pom.xml does not call custom build.xml directly --> + <not> + <contains string=&quot;${(a){COMPONENT}.pom.xml}&quot; + substring="&lt;ant antfile=&quot;build.xml&quot; /&gt;" + /> + </not> + <available file=&quot;${WORKINGDIR}/(a){COMPONENT}/build.xml&quot; type="file" /> + </and> <then> <echo>Run custom @{COMPONENT}/build.xml</echo> <ant antfile=&quot;${WORKINGDIR}/(a){COMPONENT}/build.xml&quot;&gt;