Author: hfnukal Date: 2011-11-10 09:08:31 -0500 (Thu, 10 Nov 2011) New Revision: 8028 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml Log: JBEPP-1355 Doc and src packaging, git support Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml 2011-11-10 13:33:50 UTC (rev 8027) +++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/build.xml 2011-11-10 14:08:31 UTC (rev 8028) @@ -169,19 +169,31 @@ </target> <!-- MEAD BUILD --> + + <target name="brew-url-git"> + <echo file="${ant.build.dir}/brew.url">${scm.type}+${scm.base}/${scm.repo}/${scm.path}#${scm.revision}</echo> + </target> + <target name="brew-url-svn"> + <echo file="${ant.build.dir}/brew.url">${scm.type}+${scm.base}/${scm.repo}?${scm.path}#${scm.revision}</echo> + </target> + <target name="mead-build" depends="patch,profiles,properties,brew-build-scratch-no,brew-build-scratch-yes,scm-revision"> <loadfile property="scm.revision" srcFile="${ant.build.dir}/scm.revision"/> + <antcall target="brew-url-${scm.type}" inheritRefs="true" inheritAll="true" /> + <loadfile property="brew.url" srcFile="${ant.build.dir}/brew.url"/> + <property name="mead.properties">${mead.build.properties}</property> <property name="mead.profiles">${mead.build.profiles}</property> - + + <echo></echo> - <echo>${cmd.brew} mead-build ${mead.target} '${scm.type}+${scm.base}/${scm.repo}?${scm.path}#${scm.revision}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch}</echo> + <echo>${cmd.brew} mead-build ${mead.target} '${brew.url}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch}</echo> <echo></echo> <echo file="${brew.commands.file}" append="true"> # Name: ${project.name} -${cmd.brew} mead-build ${mead.target} '${scm.type}+${scm.base}/${scm.repo}?${scm.path}#${scm.revision}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch} +${cmd.brew} mead-build ${mead.target} '${brew.url}' ${mead.patch} ${mead.profiles} ${mead.properties} ${mead.parameters} ${brew.build.scratch} </echo> @@ -189,7 +201,6 @@ </target> - <!-- PATCH --> <target name="patch" depends="patch-cond-if,patch-cond-else" /> <target name="patch-cond"> @@ -279,10 +290,11 @@ <!-- EXECUTE MEAD BUILD --> <target name="brew-build-exec" if="brew.exec"> + <exec executable="${cmd.brew}" output="${ant.build.dir}/task.properties" failonerror="true" failifexecutionfails=""> <arg value="maven-build"/> <arg value="${mead.target}"/> - <arg value="${scm.type}+${scm.base}/${scm.repo}?${scm.path}#${scm.revision}" /> + <arg value="${brew.url}" /> <arg line="${mead.patch} ${mead.profiles} ${mead.properties} ${brew.build.scratch} ${mead.parameters}" /> </exec> <!-- FOR TESTING -->