Author: nickboldt Date: 2010-05-27 17:45:11 -0400 (Thu, 27 May 2010) New Revision: 22394 Added: branches/modular_build/build/jbds.product branches/modular_build/build/jbds4.target branches/modular_build/build/publish.sh Modified: branches/modular_build/build/build.xml Log: port from trunk Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-27 21:44:34 UTC (rev 22393) +++ branches/modular_build/build/build.xml 2010-05-27 21:45:11 UTC (rev 22394) @@ -9,16 +9,16 @@ value="tests,common; flow,jbpm; jmx,archives,as; - drools,bpel,smooks,freemarker,profiler,portlet,modeshape; + bpel,smooks,freemarker,profiler,portlet,modeshape; xulrunner,jst,vpe,jsf; - esb,tptp,ws; + drools,esb,tptp,ws; cdi,struts,hibernatetools,seam; examples,birt; maven" /> <!-- svn root, including trunk or branch path --> - <property name="svn.root" value="http://anonsvn.jboss.org/repos/jbosstools/branches/modular_bu... /> + <property name="svn.root" value="http://anonsvn.jboss.org/repos/jbosstools/branches/3.2.helios... /> <!-- if true, use -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository; if false, use default ~/.m2/repository; or set another path if preferred --> <property name="maven.repo.local" value="true" /> @@ -516,14 +516,7 @@ <echo level="warning">All components up to date: nothing to do! To force a build of unchanged components, use -Dbuild.if.sources.unchanged=true</echo> - <!-- create fake test result file to avoid Hudson failure --> - <delete dir="${basedir}/surefire-reports/NoTestsRun" includeemptydirs="true" /> - <mkdir dir="${basedir}/surefire-reports/NoTestsRun" /> - <echo file="${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml">&lt;?xml version="1.0" encoding="UTF-8" ?&gt; -&lt;testsuite failures="0" time="0.001" errors="0" skipped="0" tests="1" name="org.jboss.tools.NoTestsRun"&gt; - &lt;testcase time="0.001" classname="org.jboss.tools.NoTestsRun" name="NoTestsRun"/&gt; -&lt;/testsuite&gt; -</echo> + <antcall target="create.empty.test.results.file" /> <property name="no.tests.run" value="true" /> <property name="no.overall" value="true" /> </then> @@ -551,9 +544,68 @@ </if> </target> + <!-- + To run this after a maven build in Hudson, set these properties: + basedir=${WORKSPACE}/sources + WORKINGDIR=${WORKSPACE}/sources + COMPONENT=. + move.test.results=true + --> + <target name="collect.test.results.for.hudson" + depends="init" + if="isInHudson" + description="collect test results after a pure maven build so Hudson has something to see" + > + <property name="basedir" value="${WORKSPACE}/sources" /> + <property name="WORKINGDIR" value="${WORKSPACE}/sources" /> + <property name="COMPONENT" value="." /> + <property name="move.test.results" value="true" /> + <var name="tests.results.found" value="false" /> + <echo level="debug">basedir = ${basedir} +WORKINGDIR = ${WORKINGDIR} +COMPONENT = ${COMPONENT}</echo> + <delete dir="${basedir}/surefire-reports/NoTestsRun" includeemptydirs="true" /> + <for param="test.xml.files" delimiter=", + "> + <path> + <fileset dir="${WORKINGDIR}" + includes="**/target/surefire-reports/TEST-*.xml, **/**/target/surefire-reports/TEST-*.xml" + excludes="**/TEST-*NoTestsRun.xml, **/**/TEST-*NoTestsRun.xml" + /> + </path> + <sequential> + <var name="tests.results.found" value="true" /> + </sequential> + </for> + <if> + <equals arg1="${tests.results.found}" arg2="true" /> + <then> + <antcall target="collect.test.results"> + <param name="COMPONENT" value="." /> + </antcall> + <antcall target="collect.all.test.results" /> + </then> + <else> + <antcall target="create.empty.test.results.file" /> + <property name="no.tests.run" value="true" /> + </else> + </if> + </target> + + <target name="create.empty.test.results.file"> + <!-- create fake test result file to avoid Hudson failure --> + <delete dir="${basedir}/surefire-reports/NoTestsRun" includeemptydirs="true" /> + <mkdir dir="${basedir}/surefire-reports/NoTestsRun" /> + <echo file="${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml">&lt;?xml version="1.0" encoding="UTF-8" ?&gt; +&lt;testsuite failures="0" time="0.001" errors="0" skipped="0" tests="1" name="org.jboss.tools.NoTestsRun"&gt; +&lt;testcase time="0.001" classname="org.jboss.tools.NoTestsRun" name="NoTestsRun"/&gt; +&lt;/testsuite&gt; +</echo> + </target> + <target name="run.build"> <!-- could set -Dmaven.test.skip to skip tests, or use osgi-test:test to just (re-)run tests w/o first building --> - <property name="MAVEN_FLAGS" value="clean install -B -fn -q -U -e -Dsurefire.useFile=false" /> + <property name="MAVEN_FLAGS" value="clean install -B -fn -q -U -e" /> <!-- commandline overrides to suppress doing tests --> <if> @@ -608,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> @@ -742,8 +795,14 @@ preservelastmodified="true" overwrite="true" - <fileset dir="${WORKINGDIR}/${COMPONENT}" includes="**/target/surefire-reports/*.xml" /> + <fileset dir="${WORKINGDIR}/${COMPONENT}" includes="**/target/surefire-reports/TEST-*.xml" /> </copy> + <if> + <isset property="move.test.results" /> + <then> + <delete dir="${WORKINGDIR}/${COMPONENT}" includes="**/target/surefire-reports" /> + </then> + </if> </target> <target name="collect.all.test.results" unless="no.tests.run"> @@ -754,10 +813,7 @@ <for param="testresultfile" delimiter=", "> <path> - <fileset dir="${basedir}/surefire-reports/" - includes="**/TEST-*.xml" - excludes="**/*pom.xml, **/build.xml" - /> + <fileset dir="${basedir}/surefire-reports/" includes="**/TEST-*.xml" /> </path> <sequential> <var name="testsuite.name" unset="true" /> @@ -891,7 +947,7 @@ <equals arg1="@{COMPONENT}" arg2="site" /> <then> <var name="destinationZip" - value=&quot;${WORKINGDIR}/(a){COMPONENT}/site/target/JBossTools-ALL-Update-SNAPSHOT.zip&quot; + value=&quot;${WORKINGDIR}/(a){COMPONENT}/site/target/jbosstools-ALL-Update-SNAPSHOT.zip&quot; /> </then> <else> @@ -906,7 +962,7 @@ </else> </if> <var name="destinationZip" - value=&quot;${WORKINGDIR}/(a){COMPONENT}/site/target/JBossTools-${COMPONENT.name}-Update-SNAPSHOT.zip&quot; + value=&quot;${WORKINGDIR}/(a){COMPONENT}/site/target/jbosstools-${COMPONENT.name}-Update-SNAPSHOT.zip&quot; /> </else> </if> @@ -918,10 +974,10 @@ /> </sequential> </for> - + <for param="updateZip"> <path> - <fileset dir="${WORKINGDIR}/@{COMPONENT}" includes="**/JBossTools*Update*.zip" /> + <fileset dir="${WORKINGDIR}/@{COMPONENT}" includes="**/jbosstools*Update*.zip" /> </path> <sequential> <propertyregex property="updateZip" @@ -1037,7 +1093,7 @@ <equals arg1="${update.site.path}" arg2="site" /> <then> <var name="destinationZip" - value="${WORKINGDIR}/${update.site.path}/target/JBossTools-ALL-Update-SNAPSHOT.zip" + value="${WORKINGDIR}/${update.site.path}/target/jbosstools-ALL-Update-SNAPSHOT.zip" /> </then> <else> @@ -1052,7 +1108,7 @@ </else> </if> <var name="destinationZip" - value="${WORKINGDIR}/${update.site.path}/target/JBossTools-${COMPONENT.name}-Update-SNAPSHOT.zip" + value="${WORKINGDIR}/${update.site.path}/target/jbosstools-${COMPONENT.name}-Update-SNAPSHOT.zip" /> </else> </if> @@ -1126,7 +1182,7 @@ <fail>Overall update site zip contains no features!</fail> </then> <else> - <echo level="info">Update site zip for ${COMPONENTS.to.build} contains no features!</echo> + <echo level="info"> [ERROR] Update site zip for ${COMPONENTS.to.build} contains no features!</echo> </else> </if> </else> @@ -1194,10 +1250,26 @@ </echo> <mkdir dir="${updateSiteJarDir}/../features" /> + <if> + <!-- special case: for tests component, we WANT test features; for everyone else, test features shouldn't be on the site --> + <equals arg1="${COMPONENT}" arg2="tests" /> + <then> + <path id="featureJars"> + <fileset dir="${updateSiteJarDir}/../features" includes="**/target/*.jar" /> + </path> + </then> + <else> + <path id="featureJars"> + <fileset dir="${updateSiteJarDir}/../features" + includes="**/target/*.jar" + excludes="**/*test*" + id="" + /> + </path> + </else> + </if> <for param="featureJar"> - <path> - <fileset dir="${updateSiteJarDir}/../features" includes="**/target/*.jar" excludes="**/*test*" /> - </path> + <path refid="featureJars" /> <sequential> <var name="feature.jarfile" unset="true" /> <var name="feature.id" unset="true" /> Added: branches/modular_build/build/jbds.product =================================================================== --- branches/modular_build/build/jbds.product (rev 0) +++ branches/modular_build/build/jbds.product 2010-05-27 21:45:11 UTC (rev 22394) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="JBoss Devloper Studio" uid="com.jboss.developer.studio" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="3.1.0" useFeatures="true" includeLaunchers="true"> + + + <configIni use="default"> + </configIni> + + <launcherArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> + </launcherArgs> + + <windowImages/> + + + <launcher name="jbds"> + <solaris/> + <win useIco="false"> + <bmp/> + </win> + </launcher> + + + <vm> + <linux>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</linux> + <macos>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</macos> + <solaris>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</solaris> + <windows>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</windows> + </vm> + + + <plugins> + </plugins> + + +</product> Added: branches/modular_build/build/jbds4.target =================================================================== --- branches/modular_build/build/jbds4.target (rev 0) +++ branches/modular_build/build/jbds4.target 2010-05-27 21:45:11 UTC (rev 22394) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde version="3.6"?> + +<target name="JBDS 4 / Eclipse 3.6 / Web Tools 3.2"> +<locations> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.eclipse.platform.ide" version="3.6.0.I20100520-1744"/> +<unit id="org.eclipse.platform.sdk" version="3.6.0.I20100520-1744"/> +<unit id="org.eclipse.sdk.ide" version="3.6.0.I20100520-1744"/> +<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211614"/> +<unit id="org.eclipse.swt.tools" version="3.6.0.v3611d"/> +<repository location="http://download.eclipse.org/eclipse/updates/3.6milestones/... +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100525-2205-35-7w3121163603316"/> +<repository location="http://download.eclipse.org/birt/update-site/2.6-interim/&... +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.eclipse.emf.sdk.feature.group" version="2.6.0.v20100517-1331"/> +<unit id="org.eclipse.gef.sdk.feature.group" version="3.6.0.v20100429-2050-7G7R-A5WNaPQIcSWKMfdROUWaQLI"/> +<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100429-2050-679-8COKLDAJPWQNSXWPTedQT8YP"/> +<unit id="org.eclipse.xsd.sdk.feature.group" version="2.6.0.v20100503-1402"/> +<unit id="org.eclipse.tptp.monitoring.runtime.feature.group" version="4.5.0.v201005032111-7T7X-7r2VNos_vYhrZgcqiTMM"/> +<unit id="org.eclipse.tptp.platform.runtime.feature.group" version="4.7.0.v201005032111-7u84-8ksiMskubQ6UTA7XS3tcLX0"/> +<unit id="org.eclipse.tptp.wtp.feature.group" version="4.5.0.v201005032111-54-78I8G0BlG8C88S8WCW88"/> +<unit id="org.eclipse.tptp.birt.feature.group" version="4.5.0.v201005032111-53-78A8A09t84644E4G6G44"/> +<unit id="org.eclipse.tptp.test.runtime.feature.group" version="4.5.0.v201005032111-7H7I-7VrO5DXI-B6opYKPuD-96gb"/> +<unit id="org.eclipse.tptp.trace.runtime.feature.group" version="4.4.0.v201005032111-7H7C-7XbL_J3E9NJOSVeYeWM94"/> +<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201004210628-208Z7w31211419"/> +<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201004210628-51EoAkF77g8HBSc"/> +<repository location="http://download.eclipse.org/releases/helios"/> +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.maven.ide.eclipse.sdk.feature.feature.group" version="0.10.0.20100209-0800"/> +<unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.10.0.20100209-0800"/> +<unit id="org.maven.ide.eclipse.subclipse.feature.feature.group" version="0.10.0.20100209-0800"/> +<unit id="org.maven.ide.eclipse.cvs.feature.feature.group" version="0.10.0.20100209-0800"/> +<unit id="org.maven.ide.eclipse.scm.feature.feature.group" version="0.10.0.20100209-0800"/> +<unit id="org.maven.ide.eclipse.temporary.mojos.feature.feature.group" version="0.10.0.20100209-0800"/> +<repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/"/> +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.0.20100209-0800"/> +<repository location="http://m2eclipse.sonatype.org/sites/m2e"/> +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.tmatesoft.svnkit.feature.group" version="1.3.3.6648"/> +<unit id="com.sun.jna.feature.group" version="3.2.3"/> +<repository location="http://eclipse.svnkit.com/1.3.x/"/> +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.polarion.eclipse.team.svn.connector.svnkit15.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.javahl15.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.javahl15.win32.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.svnkit16.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.javahl16.win32.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.javahl.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.javahl16.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.javahl.win32.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.svnkit.feature.group" version="2.2.2.I20100512-1900"/> +<unit id="org.polarion.eclipse.team.svn.connector.source.feature.group" version="2.2.2.I20100512-1900"/> +<repository location="http://www.polarion.org/projects/subversive/download/eclip... +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.eclipse.team.svn.mylyn.feature.group" version="0.7.9.I20100512-1900"/> +<unit id="org.eclipse.team.svn.source.feature.group" version="0.7.9.I20100512-1900"/> +<unit id="org.eclipse.team.svn.feature.group" version="0.7.9.I20100512-1900"/> +<unit id="org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" version="0.7.9.I20100512-1900"/> +<unit id="org.eclipse.team.svn.revision.graph.feature.group" version="0.7.9.I20100512-1900"/> +<unit id="org.eclipse.team.svn.nl1.feature.group" version="0.7.9.I20100512-1900"/> +<repository location="http://download.eclipse.org/technology/subversive/0.7/upda... +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.eclipse.ecf.core.source.feature.group" version="3.2.0.v20100219-1253"/> +<unit id="org.eclipse.ecf.core.featurepatch.source.feature.group" version="3.2.0.v20100219-1253"/> +<unit id="org.eclipse.ecf.core.feature.group" version="3.2.0.v20100219-1253"/> +<unit id="org.eclipse.ecf.core.featurepatch.feature.group" version="3.2.0.v20100219-1253"/> +<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/> +</location> +<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit"> +<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/> +<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/> +<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/> +<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/> +<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/> +<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-b... +</location> +</locations> +<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +</target> Added: branches/modular_build/build/publish.sh =================================================================== --- branches/modular_build/build/publish.sh (rev 0) +++ branches/modular_build/build/publish.sh 2010-05-27 21:45:11 UTC (rev 22394) @@ -0,0 +1,30 @@ +#!/bin/bash +# Hudson script used to publish Tycho-built p2 update sites + +# define target zip filename date and hudson build id marked for clarity and publication +ZIPNAME=${JOB_NAME}-Update-H${BUILD_NUMBER}-${BUILD_ID}.zip + +# define target zip filename for inclusion in uberbuilder's bucky aggregator +SNAPNAME=${JOB_NAME}-Update-SNAPSHOT.zip + +rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} +if [[ -f ${WORKSPACE}/*/site/target/site.zip ]]; then + # copy into workspace for archiving + rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME}/${ZIPNAME} + # copy into workspace for access by bucky aggregator + rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME} +fi + +# if zips exist produced & renamed by ant script, copy them too +if [[ -f ${WORKSPACE}/*/*/site/target/*Update*.zip ]]; then + rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${JOB_NAME}/ +fi + +# publish to download.jboss.org +if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools"; fi +if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then + rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nightly/3.2.helios/ +fi +if [[ -d ${WORKSPACE}/site/${SNAPNAME} ]]; then + rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nightly/3.2.helios/ +fi \ No newline at end of file