Author: nickboldt Date: 2010-05-11 15:06:24 -0400 (Tue, 11 May 2010) New Revision: 22019 Modified: branches/modular_build/build/build.xml Log: fix bootstrapping for drools build Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-11 19:06:11 UTC (rev 22018) +++ branches/modular_build/build/build.xml 2010-05-11 19:06:24 UTC (rev 22019) @@ -322,7 +322,7 @@ <istrue value="${svnant.enabled}" /> <then> <!-- remove generated site/ folder --> - <delete dir="${WORKINGDIR}/@{component}/site" includeemptydirs="true" quiet="true"/> + <delete dir="${WORKINGDIR}/@{component}/site" includeemptydirs="true" quiet="true" /> <svn javahl="false" svnkit="true" failonerror="false"> <revert recurse="${svn.recurse}" dir="@{component}" /> </svn> @@ -531,7 +531,7 @@ </if> </then> <else> - <antcallback target="get.all.components" return="COMPONENTS.to.build"/> + <antcallback target="get.all.components" return="COMPONENTS.to.build" /> </else> </if> </target> @@ -1178,6 +1178,27 @@ </for> </target> + <!-- rename previously built & unpacked feature dirs --> + <target name="renameFeatures"> + <echo>${WORKINGDIR}/${COMPONENT}/features</echo> + <for param="artifactJar"> + <path> + <dirset dir="${WORKINGDIR}/${COMPONENT}/features" includes="*feature_*" /> + </path> + <sequential> + <antcallback target="get.artifact.id" return="artifact.id"> + <property name="artifactJar" value="@{artifactJar}" /> + <property name="regexp.path" value=".+/features/([^/]+feature)_\d+.+" /> + </antcallback> + <move file="@{artifactJar}" + tofile="${WORKINGDIR}/${COMPONENT}/features/${artifact.id}" + overwrite="true" + /> + <var name="artifact.id" unset="true" /> + </sequential> + </for> + </target> + <!-- for a given ${COMPONENT} dir, switch all plugin/feature manifests from .SNAPSHOT to .qualifier --> <target name="snapshot2qualifier"> <property name="COMPONENT" value="" /> @@ -1204,8 +1225,8 @@ <target name="genBuildProperties"> <for param="artifactDir"> <path> - <dirset dir="${WORKINGDIR}/${COMPONENT}/features/" /> - <dirset dir="${WORKINGDIR}/${COMPONENT}/plugins/" /> + <dirset dir="${WORKINGDIR}/${COMPONENT}/features/" excludes="." includes="*" /> + <dirset dir="${WORKINGDIR}/${COMPONENT}/plugins/" excludes="." includes="*" /> </path> <sequential> <if>