7:20 a.m.
Author: nickboldt
Date: 2011-03-04 01:20:50 -0500 (Fri, 04 Mar 2011)
New Revision: 29506
Added:
trunk/build/results/OLD/
trunk/build/results/OLD/buildResults.xsl
Modified:
trunk/build/results/.gitignore
trunk/build/results/build.xml
trunk/build/results/buildResults.xsl
Log:
JBIDE-7444 work in progress - generating a new buildResults.html page with more aggregate
information from upstream component builds
Modified: trunk/build/results/.gitignore
===================================================================
--- trunk/build/results/.gitignore 2011-03-04 06:20:33 UTC (rev 29505)
+++ trunk/build/results/.gitignore 2011-03-04 06:20:50 UTC (rev 29506)
@@ -1 +1,2 @@
*.out.*
+zips
Copied: trunk/build/results/OLD/buildResults.xsl (from rev 29505,
trunk/build/results/buildResults.xsl)
===================================================================
--- trunk/build/results/OLD/buildResults.xsl (rev 0)
+++ trunk/build/results/OLD/buildResults.xsl 2011-03-04 06:20:50 UTC (rev 29506)
@@ -0,0 +1,264 @@
+<xsl:transform version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan">
+ <xsl:output method="html" indent="yes"
xalan:indent-amount="4" />
+ <xsl:template match="/projects">
+
+ <xsl:variable name="baseurl">
+ <xsl:value-of select="@baseurl" />
+ </xsl:variable>
+
+ <html>
+ <head>
+ <title>JBossTools Build Results</title>
+ <link rel="stylesheet" type="text/css"
href="buildResults.css" />
+ </head>
+ <body>
+ <div id="header-blue">
+ <table width="100%" height="100%">
+ <tr>
+ <td>
+ <span id="title-blue">JBossTools Build Results</span>
+ <br />
+ <span id="buildName-blue">
+ ${build-type} build
+ ${jbds-build-name}
+ <span id="buildName-blue" style="font-size:
x-small;">
+ [Hudson Build
+ <a id="buildName-blue" style="font-size: x-small;"
+ href="http://hudson.qa.jboss.com/hudson/view/DevStudio/job/${hudson-...,
+ ${hudson-build-id}</a>
+ ]
+ </span>
+ <span id="buildName-blue" style="font-size: x-small;
font-style: italic;">
+ <a id="buildName-blue"
+ style="font-size: x-small; font-style: italic; color: black;"
+ href="http://hudson.jboss.org/hudson/view/JBossTools/job/${hudson-jo...
+ Hudson Mirror</a>
+ </span>
+ </span>
+ </td>
+ <td align="right">
+ <span id="buildDate-blue">${date}</span>
+ <br />
+ <span id="buildExecTime-blue">${build-time}</span>
+ <br />
+ <a id="buildLog-blue"
+ href="http://download.jboss.org/jbosstools/builds/staging/${hudson-j...
Logs</a>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="downloads-blue">
+ <table id="links-blue" width="100%">
+ <tr>
+ <td>
+ <a class="blue"
href="http://www.jboss.org/tools">JBossTools</a>
+ |
+ <a class="blue"
href="http://www.redhat.com/jbds">JBDS</a>
+ |
+ <a class="blue"
href="http://tools.hibernate.org">Hibernate Tools</a>
+ |
+ <a class="blue"
+ href="http://www.jboss.com/index.html?module=bb&op=viewforum...
+ Forum</a>
+ |
+ <a class="blue"
+ href="http://jboss.com/index.html?module=bb&op=viewforum&...
+ Forum</a>
+ |
+ <a class="blue"
+ href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10020&...
+ / Bugs</a>
+ | #jbosstools on irc.freenode.net
+ </td>
+ <td align="right">
+ <a class="blue" href="http://www.redhat.com">
+ <img src="images/redhat.gif" border="0" />
+ </a>
+ <a class="blue" href="http://www.jboss.org">
+ <img src="images/jboss.gif" border="0" />
+ </a>
+ <a class="blue" href="http://www.hibernate.org">
+ <img src="images/hibernate.gif" border="0" />
+ </a>
+ <a class="blue" href="http://www.eclipse.org">
+ <img src="images/eclipse.gif" border="0" />
+ </a>
+ </td>
+ </tr>
+ </table>
+
+ <div id="downloadLinks">
+
+ <table>
+ <tr>
+ <td colspan="2">
+ First time here ? Read
+ <a
href="http://www.jboss.org/tools/download/installation.html">...
+ to install JBoss Tools.</a>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <h1>p2 Repo / Update Site Zips:</h1>
+ </td>
+ </tr>
+
+ <xsl:for-each select="project">
+ <xsl:variable name="rowColor">
+ <xsl:if test="position() mod 2 = 1">
+ #CCCCEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ <xsl:if test="contains(@name,'All')">
+ #CCEECC
+ </xsl:if>
+ <xsl:if test="contains(@name,'Source')">
+ #EECCCC
+ </xsl:if>
+ </xsl:variable>
+
+ <tr bgcolor="{$rowColor}">
+ <td>
+ <img src="images/OK-small.png" />
+ </td>
+ <td class="downloadInfo">
+ <xsl:for-each select=".">
+ <b>
+ <acronym title="{@name} :: {description}">
+ <a class="allLink-blue"
href="{$baseurl}/{download/@url}">
+ <xsl:value-of select="concat(@name,' ',@version)"
/>
+ </a>
+ </acronym>
+ <br />
+ <a class="md5"
href="{$baseurl}/{download/(a)url}.MD5">MD5</a>
+ | filesize:
+ <xsl:value-of select="download/@size" />
+ </b>
+ <br />
+ </xsl:for-each>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+
+ </div>
+
+ <div id="rightFrame">
+ <div id="buildDrivers-blue">
+ <b>SVN Revisions</b>
+ <br />
+ See
+ <a
+ href="http://download.jboss.org/jbosstools/builds/staging/jbosstools...
+ </div>
+ <div id="buildDrivers-blue">
+ <b>Target Platform</b>
+ <table>
+ <tr>
+ <td rowspan="3">
+ Eclipse Helios 3.6.1 +
+ <br />
+ Web Tools 3.2.2 +
+ <br />
+ TPTP + BIRT + DTP ...
+ </td>
+ <td>
+ <a class="blue"
+ href="http://download.jboss.org/jbosstools/updates/target-platform/l...
Platform Update Site</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a class="blue"
+ href="http://download.jboss.org/jbosstools/updates/target-platform/e...
Platform Update Zip</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a class="blue"
+ href="http://anonsvn.jboss.org/repos/jbosstools/trunk/build/target-p...
Platform Definition File</a>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="unitTestResults-blue">
+ <b>Unit Test Results</b>
+ <br />
+
+ See
+ <a
+ href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Stable_Branch...
+ <!-- <table> <tr> <td> <img
src="images/test.gif" /> Tests </td> <td
+ align="right">??? </td> </tr> <tr> <td>
<img src="images/testerr.gif" />
+ Errors </td> <td align="right">???</td> </tr>
<tr> <td> <img src="images/testfail.gif"
+ /> Failures </td> <td align="right">???</td>
</tr> <tr> <td colspan="2">
+ <b id="testPassPercentageAmount">%</b> tests passed <div
id="testPercentage">
+ <div id="testPassPercentage"> </div> <div
id="testFailPercentage"> </div>
+ </div> </td> </tr> </table> -->
+
+ <script>
+ <!-- var tests = 2228; var failures = 0; var errors = 0; var passPercent
+ = Math.floor(((tests-(failures+errors))/tests) * 100); var failPercent =
+ 100 - passPercent;
document.getElementById("testPassPercentage").style.width
+ = passPercent + '%';
document.getElementById("testFailPercentage").style.width
+ = failPercent + '%';
document.getElementById("testPassPercentageAmount").innerHTML
+ = passPercent + '%'; -->
+ </script>
+
+ <!-- <div align="right"> <a class="blue"
style="align: right;"
href="tests/test-results/org.jboss.ide.eclipse.tests.html">See
+ full unit test results</a> </div> <div align="right">
<a class="blue" style="align:
+ right;" href="tests/test-results/test-workspace.log.txt">See
unit test workspace
+ log</a> </div> <div id="coverageResults-blue">
<b>Test Coverage Results</b>
+ <br /> <div align="right"> <a class="blue"
style="align: right;"
href="tests/test-results/emma-coverage/index.html">See
+ test coverage results</a> </div> <div align="right">
<a class="blue" style="align:
+ right;" href="tests/test-results/emma-coverage/coverage.es">See
coverage
+ session file</a> </div> </div> -->
+ </div>
+
+ <div id="buildInfo">
+ <p>
+ <b>WARNING</b>
+ </p>
+ <p>This build has been deemed by the JBossTools team to be in
+ good working condition.
+ Please note that this build may be a
+ developer release, and if so
+ should be treated
+ with slightly more
+ understanding and care than a stable release.
+ Please see the
+ release
+ notes on JIRA and/or Sourceforge for further
+ information.
+ (This
+ release is much less likely to
+ set your
+ computer aflame.)</p>
+
+ <p>Any suggestions/issues should be posted on the relevant
+ product
+ forums and should clearly indicate that you are using an
+ integration
+ build. Please take care in making sure that your
+ issue hasn't
+ already been addressed when posting on forums or
+ opening new
+ JIRA issues.</p>
+ </div>
+
+ </div>
+
+ </div>
+
+ </body>
+ </html>
+
+
+
+ </xsl:template>
+</xsl:transform>
\ No newline at end of file
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2011-03-04 06:20:33 UTC (rev 29505)
+++ trunk/build/results/build.xml 2011-03-04 06:20:50 UTC (rev 29506)
@@ -46,9 +46,27 @@
</condition>
<!-- if can't calculate where build/build.xml is located, must pass in path from
parent when calling this script -->
+ <target name="get.saxon" unless="saxon.jar.exists">
+ <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
+ <property name="SAXON_MIRROR"
value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/s...
/>
+ <get usetimestamp="true"
dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}"
/>
+ <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" />
+ <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip"
dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" />
+ <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar"
tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" />
+ <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_"
includeemptydirs="true" quiet="true" />
+ </target>
+
<target name="init">
<ant antfile="${build.xml}" target="init" />
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
+ </classpath>
+ </taskdef>
+ <available file="${COMMON_TOOLS}/saxon.jar" type="file"
property="saxon.jar.exists" />
+ <antcall target="get.saxon" />
+
<macrodef name="get.size">
<attribute name="file" />
<attribute name="property" />
@@ -82,11 +100,6 @@
</if>
</sequential>
</macrodef>
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
- </classpath>
- </taskdef>
</target>
<target name="build.results" depends="init">
@@ -172,7 +185,7 @@
</copy>
<xslt in="${output.dir}/download.xml"
out="${output.dir}/download-snippet.html" style="download.xsl" />
<xslt in="${output.dir}/download.xml"
out="${output.dir}/buildResults.html" style="buildResults.xsl" />
- <copy todir="${output.dir}" file="buildResults.css"/>
+ <copy todir="${output.dir}" file="buildResults.css" />
<delete file="${output.dir}/download.xml" />
</then>
<elseif>
@@ -222,4 +235,36 @@
<xslt in="download-template.xml" out="buildResults.out.html"
style="buildResults.xsl" />
</target>
+ <!-- NEW STUFF HERE -->
+
+ <target name="test.buildResults.aggregate" depends="init"
description="generate buildResults.html from build properties">
+ <property name="isTest" value="true" />
+ <ant target="collect.zips"
antfile="../aggregate/site/build.xml">
+ <property name="inputRepos" value="1" />
+ <property name="inputRepo1"
value="http://download.jboss.org/jbosstools/builds/staging/_composit...
/>
+ </ant>
+ <ant target="collect.metadata"
antfile="../aggregate/site/build.xml">
+ </ant>
+ <antcall target="buildResults" />
+ </target>
+
+ <target name="test.buildResults.single" depends="init"
description="generate buildResults.html from build properties">
+ <property name="isTest" value="true" />
+ <ant target="collect.zips"
antfile="../aggregate/site/build.xml">
+ <property name="inputRepos" value="1" />
+ <property name="inputRepo1"
value="http://download.jboss.org/jbosstools/builds/staging/jbosstool...
/>
+ </ant>
+ <ant target="collect.metadata"
antfile="../aggregate/site/build.xml">
+ </ant>
+ <antcall target="buildResults" />
+ </target>
+
+ <target name="buildResults" description="generate buildResults.html
from build properties" depends="init">
+
+ <delete quiet="true" file="buildResults.out.html" />
+ <xslt in="zips/build.properties.all.xml"
out="buildResults.out.html" style="buildResults.xsl"
force="true">
+ <classpath location="${COMMON_TOOLS}/saxon.jar" />
+ </xslt>
+ </target>
+
</project>
Modified: trunk/build/results/buildResults.xsl
===================================================================
--- trunk/build/results/buildResults.xsl 2011-03-04 06:20:33 UTC (rev 29505)
+++ trunk/build/results/buildResults.xsl 2011-03-04 06:20:50 UTC (rev 29506)
@@ -1,12 +1,8 @@
-<xsl:transform version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan">
- <xsl:output method="html" indent="yes"
xalan:indent-amount="4" />
- <xsl:template match="/projects">
-
- <xsl:variable name="baseurl">
- <xsl:value-of select="@baseurl" />
- </xsl:variable>
-
+<xsl:stylesheet version="2.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:saxon="http://saxon.sf.net/"
+ xmlns="http://www.w3.org/1999/xhtml"
extension-element-prefixes="saxon">
+ <xsl:output method="html" indent="yes" />
+ <xsl:template match="/properties">
<html>
<head>
<title>JBossTools Build Results</title>
@@ -15,37 +11,6 @@
<body>
<div id="header-blue">
<table width="100%" height="100%">
- <tr>
- <td>
- <span id="title-blue">JBossTools Build Results</span>
- <br />
- <span id="buildName-blue">
- ${build-type} build
- ${jbds-build-name}
- <span id="buildName-blue" style="font-size:
x-small;">
- [Hudson Build
- <a id="buildName-blue" style="font-size: x-small;"
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio/job/${hudson-...,
- ${hudson-build-id}</a>
- ]
- </span>
- <span id="buildName-blue" style="font-size: x-small;
font-style: italic;">
- <a id="buildName-blue"
- style="font-size: x-small; font-style: italic; color: black;"
- href="http://hudson.jboss.org/hudson/view/JBossTools/job/${hudson-jo...
- Hudson Mirror</a>
- </span>
- </span>
- </td>
- <td align="right">
- <span id="buildDate-blue">${date}</span>
- <br />
- <span id="buildExecTime-blue">${build-time}</span>
- <br />
- <a id="buildLog-blue"
- href="http://download.jboss.org/jbosstools/builds/staging/${hudson-j...
Logs</a>
- </td>
- </tr>
</table>
</div>
@@ -106,43 +71,124 @@
</td>
</tr>
- <xsl:for-each select="project">
- <xsl:variable name="rowColor">
- <xsl:if test="position() mod 2 = 1">
- #CCCCEE
- </xsl:if>
- <xsl:if test="position() mod 2 = 0">
- #FFFFFF
- </xsl:if>
- <xsl:if test="contains(@name,'All')">
- #CCEECC
- </xsl:if>
- <xsl:if test="contains(@name,'Source')">
- #EECCCC
- </xsl:if>
+ <!-- three use cases: a regular component build (as, ws, etc.), a
+ different-SVN component build (teiid, pi4soa, savara), and a special component
+ build (xulrunner) -->
+ <xsl:for-each
+ select="//property[contains((a)name,'build.properties.JOB_NAME')]">
+ <xsl:variable name="JOB_NAME">
+ <xsl:value-of select="@value" />
</xsl:variable>
+ <xsl:variable name="COMPONENT">
+ <xsl:choose>
+ <!-- property name="jbosstools-3.2_trunk.component-
-ws-SNAPSHOT.build.properties.JOB_NAME"
+ value="jbosstools-3.2_trunk.component- -ws" -->
+ <xsl:when test="contains(@value,'component--')">
+ <xsl:value-of
select="substring-after(@value,'component--')" />
+ </xsl:when>
+ <!-- property
name="jbosstools-drools-5.2_trunk-SNAPSHOT.build.properties.JOB_NAME"
+ value="jbosstools-drools-5.2_trunk" -->
+ <xsl:when test="contains(@value, '_stable_branch')">
+ <xsl:value-of
+ select="substring-before(substring-after(@value,'jbosstools-'),'_stable_branch')"
/>
+ </xsl:when>
+ <xsl:when test="contains(@value, '_trunk')">
+ <xsl:value-of
+ select="substring-before(substring-after(@value,'jbosstools-'),'_trunk')"
/>
+ </xsl:when>
+
+ <!-- property
name="xulrunner-1.9.1.2-2011-01-20_20-39-25-H36.build.properties.JOB_NAME"
+ value="xulrunner-1.9.1.2" -->
+ <xsl:otherwise>
+ <xsl:value-of select="@value" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <tr>
+ <td colspan="2">
+ <a href="http://hudson.qa.jboss.com/hudson/job/{$JOB_NAME}/">
+ <xsl:value-of select="$COMPONENT" />
+ </a>
+ </td>
+ </tr>
+
+ <xsl:for-each
+ select="//property[contains((a)name,'build.properties.filename') and
contains(@name,$COMPONENT)]">
+ <xsl:variable name="rowColor">
+ <xsl:if test="position() mod 2 = 1">
+ #CCCCEE
+ </xsl:if>
+ <xsl:if test="position() mod 2 = 0">
+ #FFFFFF
+ </xsl:if>
+ <xsl:if test="contains(@name,'All')">
+ #CCEECC
+ </xsl:if>
+ <xsl:if test="contains(@name,'Source')">
+ #EECCCC
+ </xsl:if>
+ </xsl:variable>
+
<tr bgcolor="{$rowColor}">
- <td>
- <img src="images/OK-small.png" />
- </td>
- <td class="downloadInfo">
- <xsl:for-each select=".">
- <b>
- <acronym title="{@name} :: {description}">
- <a class="allLink-blue"
href="{$baseurl}/{download/@url}">
- <xsl:value-of select="concat(@name,' ',@version)"
/>
+ <!-- <td> <img src="images/OK-small.png" />
</td> -->
+ <td class="downloadInfo">
+ <xsl:for-each select=".">
+ <b>
+ <xsl:variable name="filelabel">
+ <xsl:choose>
+ <!-- property name="jbosstools-3.2_trunk.component-
-ws-SNAPSHOT.build.properties.JOB_NAME"
+ value="jbosstools-3.2_trunk.component- -ws" -->
+ <xsl:when test="contains(@value,'component--')">
+ <xsl:value-of
select="substring-after(@value,'component--')" />
+ </xsl:when>
+
+ <!-- property
name="jbosstools-drools-5.2_trunk-SNAPSHOT.build.properties.JOB_NAME"
+ value="jbosstools-drools-5.2_trunk" -->
+ <xsl:when test="contains(@value,
'_stable_branch')">
+ <xsl:value-of
+ select="replace(substring-after(@value,'jbosstools-'),'_stable_branch','')"
/>
+ </xsl:when>
+ <xsl:when test="contains(@value, '_trunk')">
+ <xsl:value-of
+ select="replace(substring-after(@value,'jbosstools-'),'_trunk','')"
/>
+ </xsl:when>
+
+ <!-- property
name="xulrunner-1.9.1.2-2011-01-20_20-39-25-H36.build.properties.JOB_NAME"
+ value="xulrunner-1.9.1.2" -->
+ <xsl:otherwise>
+ <xsl:value-of select="@value" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <a class="allLink-blue" href="{@value}">
+ <xsl:value-of select="$filelabel" />
</a>
- </acronym>
- <br />
- <a class="md5"
href="{$baseurl}/{download/(a)url}.MD5">MD5</a>
- | filesize:
- <xsl:value-of select="download/@size" />
- </b>
- <br />
- </xsl:for-each>
- </td>
- </tr>
+ <ul>
+ <li>
+ md5:
+ <xsl:for-each
+ select="//property[contains((a)name,'build.properties.filemd5')
and contains(@name,$COMPONENT)]">
+ <xsl:value-of select="@value" />
+ </xsl:for-each>
+ </li><li>size:
+ <xsl:for-each
+ select="//property[contains((a)name,'build.properties.filesize')
and contains(@name,$COMPONENT)]">
+ <xsl:value-of select="@value" /> bytes
+ </xsl:for-each>
+ </li>
+
+ <xsl:for-each
+ select="tokenize(//property[contains((a)name,'build.properties.SVN_REVISION')
and contains(@name,$COMPONENT)]/@value,',')">
+ <li>SVN: <xsl:value-of select="." /></li>
+ </xsl:for-each>
+ </ul>
+ </b>
+ </xsl:for-each>
+ </td>
+ </tr>
+ </xsl:for-each>
</xsl:for-each>
</table>
@@ -259,6 +305,5 @@
</html>
-
</xsl:template>
-</xsl:transform>
\ No newline at end of file
+</xsl:stylesheet>
\ No newline at end of file