Author: nickboldt Date: 2010-05-08 09:59:22 -0400 (Sat, 08 May 2010) New Revision: 21966 Modified: branches/modular_build/build/build.xml Log: JBDS-486 JBDS-1210 can now use Tycho to generate update site zip, so no need to do custom packaging -- just need a site.xml and a pom.xml and `mvn3 clean verify` will produce target/site.zip Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-08 13:54:53 UTC (rev 21965) +++ branches/modular_build/build/build.xml 2010-05-08 13:59:22 UTC (rev 21966) @@ -880,53 +880,30 @@ </else> </if> - <!-- Delete pointless site.zip --> - <delete file="${WORKINGDIR}/${update.site.path}/target/site.zip" /> + <!-- rename resulting update site zip --> + <move file="${WORKINGDIR}/${update.site.path}/target/site.zip" + tofile="${destinationZip}" + overwrite="true" + preservelastmodified="false" + /> + <!-- Copy zip into workspace so it can be archived by Hudson --> <if> - <and> - <available file="${WORKINGDIR}/${update.site.path}/target/site/plugins" type="dir" /> - <available file="${WORKINGDIR}/${update.site.path}/target/site/features" type="dir" /> - </and> + <not> + <equals arg1="${basedir}" arg2="${WORKINGDIR}" /> + </not> <then> - <!-- Create real update site zip, including web UI --> - <copy todir="${WORKINGDIR}/${update.site.path}/target/site"> - <fileset dir="${WORKINGDIR}/${update.site.path}" includes="web/*, index.html" /> + <mkdir dir="${basedir}/${update.site.path}/target" /> + <copy todir="${basedir}/${update.site.path}/target" + flatten="true" + preservelastmodified="true" + overwrite="true" + > + <fileset dir="${WORKINGDIR}/${update.site.path}/target" includes="*Update*.zip" /> </copy> - <zip destfile="${destinationZip}" - basedir="${WORKINGDIR}/${update.site.path}/target/site" - update="false" - /> - - <!-- Copy zip into workspace so it can be archived by Hudson --> - <if> - <not> - <equals arg1="${basedir}" arg2="${WORKINGDIR}" /> - </not> - <then> - <mkdir dir="${basedir}/${update.site.path}/target" /> - <copy todir="${basedir}/${update.site.path}/target" - flatten="true" - preservelastmodified="true" - overwrite="true" - > - <fileset dir="${WORKINGDIR}/${update.site.path}/target" includes="*Update*.zip" /> - </copy> - </then> - </if> </then> - <else> - <if> - <equals arg1="${update.site.path}" arg2="site" /> - <then> - <fail>Overall update site zip is empty!</fail> - </then> - <else> - <echo level="info">Update site zip for ${COMPONENTS.to.build} is empty!</echo> - </else> - </if> - </else> </if> + </target> <!-- Used to build the update site of a component; requires a site.xml and pom.xml be generated first -->