diff options
author | Doug Schaefer | 2004-03-30 19:44:42 +0000 |
---|---|---|
committer | Doug Schaefer | 2004-03-30 19:44:42 +0000 |
commit | 76e58ecb8a2828ca6c00d96bc16be4784ffb7a12 (patch) | |
tree | c7609e32d451e99a27d6d94efb9fd24d88dc711f /releng | |
parent | 656d676a739d4e0358e9706fd5d9c9f991f369e5 (diff) | |
download | org.eclipse.cdt-76e58ecb8a2828ca6c00d96bc16be4784ffb7a12.tar.gz org.eclipse.cdt-76e58ecb8a2828ca6c00d96bc16be4784ffb7a12.tar.xz org.eclipse.cdt-76e58ecb8a2828ca6c00d96bc16be4784ffb7a12.zip |
Added generation of milestone update site and the
compile errors into the build mail message.
Diffstat (limited to 'releng')
-rw-r--r-- | releng/org.eclipse.cdt.releng/.cvsignore | 2 | ||||
-rw-r--r-- | releng/org.eclipse.cdt.releng/build.xml | 36 | ||||
-rw-r--r-- | releng/org.eclipse.cdt.releng/message.txt | 3 | ||||
-rw-r--r-- | releng/org.eclipse.cdt.releng/site.in | 13 |
4 files changed, 51 insertions, 3 deletions
diff --git a/releng/org.eclipse.cdt.releng/.cvsignore b/releng/org.eclipse.cdt.releng/.cvsignore index da3ba6c23a9..4a1771d00b1 100644 --- a/releng/org.eclipse.cdt.releng/.cvsignore +++ b/releng/org.eclipse.cdt.releng/.cvsignore @@ -3,3 +3,5 @@ results workspace cdt-map.txt build.log +compile.log +mail.txt diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml index 8cd0b1f2768..6823d74db10 100644 --- a/releng/org.eclipse.cdt.releng/build.xml +++ b/releng/org.eclipse.cdt.releng/build.xml @@ -3,6 +3,7 @@ <target name="build" depends="zips,test,updateSite"/> <target name="nightly" depends="build,upload,mail"/> <target name="integration" depends="nightly,wswbmap"/> + <target name="milestone" depends="integration,milestoneSite"/> <target name="init"> <touch file="${user.home}/.cvspass" /> @@ -19,6 +20,7 @@ <property name="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/> <property name="sitedir" value="${buildDirectory}/build.site"/> <property name="siteversion" value="2.0.0"/> + <property name="milestonedir" value="${buildDirectory}/${milestone}"/> </target> <target name="zips" depends="init"> @@ -29,6 +31,9 @@ <ant antfile="build.xml" dir="${pde.build.scripts}"> <property name="builder" value="${basedir}/builders" /> </ant> + <concat destfile="compile.log"> + <fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/> + </concat> </target> <target name="test" depends="init"> @@ -56,7 +61,6 @@ </target> <target name="updateSite" depends="init"> - <mkdir dir="${sitedir}"/> <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-aix.motif.ppc.zip" dest="${sitedir}"/> <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.gtk.x86.zip" dest="${sitedir}"/> <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.motif.x86.zip" dest="${sitedir}"/> @@ -90,6 +94,29 @@ destfile="${sitedir}/${dir}/${id}_${siteversion}.${timestamp}.jar"/> </target> + <target name="milestoneSite" depends="init"> + <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-aix.motif.ppc.zip" dest="${milestonedir}"/> + <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.gtk.x86.zip" dest="${milestonedir}"/> + <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.motif.x86.zip" dest="${milestonedir}"/> + <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-qnx.photon.x86.zip" dest="${milestonedir}"/> + <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-solaris.motif.sparc.zip" dest="${milestonedir}"/> + <unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-win32.win32.x86.zip" dest="${milestonedir}"/> + <unzip src="${zipsdir}/org.eclipse.cdt.make-${buildId}.zip" dest="${milestonedir}"/> + <unzip src="${zipsdir}/org.eclipse.cdt.managedbuilder-${buildId}.zip" dest="${milestonedir}"/> + <antcall target="allElements"> + <param name="target" value="milestoneJars"/> + </antcall> + <copy file="site.in" tofile="${milestonedir}/site.xml"/> + <replace file="${milestonedir}/site.xml" token="@milestone@" value="${milestone}"/> + <delete dir="${milestonedir}/eclipse"/> + </target> + + <target name="milestoneJars"> + <mkdir dir="${milestonedir}/${dir}"/> + <jar basedir="${milestonedir}/eclipse/${dir}/${id}_${siteversion}" + destfile="${milestonedir}/${dir}/${id}_${siteversion}.jar"/> + </target> + <target name="upload" depends="init"> <ftp server="update.eclipse.org" userid="${cdtuser}" password="${cdtpasswd}" remotedir="${remotedir}" action="put" verbose="yes"> @@ -107,9 +134,12 @@ </target> <target name="mail" depends="init"> + <concat destfile="mail.txt"> + <filelist dir="${basedir}" files="message.txt,compile.log"/> + </concat> <mail subject="CDT Build ${siteversion}.${timestamp} completed" - tolist="cdt-test-dev@eclipse.org" from="dschaefe@ca.ibm.com"> - <message src="message.txt"/> + tolist="dschaefe@ca.ibm.com" from="dschaefe@ca.ibm.com"> + <message src="mail.txt"/> </mail> </target> diff --git a/releng/org.eclipse.cdt.releng/message.txt b/releng/org.eclipse.cdt.releng/message.txt index 2f53bb3cfc0..c668b758d41 100644 --- a/releng/org.eclipse.cdt.releng/message.txt +++ b/releng/org.eclipse.cdt.releng/message.txt @@ -4,3 +4,6 @@ The build is available at Cheers, dschaefer2, the buildmaster... + +--- Compile logs --- + diff --git a/releng/org.eclipse.cdt.releng/site.in b/releng/org.eclipse.cdt.releng/site.in new file mode 100644 index 00000000000..5fd14fba5ea --- /dev/null +++ b/releng/org.eclipse.cdt.releng/site.in @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <category-def name="cdt" label="CDT Milestone @milestone@"/> + <feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_2.0.0.jar" version="2.0.0"> + <category name="cdt"/> + </feature> + <feature id="org.eclipse.cdt.make" url="features/org.eclipse.cdt.make_2.0.0.jar" version="2.0.0"> + <category name="cdt"/> + </feature> + <feature id="org.eclipse.cdt.managedbuilder" url="features/org.eclipse.cdt.managedbuilder_2.0.0.jar" version="2.0.0"> + <category name="cdt"/> + </feature> +</site> |