diff --git a/releng.wtpbuilder/distribution/dali.build/build.xml b/releng.wtpbuilder/distribution/dali.build/build.xml
index 17778ed949dc64bb3a544900ee4c3659de68b118..84c5cd43c5bcf01250c875e4c17e7f89a05edda6 100644
--- a/releng.wtpbuilder/distribution/dali.build/build.xml
+++ b/releng.wtpbuilder/distribution/dali.build/build.xml
@@ -1,41 +1,45 @@
<project
default="build"
basedir=".">
-
+ <fail
+ unless="wtp.builder.home" />
+ <property
+ file="${wtp.builder.home}/build.properties" />
<target
name="build"
depends="getBaseBuilder">
-
<dirname
file="${ant.file}"
property="distribution.wtp.build.dir" />
- <property file="${wtp.builder.home}/build.properties" />
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml" />
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/label.xml" />
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="dali" />
</ant>
-
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="dali-sdk" />
</ant>
-
- <ant antfile="${buildTargets}">
+ <ant
+ antfile="${buildTargets}">
<property
name="component"
value="dali.tests" />
+ <property
+ name="eclipseBuildFailOnError"
+ value="false" />
</ant>
-
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+ <antcall
+ target="package" />
</target>
-
<target
name="getBaseBuilder"
if="eclipse.builder.fetch">
@@ -45,10 +49,13 @@
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml" />
- <!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
<ant
antfile="${buildTargets}"
target="getBaseBuilder" />
</target>
-
-</project>
+ <target
+ name="package">
+ <!-- post, post packaging, for WTP ... "manually" assemble the desired zips -->
+ <!-- nothing to assemble right now -->
+ </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.site/build.xml b/releng.wtpbuilder/distribution/dali.site/build.xml
index 944c237913620608e6f056b172cd3893b14a658f..7c7d077411b8737e03a7d02828f46222d5693177 100644
--- a/releng.wtpbuilder/distribution/dali.site/build.xml
+++ b/releng.wtpbuilder/distribution/dali.site/build.xml
@@ -1,14 +1,24 @@
<project
name="Build specific targets and properties"
- default="build">
+ default="build"
+ basedir=".">
- <!-- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
<property environment="env" />
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property
+ file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
+ <echo message="ant.file: ${ant.file}" />
<target name="build">
<java
jar="${eclipse.launcher}"
@@ -17,8 +27,8 @@
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
- <jvmarg value="-Dbuild.home=${build.home}" />
<jvmarg value="-Dbuild.donottagmaps=${build.donottagmaps}" />
+ <jvmarg value="-DbuildBranch=${buildBranch}" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-DmapVersionTag=${mapVersionTag}" />
@@ -27,7 +37,9 @@
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
<jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
<jvmarg
- value="-Dprojectname=${projectname}" />
+ value="-Dprojectname=${projectname}" />
+ <arg value="-data" />
+ <arg value="${basedir}/workspace" />
<arg value="-application" />
<arg value="org.eclipse.ant.core.antRunner" />
<arg value="-buildfile" />
@@ -58,21 +70,17 @@
value="${buildDirectory}/${buildLabel}" />
<property
name="indexTemplateFilename"
- value="index.html.template" />
+ value="index.html.template.php" />
+
+ <copy
+ file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
+ tofile="${buildDirectory}/${indexFileName}" />
<condition
property="isBuildTested"
value="true">
<available
- file="${buildDirectory}/${buildLabel}/testResults/consolelogs/dalitestlog.txt" />
- </condition>
- <condition
- property="isBuildTested"
- value="false">
- <not>
- <available
- file="${buildDirectory}/${buildLabel}/testResults/consolelogs/dalitestlog.txt" />
- </not>
+ file="${buildDirectory}/${buildLabel}/testResults/html" />
</condition>
<ant
@@ -80,12 +88,14 @@
dir="${component.dir}">
<property
name="dropTokenList"
- value="%dali-runtime%,%dali-tests%" />
-
+ value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
<property
- name="daliDownloadURL"
- value="http://www.eclipse.org/downloads/download.php?file=/technology/dali/committers/drops" />
+ name="webtoolsDownloadURL"
+ value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
+ <property
+ name="buildBranch"
+ value="${buildBranch}" />
<property
name="isBuildTested"
value="${isBuildTested}" />
@@ -104,6 +114,12 @@
file="${buildDirectory}/buildmachineinfo.properties"
tofile="${result}/buildmachineinfo.properties" />
+ <!-- final count files -->
+ <countBuildFiles
+ sourceDirectory="${buildDirectory}/${buildLabel}"
+ filterString=".zip,.tar.gz"
+ outputFile="${buildDirectory}/${buildLabel}/files.count" />
+
</target>
diff --git a/releng.wtpbuilder/distribution/dali.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/distribution/dali.site/compilerXMLOutputToHTML.xsl
new file mode 100644
index 0000000000000000000000000000000000000000..4f6809eeae6effe5bec602b9137f36d4682478d9
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/compilerXMLOutputToHTML.xsl
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet
+ version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:output
+ method="html"
+ indent="yes" />
+
+ <xsl:template match="/">
+ <html>
+ <body>
+ <xsl:apply-templates select="compiler" />
+ </body>
+ </html>
+ </xsl:template>
+
+ <xsl:template match="compiler">
+ <h2>Compiler Report</h2>
+ <p>
+ Compiler:
+ <xsl:value-of select="@name" />
+ <xsl:text> </xsl:text>
+ Version:
+ <xsl:value-of select="@version" />
+ </p>
+
+ <xsl:apply-templates select="stats" />
+
+ <xsl:apply-templates select="sources" />
+ </xsl:template>
+
+ <xsl:template
+ name="stats"
+ match="stats">
+
+ <p>
+ Number of source files:
+ <xsl:value-of select="count(..//source)" />
+ Number of classfiles:
+ <xsl:value-of select="number_of_classfiles/@value" />
+ </p>
+ <p>
+ Problems:
+ <xsl:value-of select="problem_summary/@problems" />
+ (Errors:
+ <xsl:value-of select="problem_summary/@errors" />
+ Warnings:
+ <xsl:value-of select="problem_summary/@warnings" />
+ )
+ </p>
+ </xsl:template>
+
+
+ <xsl:template
+ name="sources"
+ match="sources">
+
+ <xsl:if test="count(source) > 0">
+
+ <dl>
+ <xsl:for-each select="source">
+
+ <xsl:variable
+ name="package"
+ select="normalize-space(@package)">
+ </xsl:variable>
+ <xsl:variable
+ name="path"
+ select="normalize-space(@path)">
+ </xsl:variable>
+ <xsl:variable
+ name="classname"
+ select="substring-after($path, $package)">
+ </xsl:variable>
+ <xsl:if test="count(problems) > 0">
+ <dt style="font-weight: bold; color: black">
+ Source File:
+ <xsl:value-of select="$package" />
+ <xsl:value-of select="$classname" />
+ </dt>
+ <xsl:apply-templates select="problems">
+ <xsl:with-param name="classname">
+ <xsl:value-of select="$classname" />
+ </xsl:with-param>
+ </xsl:apply-templates>
+ </xsl:if>
+ </xsl:for-each>
+ </dl>
+
+ </xsl:if>
+
+ </xsl:template>
+
+ <xsl:template match="problems">
+ <xsl:param name="classname" />
+ <xsl:for-each select="problem">
+
+ <dd style="font-weight: normal; color: black">
+ <xsl:value-of select="position()" />
+ <xsl:text>. </xsl:text>
+ <xsl:value-of select="@severity" />
+ <xsl:text>: </xsl:text>
+ <xsl:value-of select="@id" />
+ <xsl:variable
+ name="lineNumber"
+ select="@line">
+ </xsl:variable>
+ <xsl:for-each select="message">
+ <p
+ style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
+ <small>
+ <xsl:value-of select="@value" />
+ </small>
+ </p>
+ </xsl:for-each>
+ <xsl:for-each select="source_context">
+ <xsl:variable
+ name="pre"
+ select="substring(@value,0,(@sourceStart + 1))">
+ </xsl:variable>
+ <xsl:variable
+ name="main"
+ select="substring(@value,(@sourceStart + 1),(((@sourceEnd + 1) - (@sourceStart + 1)) + 1))">
+ </xsl:variable>
+ <xsl:variable
+ name="end"
+ select="substring(@value,(@sourceEnd + 2))">
+ </xsl:variable>
+
+ <p
+ style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
+ <xsl:value-of select="substring($classname,2)" />
+ :
+ </p>
+ <p
+ style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
+ <xsl:value-of select="$lineNumber" />
+ :
+ <xsl:value-of select="$pre" />
+ <b>
+ <u>
+ <xsl:value-of select="$main" />
+ </u>
+ </b>
+ <xsl:value-of select="$end" />
+ </p>
+ </xsl:for-each>
+ </dd>
+ </xsl:for-each>
+
+
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
index 5680f632a032d3fe14dd0f37a7e7e4047bc5f5eb..5f6697cf4307a66a7a48c63b3abee859fc703943 100644
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ b/releng.wtpbuilder/distribution/dali.site/publish.xml
@@ -3,30 +3,59 @@
default="default"
basedir=".">
- <!-- Properties that must be passed to this script:
+ <!-- Properties that must be passed to this script:
buildDirectory: Path to perform the build in. (A working directory)
buildType: Type of build (nightly, integration etc.)
buildId: Build name
buildLabel: <buildType>-<buildName>-<timestamp>
-->
+
+ <property environment="env" />
+
<property
- name="result"
+ name="resultDir"
value="${buildDirectory}/${buildLabel}" />
-
- <!--name of generated index page-->
+ <!--name of generated index page-->
<property
name="indexFileName"
value="index.php" />
+ <property
+ name="templateDir"
+ value="${wtp.builder.home}/distribution/${build.distribution}.site" />
+ <property
+ name="resultingIndex"
+ value="${resultDir}/${indexFileName}" />
+ <echo
+ level="debug"
+ message="resultDir: ${resultDir}" />
+ <echo
+ level="debug"
+ message="templateDir: ${templateDir}" />
+ <echo
+ level="debug"
+ message="resultingIndex: ${resultingIndex}" />
+
+
<target name="default">
+ <copy
+ overwrite="true"
+ file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
+ tofile="${resultingIndex}" />
<antcall target="countFiles" />
- <antcall target="generateIndex" />
+ <antcall target="generateCompileIndex" />
+ <antcall target="generateJUnitTestsIndex" />
<antcall target="getStaticFiles" />
</target>
- <target name="generateIndex">
+ <target name="generateCompileIndex">
+
- <!--
+ <!--
+ <taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
+ -->
+
+ <!--
isBuildTested: true|false should JUnit plugin test results be used to generate index page
dropTokenList: comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
xmlDirectoryName: path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
@@ -44,171 +73,476 @@
<property
file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
- <indexResults
- isBuildTested="${isBuildTested}"
+ <!-- create tables of test plugin compiles first -->
+ <antcall
+ target="generateCompileOutput">
+ <param
+ name="outputDirectory"
+ value="${resultDir}/testcompilelogs" />
+ </antcall>
+
+ <!-- create table of code plugins compiles -->
+ <summarizeResults
+ isBuildTested="false"
+ includeAll="true"
dropTokenList="${dropTokenList}"
- xmlDirectoryName="${result}/testResults/xml"
- dropDirectoryName="${result}"
- testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template"
- testResultsHtmlFileName="testResults.php"
- dropHtmlFileName="${indexFileName}"
+ xmlDirectoryName=""
+ dropDirectoryName="${resultDir}"
+ testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
+ testResultsHtmlFileName="compileResults.php"
hrefTestResultsTargetPath="testResults/html"
hrefCompileLogsTargetPath="compilelogs"
- compileLogsDirectoryName="${result}/compilelogs"
- testManifestFileName="${basedir}/testManifest.xml" />
-
+ compileLogsDirectoryName="${resultDir}/compilelogs" />
+ <xslt
+ basedir="${resultDir}/compilelogs"
+ destdir="${resultDir}/compilelogs"
+ includes="**/*.bin.xml"
+ scanincludeddirectories="true"
+ style="compilerXMLOutputToHTML.xsl"
+ force="true" />
<tstamp>
<format
property="TODAY"
pattern="MMMM d, yyyy" />
</tstamp>
- <!-- Insert Build Type descriptor -->
- <antcall target="${buildType}" />
-
- <!-- Insert Build Date -->
- <replace
- file="${result}/${indexFileName}"
- token="@date@"
- value="${TODAY}" />
+ <!-- Insert Build Type descriptor -->
+ <antcall
+ target="${buildType}" />
+ <antcall
+ target="writeData" />
- <!-- Insert Build Name -->
- <replace
- file="${result}/${indexFileName}"
- token="@build@"
- value="${buildLabel}" />
+ <!-- Update timestamp on file to permit overwrite through Ant copy task -->
+ <touch
+ file="${resultingIndex}" />
+ </target>
+ <target
+ name="generateCompileOutput"
+ depends="checkIfCompileLogs"
+ if="doCompileLogs">
+ <summarizeResults
+ isBuildTested="false"
+ includeAll="true"
+ dropTokenList="${dropTokenList}"
+ xmlDirectoryName=""
+ dropDirectoryName="${resultDir}"
+ testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
+ testResultsHtmlFileName="testCompileResults.php"
+ hrefTestResultsTargetPath=""
+ hrefCompileLogsTargetPath="testcompilelogs"
+ compileLogsDirectoryName="${outputDirectory}" />
+ <xslt
+ basedir="${outputDirectory}"
+ destdir="${outputDirectory}"
+ includes="**/*.bin.xml"
+ scanincludeddirectories="true"
+ style="compilerXMLOutputToHTML.xsl"
+ force="true" />
+ </target>
+ <target
+ name="generateJUnitTestsIndex"
+ depends="checkIfTested"
+ if="doTests">
- <!-- Insert PreRequsites -->
+ <!--
+ isBuildTested: true|false should JUnit plugin test results be used to generate index page
+ dropTokenList: comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
+ xmlDirectoryName: path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
+ dropDirectoryName: path to directory containing the result of the build.
+ testResultsTemplateFileName: path to template file used to generate page with links to JUnit test results
+ testResultsHtmlFileName: name of file which will be generated with links to JUnit test results
+ dropHtmlFileName: name of generated index page
+ hrefTestResultsTargetPath: relative path from index page to directory containing JUnit html test results
+ hrefCompileLogsTargetPath: relative path from index page directory containing compilelogs
+ testManifestFileName: name of xml file containing descriptions of zip types and log files
+
+
+
+ -->
+ <property
+ file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
- <replace
- file="${result}/${indexFileName}"
- token="@eclipseFile@"
- value="${eclipse.file.linux-gtk-x86}" />
- <replace
- file="${result}/${indexFileName}"
- token="@eclipseURL@"
- value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
- <replace
- file="${result}/${indexFileName}"
- token="@eclipseBuildURL@"
- value="${eclipse.url}" />
- <replace
- file="${result}/${indexFileName}"
- token="@emfFile@"
- value="${emf.file}" />
- <replace
- file="${result}/${indexFileName}"
- token="@emfURL@"
- value="${emf.url}/${emf.file}" />
- <replace
- file="${result}/${indexFileName}"
- token="@gefFile@"
- value="${gef.file}" />
- <replace
- file="${result}/${indexFileName}"
- token="@gefURL@"
- value="${gef.url}/${gef.file}" />
- <replace
- file="${result}/${indexFileName}"
- token="@jemFile@"
- value="${jem.file}" />
- <replace
- file="${result}/${indexFileName}"
- token="@jemURL@"
- value="${jem.url}/${jem.file}" />
- <replace
- file="${result}/${indexFileName}"
- token="@dtpFile@"
- value="${dtp.file}" />
- <replace
- file="${result}/${indexFileName}"
- token="@dtpURL@"
- value="${dtp.url}/${dtp.file}" />
+ <!-- create table of test plugin compiles first -->
+ <!-- set isBuildTested to true for the "compile only" results -->
+ <summarizeResults
+ isBuildTested="true"
+ dropTokenList="${dropTokenList}"
+ dropDirectoryName="${resultDir}"
+ xmlDirectoryName="${resultDir}/testResults/xml"
+ testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
+ testResultsHtmlFileName="testResults.php"
+ hrefTestResultsTargetPath="testResults/html"
+ compileLogsDirectoryName="" />
+ <tstamp>
+ <format
+ property="TODAY"
+ pattern="MMMM d, yyyy" />
+ </tstamp>
+ <!-- Insert Build Type descriptor -->
+ <antcall
+ target="${buildType}" />
+ <antcall
+ target="writeData" />
- <!-- Update timestamp on file to permit overwrite through Ant copy task -->
- <touch file="${result}/${indexFileName}" />
+ <!-- Update timestamp on file to permit overwrite through Ant copy task -->
+ <touch
+ file="${resultingIndex}" />
</target>
-
-
- <target name="getStaticFiles">
- <!--get static files required in the buildLabel directory-->
- <copy todir="${result}">
- <fileset dir="${basedir}/staticDropFiles" />
+ <target
+ name="getStaticFiles">
+ <!--get static files required in the buildLabel directory-->
+ <copy
+ todir="${resultDir}">
+ <fileset
+ dir="${templateDir}/staticDropFiles" />
</copy>
- <!--copy buildnotes from plugin directories-->
- <mkdir dir="${result}/buildnotes" />
+ <!--copy buildnotes from plugin directories-->
+ <mkdir
+ dir="${resultDir}/buildnotes" />
<copy
- todir="${result}/buildnotes"
+ todir="${resultDir}/buildnotes"
flatten="true">
<fileset
dir="${buildDirectory}/plugins"
includes="**/buildnotes_*.html" />
+ <fileset
+ dir="${buildDirectory}/features"
+ includes="**/buildnotes_*.html" />
</copy>
+ <copy
+ file="${templateDir}/staticDropFiles/logIndex.php"
+ tofile="${resultDir}/testResults/consolelogs/full/logIndex.php" />
+ <copy
+ file="${templateDir}/staticDropFiles/logIndex.php"
+ tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php" />
+ <copy
+ file="${templateDir}/staticDropFiles/logIndex.php"
+ tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php" />
</target>
+ <target
+ name="updateSite">
+
- <target name="countFiles">
- <!-- files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
+ <!-- get our authored, tokenized site.xml file -->
+ <copy
+ file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
+ tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+ overwrite="true"
+ failonerror="true" />
+ <!-- get the ${buildDirectory}/finalPluginsVersions.properties, and
+ read as properties -->
+ <!-- substitute property value for tokens -->
+ <replace
+ file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+ propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
+ <replacefilter
+ token="@org.eclipse.wst@"
+ property="org.eclipse.wst" />
+ <replacefilter
+ token="@org.eclipse.wst.sdk@"
+ property="org.eclipse.wst.sdk" />
+ <replacefilter
+ token="@org.eclipse.jst@"
+ property="org.eclipse.jst" />
+ <replacefilter
+ token="@org.eclipse.jst.sdk@"
+ property="org.eclipse.jst.sdk" />
+ <replacefilter
+ token="@org.eclipse.jpt.feature@"
+ property="org.eclipse.jpt.feature" />
+ <replacefilter
+ token="@org.eclipse.jpt_sdk.feature@"
+ property="org.eclipse.jpt_sdk.feature" />
+ </replace>
+ </target>
+ <target
+ name="countFiles">
+ <!--
+ files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
It is required to generate a link to the build on the downloads page.
- Added remove .zip.MD5 - old files before a count
-->
- <delete>
- <fileset
- dir="${result}"
- id="id">
- <include name="*.MD5" />
- </fileset>
- </delete>
-
<countBuildFiles
- sourceDirectory="${result}"
+ sourceDirectory="${resultDir}"
filterString=".zip,.tar.gz"
- outputFile="${result}/files.count" />
-
+ outputFile="${resultDir}/files.count" />
</target>
- <!--Build type descriptors-->
- <target name="I">
+ <!--Build type descriptors-->
+ <target
+ name="I">
<replace
- file="${result}/${indexFileName}"
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
token="@type@"
value="Integration" />
</target>
-
- <target name="S">
+ <target
+ name="S">
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
<replace
- file="${result}/${indexFileName}"
+ file="${resultingIndex}"
token="@type@"
value="Stable" />
</target>
-
- <target name="N">
+ <target
+ name="N">
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
<replace
- file="${result}/${indexFileName}"
+ file="${resultingIndex}"
token="@type@"
value="Nightly" />
</target>
-
- <target name="M">
+ <target
+ name="M">
<replace
- file="${result}/${indexFileName}"
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
token="@type@"
value="Maintenance" />
</target>
-
- <target name="R">
+ <target
+ name="R">
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
<replace
- file="${result}/${indexFileName}"
+ file="${resultingIndex}"
token="@type@"
value="Release" />
</target>
-
- <target name="T">
+ <target
+ name="T">
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
<replace
- file="${result}/${indexFileName}"
+ file="${resultingIndex}"
token="@type@"
value="Test" />
</target>
+ <target
+ name="P">
+ <replace
+ file="${resultingIndex}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace
+ file="${resultingIndex}"
+ token="@type@"
+ value="Patches" />
+ </target>
+ <target
+ name="checkIfTested">
+ <echo
+ level="debug"
+ message="isBuildTested: ${isBuildTested}" />
+ <condition
+ property="doTests">
+ <equals
+ arg1="${isBuildTested}"
+ arg2="true"
+ trim="true"
+ casesensitive="false" />
+ </condition>
+ </target>
+ <target
+ name="checkIfCompileLogs">
+ <condition
+ property="doCompileLogs">
+ <available
+ file="${outputDirectory}" />
+ </condition>
+ </target>
+ <target
+ name="writeData">
+ <!-- Insert Build Date -->
+ <replace
+ file="${resultingIndex}"
+ token="@date@"
+ value="${TODAY}" />
+
+ <!-- Insert Build Name -->
+ <replace
+ file="${resultingIndex}"
+ token="@build@"
+ value="${buildLabel}" />
+ <replace
+ file="${resultingIndex}"
+ token="@buildBranch@"
+ value="${buildBranch}" />
+
+ <!-- Insert PreRequsites -->
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseFile@"
+ value="${eclipse.file.linux-gtk-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseURL@"
+ value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseBuildURL@"
+ value="${eclipse.url}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipsefilelinux@"
+ value="${eclipse.file.linux-gtk-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipsefilewindows@"
+ value="${eclipse.file.win32-win32-x86}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipsefilemacos@"
+ value="${eclipse.file.macosx-carbon-ppc}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipseBuildHome@"
+ value="${eclipse.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipse.mirror.prefixuri@"
+ value="${eclipse.mirror.prefixuri}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipse.fspath.prefix@"
+ value="${eclipse.fspath.prefix}" />
+ <replace
+ file="${resultingIndex}"
+ token="@testURL@"
+ value="${eclipseTestFramework.url}/${eclipseTestFramework.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@testFile@"
+ value="${eclipseTestFramework.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfFile@"
+ value="${emf.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfURL@"
+ value="${emf.url}/${emf.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emfBuildHome@"
+ value="${emf.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@emf.mirror.prefixuri@"
+ value="${emf.mirror.prefixuri}" />
+ <replace
+ file="${resultingIndex}"
+ token="@wstFile@"
+ value="${wst.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@wstURL@"
+ value="${wst.url}/${wst.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@wstBuildHome@"
+ value="${wst.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@wst.mirror.prefixuri@"
+ value="${wst.mirror.prefixuri}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gefFile@"
+ value="${gef.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gefURL@"
+ value="${gef.url}/${gef.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gefBuildHome@"
+ value="${gef.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@gef.mirror.prefixuri@"
+ value="${gef.mirror.prefixuri}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipserelengFile@"
+ value="${eclipsereleng.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@eclipserelengURL@"
+ value="${eclipsereleng.url}/${eclipsereleng.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@orbitthirdpartyzipFile@"
+ value="${orbitthirdpartyzip.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@orbitthirdpartyzipURL@"
+ value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@orbitthirdpartyzipBuildHome@"
+ value="${orbitthirdpartyzip.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@orbitthirdpartyzip.mirror.prefixuri@"
+ value="${orbitthirdpartyzip.mirror.prefixuri}" />
+
+ <!-- no longer used. Post 1.5.5 -->
+ <replace
+ file="${resultingIndex}"
+ token="@jemFile@"
+ value="${jem.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@jemURL@"
+ value="${jem.url}/${jem.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@jemBuildHome@"
+ value="${jem.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@jem.mirror.prefixuri@"
+ value="${jem.mirror.prefixuri}" />
+ <!--
+ these token/s should not exist in maintenance stream, but
+ do no harm done, so in the interests of keeping builder
+ streams in sync, we'll leave them here as place hold
+ -->
+ <replace
+ file="${resultingIndex}"
+ token="@dtpFile@"
+ value="${dtp.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@dtpURL@"
+ value="${dtp.url}/${dtp.file}" />
+ <replace
+ file="${resultingIndex}"
+ token="@dtpBuildHome@"
+ value="${dtp.build.home}" />
+ <replace
+ file="${resultingIndex}"
+ token="@dtp.mirror.prefixuri@"
+ value="${dtp.mirror.prefixuri}" />
+ </target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/FAIL.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/FAIL.gif
deleted file mode 100644
index 28bba66102ac4ac61b628b4611a4cb0e15f40e23..0000000000000000000000000000000000000000
Binary files a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/FAIL.gif and /dev/null differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/OK.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/OK.gif
deleted file mode 100644
index 689e5234f3b0879eeb1d5ead2cc2ad022d2831be..0000000000000000000000000000000000000000
Binary files a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/OK.gif and /dev/null differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_err.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_err.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4f0748abc07d0bfb1843809a7b4cb4ddf6ded917
Binary files /dev/null and b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_err.gif differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_warn.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_warn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8386e3e02a26c4922cb7ee4f8d978de11617db66
Binary files /dev/null and b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/access_warn.gif differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
index 60d80a60147f8d16e821333556822bba4c037674..e843ecfa6ee9a834fff27819ec64134d3e5cd7cc 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
@@ -1,48 +1,61 @@
<html>
<head>
<?php
- $parts = explode("/", getcwd());
- $parts2 = explode("-", $parts[count($parts) - 1]);
- $buildName = $parts2[1];
-
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
- echo "<title>Build Notes for $buildName </title>";
+echo "<title>Build Notes for $buildName </title>";
?>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+ type="text/css">
</head>
<body>
-<p><b><font face="Verdana" size="+3">Build Notes</font></b> </p>
+<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
- Build Notes for <?php echo "$buildName"; ?></font></b></td>
- </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+ <tr>
+ <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+ color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
+ </tr>
</table>
<table border="0">
<?php
- $hasNotes = false;
- $aDirectory = dir("buildnotes");
- while ($anEntry = $aDirectory->read()) {
- if ($anEntry != "." && $anEntry != "..") {
- $parts = explode("_", $anEntry);
- $baseName = $parts[1];
- $parts = explode(".", $baseName);
- $component = $parts[0];
- $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
- echo "<tr>";
- echo "$line";
- echo "</tr>";
- $hasNotes = true;
- }
- }
- aDirectory.closedir();
- if (!$hasNotes) {
- echo "<br>There are no build notes for this build.";
- }
+$hasNotes = false;
+$aDirectory = dir("buildnotes");
+while ($anEntry = $aDirectory->read()) {
+ if ($anEntry != "." && $anEntry != "..") {
+ //print_r($anEntry);
+ //echo "<br />";
+
+ $subject = $anEntry;
+ $pattern = '/^buildnotes_(.*)/i';
+ preg_match($pattern, $subject, $matches);
+ $subject = $matches[1];
+ //print_r($subject);
+ //echo "<br />";
+ $pattern = '/^(.*)\.html$/';
+ preg_match($pattern, $subject, $matches);
+ //print_r($matches);
+ //echo "<br />";
+
+ $component = $matches[1];
+
+ $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+ echo "<tr>";
+ echo "$line";
+ echo "</tr>";
+ $hasNotes = true;
+
+ }
+}
+$aDirectory.closedir();
+if (!$hasNotes) {
+ echo "<br>There are no build notes for this build.";
+}
?>
</table>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_err.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_err.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c2bfdd606b59240410feb5ce0f1dc8ec7c7f35e3
Binary files /dev/null and b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_err.gif differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_warn.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_warn.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cf4fdf93c71b7ab2cb28dfd06fed9c563fa29214
Binary files /dev/null and b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/compile_warn.gif differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/componentxmls.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/componentxmls.php
deleted file mode 100644
index 73c5443ca1a5e0306ef2fe4b191d96298176d6cf..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/componentxmls.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-<head>
-<?php
- function find_component_xml($directory)
- {
- $count = 0;
- $dir = dir($directory);
- while ($anEntry = $dir->read())
- {
- if ($anEntry != "." && $anEntry != "..")
- {
- $anEntry = $directory."/".$anEntry;
- if (stristr($anEntry, '.source') === FALSE)
- {
- if (is_dir($anEntry))
- {
- find_component_xml($anEntry);
- }
- else
- {
- echo "<tr><td><a href=\"$anEntry\">";
- echo substr($anEntry, 22);
- echo "</a></td>";
- }
- }
- }
- }
- }
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">component.xml</font></b> </p>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
- component.xml files for <?php echo "$buildType $buildName"; ?></font></b></td>
- </tr>
-</table>
-
-<table border="1" width="100%">
- <tr>
- <th>component.xml</th>
- </tr>
-<?php
- find_component_xml("apitools/componentxmls");
-?>
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
index 06811384d69b1e163ab12da1859ca96e050f725d..7dd5f4219ae65abc7f4d9c7bdc4dddb0b93bb886 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
@@ -1,55 +1,92 @@
<html>
<head>
<?php
- $parts = explode("/", getcwd());
- $parts2 = explode("-", $parts[count($parts) - 1]);
- $buildName = $parts2[1];
-
- echo "<title>Test Console Output for $buildName </title>";
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
+
+echo "<title>Test Console Output for $buildName </title>";
?>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+ type="text/css">
+<title>Console Logs from Running JUnit Plug-in Tests</title>
+</head>
<body>
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
+<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
- output from running JUnit plugin tests for
- <?php echo "$buildName"; ?>
- </font></b></td>
- </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+ <tr>
+ <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+ color="#FFFFFF" face="Arial,Helvetica">Console output from running
+ JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
+ </tr>
</table>
<table border="0">
<?php
- $hasNotes = false;
- $aDirectory = dir("testResults/consolelogs");
- $index = 0;
- while ($anEntry = $aDirectory->read()) {
- if ($anEntry != "." && $anEntry != "..") {
- $entries[$index] = $anEntry;
- $index++;
- }
- }
-
- aDirectory.closedir();
- sort($entries);
-
- for ($i = 0; $i < $index; $i++) {
- $anEntry = $entries[$i];
- $line = "<td>Component: <a href=\"testResults/consolelogs/$anEntry\">$anEntry</a></td>";
- echo "<tr>";
- echo "$line";
- echo "</tr>";
- $hasNotes = true;
- }
-
- if (!$hasNotes) {
- echo "<br>There are no test logs for this build.";
- }
+$rootDir = "testResults/consolelogs";
+$hasNotes = false;
+$aDirectory = dir($rootDir);
+$index = 0;
+$dirindex = 0;
+while ($anEntry = $aDirectory->read()) {
+ if ($anEntry != "." && $anEntry != "..") {
+ if (is_file("$rootDir/$anEntry")) {
+ $entries[$index] = $anEntry;
+ $index++;
+ } else if (is_dir("$rootDir/$anEntry")) {
+ $direntries[$dirindex] = $anEntry;
+ $dirindex++;
+ }
+ }
+}
+$aDirectory->close();
+
+
+sort($entries);
+sort($direntries);
+
+for ($i = 0; $i < $dirindex; $i++) {
+ $anEntry = $direntries[$i];
+ $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+ echo "<tr>";
+ echo "$line";
+ echo "</tr>";
+}
+for ($i = 0; $i < $index; $i++) {
+ $anEntry = $entries[$i];
+ $logsize = filesize("testResults/consolelogs/$anEntry");
+
+
+ $level = 0;
+ if ($logsize > 20000) {
+ $level = 2;
+ }
+ else if ($logsize > 2000) {
+ $level = 1;
+ }
+
+ if ($level == 0) {
+ $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a> ($logsize bytes)</td>";
+ }
+ else if ($level == 1) {
+ $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a> ($logsize bytes)</em></td>";
+ } else if ($level == 2) {
+ $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a> ($logsize bytes)</strong></td>";
+ }
+
+
+ echo "<tr>";
+ echo "$line";
+ echo "</tr>";
+ $hasNotes = true;
+}
+
+if (!$hasNotes) {
+ echo "<br>There are no test logs for this build.";
+}
?>
</table>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/download.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/download.php
deleted file mode 100644
index 5b867e4615c508ae639d645120c939097230f274..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/download.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<title>Eclipse Dali Download Click Through</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<?php
- $parts = explode("-", $dropFile);
- $clickFile = "clickThroughs/";
- for ($i =0; $i<count($parts); $i++) {
- if ($i != 2) {
- $clickFile = $clickFile.$parts[$i];
- if ($i < count($parts) - 1) {
- $clickFile = $clickFile."-";
- }
- }
- }
- $clickFile = $clickFile.".txt";
-
- if (file_exists($clickFile)) {
- $fileHandle = fopen($clickFile, "r");
- while (!feof($fileHandle)) {
- $aLine = fgets($fileHandle, 4096);
- $result = $result.$aLine;
- }
- fclose($fileHandle);
- } else {
- echo '<META HTTP-EQUIV="Refresh" CONTENT="0;URL='.$dropFile.'">';
- echo '<b><font size "+4">Downloading: '.$dropFile.'</font></b>';
- echo '<BR>';
- echo '<BR>';
- echo 'If your download does not begin automatically click <a href="'.$dropFile.'">here</a>.';
- }
-?>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
- <?php
- if (file_exists($clickFile)) {
- echo '<p><b><font size="+4">Important Notes<BR>';
- echo $dropFile;
- echo '</font></b></font></p>
- <p>It is very important to read the following notes in order to run this version
- of Eclipse. Once you have read the notes you can click on the Download link
- to download the drop.</p>
- ';
- echo '<textarea name="textfield" cols="80" rows="20" wrap="PHYSICAL">'.$result;
- echo '</textarea>';
- echo '<BR>';
- echo '<BR>';
- echo '<a href="'.$dropFile.'">Download</a>';
- }
-?>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/junit_err.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/junit_err.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1b7ff9de097c6edf4a1f8bea018859942d04bb65
Binary files /dev/null and b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/junit_err.gif differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b36334d777d331f9258bbbc8c736ceb9defd7c4
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php
@@ -0,0 +1,84 @@
+<html>
+<head>
+<?php
+
+function endsWith( $str, $sub ) {
+
+ return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+}
+
+ $parts = explode("/", getcwd());
+ $parts2 = explode("-", $parts[count($parts) - 1]);
+ $buildName = $parts2[1];
+
+ echo "<title>Test Console Output for $buildName </title>";
+?>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
+<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<body>
+
+<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+ <tr>
+ <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
+ output from running JUnit plugin tests for
+ <?php echo "$buildName"; ?>
+ </font></b></td>
+ </tr>
+</table>
+<table border="0">
+
+<?php
+ $hasNotes = false;
+ $aDirectory = dir(".");
+ $index = 0;
+ while ($anEntry = $aDirectory->read()) {
+ if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+ $entries[$index] = $anEntry;
+ $index++;
+ }
+ }
+ aDirectory.closedir();
+
+
+ sort($entries);
+
+ for ($i = 0; $i < $index; $i++) {
+ $anEntry = $entries[$i];
+ $logsize = filesize("$anEntry");
+
+
+ $level = 0;
+ if ($logsize > 20000) {
+ $level = 2;
+ }
+ else if ($logsize > 2000) {
+ $level = 1;
+ }
+
+ if ($level == 0) {
+ $line = "<td><a href=\"$anEntry\">$anEntry</a> ($logsize bytes)</td>";
+ }
+ else if ($level == 1) {
+ $line = "<td><em><a href=\"$anEntry\">$anEntry</a> ($logsize bytes)</em></td>";
+ } else if ($level == 2) {
+ $line = "<td><strong><a href=\"$anEntry\">$anEntry</a> ($logsize bytes)</strong></td>";
+ }
+
+
+ echo "<tr>";
+ echo "$line";
+ echo "</tr>";
+ $hasNotes = true;
+ }
+
+ if (!$hasNotes) {
+ echo "<br>There are no test logs for this build.";
+ }
+?>
+
+</table>
+</body>
+</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php
new file mode 100644
index 0000000000000000000000000000000000000000..c83bdf60ea5a522abecbe39c5e2f025b41611941
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php
@@ -0,0 +1,214 @@
+<?php
+
+// todo: unsure if can handle filenames that are URLs?
+// handy constant to compute file size in megabytes
+
+function fileSizeInMegs($filename) {
+ $onemeg=1024*1024;
+ $zipfilesize=filesize($filename);
+ $zipfilesize=round($zipfilesize/$onemeg, 0);
+ return $zipfilesize;
+}
+
+function fileSizeForDisplay($filename) {
+ $onekilo=1024;
+ $onemeg=$onekilo * $onekilo;
+ $criteria = 10 * $onemeg;
+ $scaleChar = "M";
+ $zipfilesize=filesize($filename);
+ if ($zipfilesize > $criteria) {
+ $zipfilesize=round($zipfilesize/$onemeg, 0);
+ $scaleChar = "M";
+ }
+ else {
+ $zipfilesize=round($zipfilesize/$onekilo, 0);
+ $scaleChar = "K";
+ }
+ $result = "(" . $zipfilesize . $scaleChar . ")";
+ return $result;
+}
+
+
+function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
+ echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+ echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
+ echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+ echo $zipfilesize;
+ echo "</td>";
+ echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
+ echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
+ echo "</td>";
+}
+
+function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
+{
+ $result = false;
+
+ $allowURLopen = ini_get('allow_url_fopen');
+
+ if ($allowURLopen && stream_last_modified($url)) {
+ $result = true;
+ }
+ else {
+ // TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
+ // is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
+ $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+ if (file_exists($wholePath)) {
+ $result = true;
+ }
+ }
+ return $result;
+}
+
+function stream_last_modified($url)
+{
+ if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
+ {
+ if (!($fp = @fopen($url, 'r')))
+ return NULL;
+
+ $meta = stream_get_meta_data($fp);
+ for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
+ {
+ if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
+ {
+ $modtime = substr($meta['wrapper_data'][$j], 15);
+ break;
+ }
+ }
+ fclose($fp);
+ }
+ else
+ {
+ $parts = parse_url($url);
+ $host = $parts['host'];
+ $path = $parts['path'];
+
+ if (!($fp = @fsockopen($host, 80)))
+ return NULL;
+
+ $req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
+ fputs($fp, $req);
+
+ while (!feof($fp))
+ {
+ $str = fgets($fp, 4096);
+ if (strstr(strtolower($str), 'last-modified'))
+ {
+ $modtime = substr($str, 15);
+ break;
+ }
+ }
+ fclose($fp);
+ }
+ return isset($modtime) ? strtotime($modtime) : time();
+}
+
+function isMirrored($uriToCheck) {
+ global $debugScript;
+ global $debugFunctions;
+ $localuri = $uriToCheck;
+
+ $debugMirrorList = false;
+ if ($debugScript) {
+ echo "uriToCheck: " . $localuri . "<br />";
+ }
+
+ $xmlcount = 0;
+
+ /* This method true and accurate method of parsing mirror results
+ * may be expensive, and would
+ * likely cause artificially high counts of "downloads".
+ * Could maybe use if somehow only checked once ever 5 minutes or something.
+
+
+ // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
+ $holdLevel = error_reporting(E_ERROR);
+ $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
+ error_reporting($holdLevel);
+
+
+ if ($mirrorsxml) {
+ if ($debugFunctions) {
+ echo "root node: " . $mirrorsxml->getName() . "<br />";
+ }
+ if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
+ foreach ($mirrorsxml->children() as $mirror) {
+ if (strcmp($mirror->getName(),"mirror") == 0) {
+ $xmlcount=$xmlcount+1;
+ }
+ if ($debugMirrorList) {
+ print_r($mirror);
+ echo "<br />";
+ }
+ }
+ }
+ if ($debugFunctions) {
+ echo "Mirror count: " . $xmlcount . "<br />";
+ }
+ }
+ */
+ /*
+ * Use simple heuristic based on pattern
+ * in the URI ... if it contains "/downloads/" then assume it's mirrored
+ */
+ if (strpos($uriToCheck, "webtools/downloads/") > 0) {
+ $xmlcount = 1;
+ }
+ return ($xmlcount > 0);
+
+}
+
+// TODO: replace with Phoenix variables
+function getPlatform () {
+ global $debugScript;
+ global $debugFunctions;
+ // getBrowser is expensive, so cache the data
+ static $browser;
+ $platform = "unknown";
+
+
+ if(ini_get("browscap")) {
+ if(!isset($browser)){
+ $browser = get_browser(null, true);
+ }
+
+ if ($browser) {
+ $rawPlatform = $browser['platform'];
+ if ($debugFunctions) {
+ echo "browser platfrom: " . $rawPlatform . "<br />" ;
+ }
+
+ if ($debugFunctions) {
+ $browserKeys = array_keys($browser);
+ foreach ($browserKeys as $key) {
+ echo $key . ": " . $browser[$key] . "<br />";
+ }
+ }
+ }
+ if (strpos($rawPlatform, "Win") === 0) {
+ $platform="windows";
+ } else if (strpos($rawPlatform, "Linux") === 0) {
+ $platform="linux";
+ } else if (strpos($rawPlatform, "Mac") === 0) {
+ $platform="mac";
+ }
+ }
+ return $platform;
+}
+
+
+function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
+ // todo: we really only need "if exists" so could make a bit more efficient
+ // I tried "file_exists" but is didn't seem to work on my test server
+ // For these pre-reqs, we assume if they exist, they are mirrored. This is true
+ // 99% of the time.
+
+ if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
+ $reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
+ } else {
+ $reflink=$prereqfilename;
+ }
+ return $reflink;
+}
+?>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending.gif
new file mode 100644
index 0000000000000000000000000000000000000000..66db2a627b7af1993ba6acc7e25ec24f2bf994f5
Binary files /dev/null and b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending.gif differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending1.gif b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1b2ea6ebcfe9b3acebacfb61f004e105bb6fb502
Binary files /dev/null and b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pending1.gif differ
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pii.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pii.php
deleted file mode 100644
index e3ed59b07d66c618c5035119d88bae32814960ed..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/pii.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<?php
- function write_unused_property($directory)
- {
- $count = 0;
- $dir = dir($directory);
- while ($anEntry = $dir->read())
- {
- if ($anEntry != "." && $anEntry != "..")
- {
- $anEntry = $directory."/".$anEntry;
- if (is_dir($anEntry))
- {
- write_unused_property($anEntry);
- }
- else
- {
- echo "<tr><td><a href=\"$anEntry\">";
- echo substr($anEntry, 16);
- echo "</a></td>";
- $lines = file($anEntry);
- $count = count($lines);
- echo "<td>$count</td></tr>";
- }
- }
- }
- }
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Unused property messages</font></b> </p>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
- Unused property messages for <?php echo "$buildType $buildName"; ?></font></b></td>
- </tr>
-</table>
-
-<table border="1">
- <tr>
- <th>Properties file</th>
- <th>Unused strings</th>
- </tr>
-<?php
- write_unused_property("piitools");
-?>
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php
new file mode 100644
index 0000000000000000000000000000000000000000..52d2284f5f5eac1e23ed61ce049ba4dfbfa5f1bd
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php
@@ -0,0 +1,45 @@
+
+ <?php
+
+function parse_testResults($filename)
+{
+ $junitFailures = 0;
+ if (is_file($filename)) {
+ $handle = @fopen($filename, "r");
+ if ($handle)
+ {
+ $size = filesize($filename);
+ $content = fread($handle, $size);
+ fclose($handle);
+ $junitStart = strpos($content, "Errors & Failures");
+ $junitEnd = strpos($content, "</table>", $junitStart);
+ $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+ $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+ while ($start !== false)
+ {
+ $start += 29;
+ $stop = strpos($junitInfo, "</font></b></td>", $start);
+ if ($stop !== false)
+ {
+ $result = substr($junitInfo, $start, $stop - $start);
+ if (is_numeric($result))
+ {
+ $junitFailures += $result;
+ }
+ else if (strcmp($result, "DNF") == 0)
+ {
+ $junitFailures++;
+ }
+ }
+ $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+ }
+ $results = array($junitFailures);
+ return $results;
+ }
+ }
+}
+
+
+?>
+
+
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/buildresult.xml.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/buildresult.xml.template
deleted file mode 100644
index 1fdede522e866d59a6944b237860de85db7be1c2..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/buildresult.xml.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<eclipsebuild buildlabel="@buildlabel@">
-</eclipsebuild>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/cloudscapeplugin.xml.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/cloudscapeplugin.xml.template
deleted file mode 100644
index 3f7a21b92a154ff41adedd26894ed628ff9df30b..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/cloudscapeplugin.xml.template
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="Cloudscape"
- name="Cloudscape Plug-in"
- version="1.0.0"
- provider-name="">
- <runtime>
- <library name="derby.jar">
- <export name="*"/>
- </library>
- <library name="derbynet.jar">
- <export name="*"/>
- </library>
- <library name="derbytools.jar">
- <export name="*"/>
- </library>
- </runtime>
-</plugin>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/compileResults.php.template
new file mode 100644
index 0000000000000000000000000000000000000000..c854e2b195f6cbc6e4add9016305fb57bf32b031
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/compileResults.php.template
@@ -0,0 +1,76 @@
+<html>
+<head>
+
+<?php
+ $parts = explode("/", getcwd());
+ $parts2 = explode("-", $parts[count($parts) - 1]);
+ $buildName = $parts2[1];
+
+ echo "<title>Compile Logs: Code Bundles for $buildName</title>";
+?>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+<style>
+.bold, .bold TD, .bold TH, .bold TR
+{
+font-weight:bold;
+}
+.numeric, .numeric TD
+{
+text-align:right;
+padding-right:2%;
+}
+.normaltable, .normaltable TD, .normaltable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:White;
+}
+.errorltable, .errortable TD, .errortable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Red;
+font-weight:bold;
+}
+.warningtable, .warningtable TD, .warningtable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:khaki;
+}
+.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Yellow;
+}
+</style>
+</head>
+<body>
+
+<?php
+ echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
+?>
+
+
+<table id=tabledata align = "center" width="75%" border="1">
+ <tr>
+ <td class="bold" align="center">Compile Logs</td>
+ <td class="bold" align="center">Compile Errors</td>
+ <td class="bold" align="center">Compiler Warnings</td>
+ <td class="bold" align="center">Access Violations</td>
+ <td class="bold" align="center">Access Warnings</td>
+ </tr>
+
+ %compilelogs%
+
+</table>
+
+</body>
+</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.N.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.N.template
deleted file mode 100644
index 33026eb3feb3520f1828a1d53f501c2fcc785607..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.N.template
+++ /dev/null
@@ -1,128 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Download</title>
-</head>
-
-<body>
-
-<?php
-include '../../report.php';
-$testResults = parse_testResult("testResults.php");
-list ($compileErrors, $compileWarnings, $junitFailures) = $testResults;
-$violations = parse("apitools/index.xml", "count=\"");
-$tc = parse("apitools/index-api-tc.xml", "missing-coverage-count=\"");
-$removed_apis = parse("apitools/index-api-compatibility.xml", "removed-api-count=\"");
-?>
-
- <table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" ><tr><td ALIGN=LEFT width="80%">
-<p><b><font face="Verdana" size="+3">@type@ Build: @build@</font></b><br>
-@date@
-</p>
-<p>These downloads are provided under the <a href="http://www.eclipse.org/legal/epl/notice.html">Eclipse Foundation
-Software User Agreement</a>.</p>
-</td></tr></table>
-
-<!-- *********** Build Status ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">Build, test and performance</font></b></td></tr></table>
-<br> <a href="buildNotes.php">Build notes</a>
-<br> <a href="directory.txt">map files</a>
-<br> <a href="testResults.php">Compile logs & test results</a>
-
-<?php
-echo "<img src=\"http://download.eclipse.org/technology/dali/downloads/compile_err.gif\"/><font color=red>$compileErrors</font> ";
-echo "<img src=\"http://download.eclipse.org/technology/dali/downloads/compile_warn.gif\"/><font color=orange>$compileWarnings</font> ";
-echo "<img src=\"http://download.eclipse.org/technology/dali/downloads/junit_err.gif\"/><font color=red>$junitFailures</font>";
-?>
-
-<br> <a href="whatisfixed/buglog.html">What is fixed</a>
-
-<!--
-<br> <a href="perf/results/graph/global.php">Performance results</a>
--->
-<br> <a href="pii.php">Unused property messages</a>
-<!-- To view cvs changes since the last build click <A href="rloghtml/rlog.html">here</A>.<BR> -->
-<p/>
-
-<?php
-if (file_exists("./apiresults"))
-{
- echo "<br>";
- echo "<br> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
- echo "<br> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
- echo "<br> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
- echo "<br> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
- echo "<br> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
- echo "<br> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
- echo "<br> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-?>
-
-<?php
-if (file_exists("./perfresults"))
-{
- echo "<br>";
- echo "<br> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
- echo "<br>";
-}
-?>
-
-<!-- *********** Requirements ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">Requirements</font></b></td></tr></table>
-<P>These are the prerequisites to install Dali;. They must be downloaded and installed
- before Dali can be installed.</P>
-<br>
-<li>The Eclipse driver used in this build is <a href="@eclipseURL@">@eclipseFile@</a>. You can find a suitable driver for your platform at <a href=@eclipseBuildURL@>here</a><br></li>
-<li>The EMF driver used in this build is <a href="@emfURL@">@emfFile@</a><br></li>
-<li>The GEF driver used in this build is <a href="@gefURL@">@gefFile@</a><br></li>
-<li>Java EMF Model Runtime driver used in this build is <a href="@jemURL@">@jemFile@</a><br></li>
-<li>The WTP runtime module used in this build is <a href="@wtpURL@">@wtpFile@</a><br></li>
-<P></P>
-
-
-
-<!-- *********** Runtime downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">
- Dali Runtime </font></b></td>
- </tr>
-
-<TR>
- <TD align="LEFT" valign="TOP" colspan="3"> This module includes the complete
- set of plug-in to run Dali.</TD>
- </TR></table>
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<div align="left"><b>Status</b></div></td>
-<td width="34%"><b>Platform</b></td>
-<td width="59%"><b>Download</b></td></tr>
-%dali-runtime%
-</table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2"> </td></tr></table>
-
-
-<!-- *********** Automated Test Downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#999999">
-<b><font face="Arial,Helvetica" color="#FFFFFF">
-Automated Tests
-</font></b></td></tr>
-
-<TR>
- <TD align="LEFT" valign="TOP" colspan="3"> This download contains the JUnit
- tests for the Dali project</TD>
- </TR></table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2"> </td></tr></table>
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<div align="left"><b>Status</b></div></td>
-<td width="34%"><b>Platform</b></td>
-<td width="59%"><b>Download</b></td></tr>
-<tr><td>%dali-tests%</td></tr>
-</table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2"> </td></tr></table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template
deleted file mode 100644
index 0334f3e0276ca0ce9cb56929feed732faafb85e2..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template
+++ /dev/null
@@ -1,120 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Download</title>
-</head>
-
-<body>
-
-<?php
-include '../../../report.php';
-$testResults = parse_testResult("testResults.php");
-list ($compileErrors, $compileWarnings, $junitFailures) = $testResults;
-?>
-
- <table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" ><tr><td ALIGN=LEFT width="80%">
-<p><b><font face="Verdana" size="+3">@type@ Build: @build@</font></b><br>
-@date@
-</p>
-<p>These downloads are provided under the <a href="http://www.eclipse.org/legal/epl/notice.html">Eclipse Foundation
-Software User Agreement</a>.</p>
-</td></tr></table>
-
-<!-- *********** Build Status ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">Build, test and performance</font></b></td></tr></table>
-<br> <a href="buildNotes.php">Build notes</a>
-<br> <a href="directory.txt">map files</a>
-<br> <a href="testResults.php">Compile logs & test results</a>
-
-<?php
-echo "<img src=\"http://download.eclipse.org/technology/dali/downloads/compile_err.gif\"/><font color=red>$compileErrors</font> ";
-echo "<img src=\"http://download.eclipse.org/technology/dali/downloads/compile_warn.gif\"/><font color=orange>$compileWarnings</font> ";
-echo "<img src=\"http://download.eclipse.org/technology/dali/downloads/junit_err.gif\"/><font color=red>$junitFailures</font>";
-?>
-<br> <a href="whatisfixed/buglog.html">What is fixed</a>
-
-<br> <a href="pii.php">Unused property messages</a>
-<!-- To view cvs changes since the last build click <A href="rloghtml/rlog.html">here</A>.<BR> -->
-
-<?php
-if (file_exists("./apiresults"))
-{
- echo "<br>";
- echo "<br> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
- echo "<br> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
- echo "<br> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
- echo "<br> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
- echo "<br> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
- echo "<br> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
- echo "<br> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-?>
-
-<?php
-if (file_exists("./perfresults"))
-{
- echo "<br>";
- echo "<br> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
- echo "<br>";
-}
-?>
-
-<!-- *********** Requirements ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">Requirements</font></b></td></tr></table>
-<P>These are the prerequisites to install Dali;. They must be downloaded and installed
- before Dali can be installed.</P>
-<br>
-<li>The Eclipse driver used in this build is <a href="@eclipseURL@">@eclipseFile@</a>. You can find a suitable driver for your platform at <a href=@eclipseBuildURL@>here</a><br></li>
-<li>The EMF driver used in this build is <a href="@emfURL@">@emfFile@</a><br></li>
-<li>The GEF driver used in this build is <a href="@gefURL@">@gefFile@</a><br></li>
-<li>Java EMF Model Runtime driver used in this build is <a href="@jemURL@">@jemFile@</a><br></li>
-<li>Data Tools Platform (DTP) driver used in this build is <a href="@dtpURL@">@dtpFile@</a><br></li>
-<li>The WTP runtime module used in this build is <a href="@wtpURL@">@wtpFile@</a><br></li>
-<P></P>
-
-
-
-<!-- *********** Runtime downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">
- Dali Runtime </font></b></td>
- </tr>
-
-<TR>
- <TD align="LEFT" valign="TOP" colspan="3"> This module includes the complete
- set of plug-in to run Dali. </TD>
- </TR></table>
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<div align="left"><b>Status</b></div></td>
-<td width="34%"><b>Platform</b></td>
-<td width="59%"><b>Download</b></td></tr>
-%dali-runtime%
-</table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2"> </td></tr></table>
-
-
-<!-- *********** Automated Test Downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#999999">
-<b><font face="Arial,Helvetica" color="#FFFFFF">
-Automated Tests
-</font></b></td></tr>
-
-<TR><TD align="LEFT" valign="TOP" colspan="3">
-This download contains the JUnit tests for the Dali Projects
-</TD></TR></table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2"> </td></tr></table>
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<div align="left"><b>Status</b></div></td>
-<td width="34%"><b>Platform</b></td>
-<td width="59%"><b>Download</b></td></tr>
-<tr><td>%dali-tests%</td></tr>
-</table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td colspan="2"> </td></tr></table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
new file mode 100644
index 0000000000000000000000000000000000000000..e286d0744401f2fc919169882cd5e3aef413fbc8
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
@@ -0,0 +1,516 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+<title>Dali Downloads</title>
+
+
+<?php
+
+$buildBranch="@buildBranch@";
+$build="@build@";
+$type="@type@";
+$builddate="@date@";
+
+$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
+$eclipseFSpathPrefix="@eclipse.fspath.prefix@";
+
+$eclipsefilelinux="@eclipsefilelinux@";
+$eclipsefilewindows="@eclipsefilewindows@";
+$eclipsefilemacosx="@eclipsefilemacos@";
+
+$eclipseURL="@eclipseURL@";
+$eclipseFile="@eclipseFile@";
+$eclipseBuildURL="@eclipseBuildURL@";
+$eclipseBuildHome="@eclipseBuildHome@";
+$testURL="@testURL@";
+$testFile="@testFile@";
+
+$wstURL="@wstURL@";
+$wstFile="@wstFile@";
+$wstMirrorPrefixuri="@wst.mirror.prefixuri@";
+$wstBuildHome="@wstBuildHome@";
+
+
+$gefURL="@gefURL@";
+$gefFile="@gefFile@";
+$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
+$gefBuildHome="@gefBuildHome@";
+
+$emfURL="@emfURL@";
+$emfFile="@emfFile@";
+$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
+$emfBuildHome="@emfBuildHome@";
+
+$dtpURL="@dtpURL@";
+$dtpFile="@dtpFile@";
+$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
+$dtpBuildHome="@dtpBuildHome@";
+
+
+$eclipserelengFile="@eclipserelengFile@";
+$eclipserelengURL="@eclipserelengURL@";
+$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
+$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
+$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
+$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
+
+
+
+
+include("miscUtil.php");
+
+
+
+ini_set("display_errors", "true");
+error_reporting (E_ALL);
+
+
+$debugScript = false;
+$debugFunctions = false;
+
+$defaultMirrorScript="";
+$defaultWTPMirrorPrefix="./";
+
+$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
+
+// TODO: improve so this hard coding isn't required.
+// This depends on the declare script changing webtools/committers to webtools/downloads
+// And, the logic is such that if it is not mirrored, this URI is not used at all, just
+// a relative reference only
+$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
+
+
+$mirrorScript=$defaultMirrorScript;
+$downloadprefix=$defaultWTPMirrorPrefix;
+
+
+$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/dali-sdk-$build.zip";
+if (isMirrored($keytestMirrorString) ) {
+ $mirrorScript=$eclipseMirrorScript;
+ $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+}
+
+if ($debugScript) {
+ echo "inferred platform: " . getPlatform();
+}
+
+
+// our summary results handling requires php 5 (for simple xml file loading)
+// so, if not php 5, just don't display any summary results
+// This was found to be required, since some mirror our whole site (e.g. IBM)
+// and not all mirrors use PHP 5
+$displayTestSummary=false;
+if (phpversion() >= 5) {
+
+ $displayTestSummary=true;
+ // expecting grandTotalErrors and grandTotalTests
+ $filename = "unitTestsSummary.xml";
+ if (file_exists($filename)) {
+ $prefix = "unitTests_";
+ $unitTestsSummary = simplexml_load_file($filename);
+ foreach ($unitTestsSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+ }
+ }
+
+ $filename = "compilelogsSummary.xml";
+ $prefix = "code_";
+ $compileSummary = simplexml_load_file($filename);
+ foreach ($compileSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+ }
+
+ $filename = "testcompilelogsSummary.xml";
+ $prefix = "test_";
+ $compileSummary = simplexml_load_file($filename);
+ foreach ($compileSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+ }
+}
+
+
+?>
+
+
+</head>
+
+<body>
+
+
+<?php
+
+// tiny banner to remind when looking at "local" machine results
+$serverName = $_SERVER["SERVER_NAME"];
+
+if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
+ echo '<center>
+ <p>
+ Reminder: this is <font color="#FF0000">' .
+ $serverName .
+ '</font>
+ See also
+ <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
+ </p>
+ <hr />
+ </center>';
+
+}
+?>
+<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
+ <tr>
+ <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
+ Build: <?php echo "$build";?></b></font></td>
+ <td align="right" rowspan="3"><a
+ href="http://www.eclipse.org/projects/what-is-incubation.php"><img
+ src="http://www.eclipse.org/images/egg-incubation.png" alt="Incubation"
+ align="middle" border="0"></a></td>
+
+ <tr valign="top">
+ <td><font size="-1"><?php echo "$builddate";?></font></td>
+ </tr>
+ <tr valign="top">
+ <td>
+ <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides
+ tools for development that are just getting started, or are
+ experimental in some fashion.</p>
+ </td>
+ </tr>
+</table>
+
+<!-- *********** Required Prerequisites ************** -->
+<table border=0 cellspacing=2 cellpadding=2 width="100%">
+ <tr>
+ <td align="left" valign="top" bgcolor="#0080C0"><font
+ face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Required
+ Prerequisites and Handy Extras</font></td>
+ </tr>
+ <tr>
+ <td>
+ <p>These are the prerequisites to install and run the Web Tools
+ Platform. Also listed are some frequently needed links for
+ committer-required packages when creating new developmnet
+ environmnets, or targets to run against.</p>
+ <p>Note that WTP requires Java 5 or higher (and, for some things,
+ actually requires a JDK rather than only a JRE) even though many other
+ <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
+ run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
+ JRE levels</a>.</p><p></p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
+ <tr valign="top">
+ <td width="10%"></td>
+ <td width="40%">Eclipse Platform (Platform, JDT)</td>
+ <?php
+ //customize page depending on user's browser/platform, if we can detect it
+ $usersPlatform = getPlatform();
+ // assume windows by default, since likely most frequent, even for cases where
+ // platform is "unknown". I've noticed Opera reports 'unknown' :(
+ $recommendedFile=$eclipsefilewindows;
+ if (strcmp($usersPlatform,"linux")== 0) {
+ $recommendedFile=$eclipsefilelinux;
+ } else if (strcmp($usersPlatform,"mac") == 0) {
+ $recommendedFile=$eclipsefilemacosx;
+ }
+ ?>
+ <td align="right"><?php
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+ echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+ ?>
+
+ </tr>
+
+ <tr valign="top">
+ <td width="10%"></td>
+ <td>Webtools Platform (at least WST)</td>
+ <td align="right"><?php
+ // debug
+ // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+ ?>
+
+ </tr>
+
+ <tr valign="top">
+ <td width="10%"></td>
+ <td>Eclipse Modeling Framework (EMF, XSD InfoSet)</td>
+ <td align="right"><?php
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+ ?>
+
+ </tr>
+
+ <tr valign="top">
+ <td width="10%"></td>
+ <td>Graphical Editing Framework (GEF)</td>
+ <td align="right"><?php
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
+ ?>
+
+ </tr>
+
+ <tr valign="middle">
+ <td width="10%"></td>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+ <tr valign="top">
+ <td width="10%"></td>
+ <td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
+ <td align="right"><?php
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+ ?>
+
+ </tr>
+
+ <tr valign="top">
+ <td width="10%"></td>
+ <td>Eclipse releng tool (required only for committers to more easily
+ "release" code to a build)</td>
+ <td align="right"><?php
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
+ echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+ ?>
+
+ </tr>
+
+ <tr valign="top">
+ <td width="10%"></td>
+ <td>Third Party code from Orbit (currently much more than needed
+ for WTP, but some committers like having the whole heap in their
+ target)</td>
+ <td align="right"><?php
+ echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
+ echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
+ ?>
+
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+
+<!-- *********** WTP ************** -->
+<table border=0 cellspacing=2 cellpadding=2 width="100%">
+ <tr>
+ <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+ face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
+ Incubating Components</font></td>
+ </tr>
+
+ <tr>
+ <td align="left" valign="top" colspan="5">
+ <p>The Zip files includes the features and plugins for the Dali Component.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+
+
+ <tr>
+ <td align="left" valign="top" width="10%"><b>Minimal</b></td>
+ <td align="left" valign="top">
+ <p>Executable code only.</p>
+ </td>
+ <?php
+ $zipfilename="dali-${build}";
+ $filename=$zipfilename.".zip";
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription="dali";
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+ ?>
+ </tr>
+
+ <tr>
+ <td align="left" valign="top" width="10%"><b>SDK</b></td>
+ <td align="left" valign="top">
+ <p>Executable code and source code.</p>
+ </td>
+ <?php
+ $zipfilename="dali-sdk-${build}";
+ $filename=$zipfilename.".zip";
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription="dali sdk";
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+ ?>
+ </tr>
+ <tr>
+ <td align="left" valign="top" width="10%"><b>Tests</b></td>
+ <td align="left" valign="top">
+ <p>Unit tests.</p>
+ </td>
+ <?php
+ $zipfilename="dali-tests-${build}";
+ $filename=$zipfilename.".zip";
+ $zipfilesize=fileSizeForDisplay($filename);
+ $fileShortDescription="dali tests";
+ displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+ ?>
+ </tr>
+ </table>
+ </td>
+
+
+ <tr>
+
+</table>
+
+
+
+
+
+
+
+<!-- *********** Build Status ************** -->
+<table border=0 cellspacing=2 cellpadding=2 width="100%">
+ <tr>
+ <td align=left valign=top bgcolor="#0080C0"><font
+ face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
+ and other interesting details</font></td>
+ </tr>
+ <tr>
+ <td>
+ <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+
+ <tr>
+ <td><a href="buildNotes.php">Build notes</a> <br />
+ <a href="directory.txt">map files</a> <br />
+ <?php
+
+ if ($displayTestSummary) {
+
+
+ if (isset($unitTests_grandTotalErrors)) {
+ $errorColor="green";
+ if ($unitTests_grandTotalErrors > 0) {
+ $errorColor="red";
+ }
+ echo "<a href=\"testResults.php\">Unit test results</a> ";
+ echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font> Total: " . $unitTests_grandTotalTests;
+ }
+ else {
+ echo "<br /><font color=\"orange\">Unit tests are pending</font> <img src=\"pending.gif\"/>";
+ }
+
+ echo "<br />";
+ echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
+
+ echo " ($code_totalBundles) ";
+ echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font> ";
+ echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font> ";
+ echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font> ";
+ echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font> ";
+
+ echo "<br />";
+ echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+
+ echo " ($test_totalBundles) ";
+ echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font> ";
+ echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font> ";
+ echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font> ";
+ echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font> ";
+ }
+
+ ?> <br />
+
+ <?php
+ if (file_exists("versioningReportName.php")) {
+ include "versioningReportName.php";
+ $fname="${versionReportFilename}.html";
+ if (file_exists($fname)) {
+ echo "<br /> <a href='$fname'>Versioning Information</a>";
+ }
+}
+?> <?php
+echo "<br />";
+if (file_exists("./apiresults/api-progress.html"))
+{
+ echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
+}
+if (file_exists("./apiresults/api-info-summary.html"))
+{
+ echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
+}
+if (file_exists("./apiresults/api-ref-compatibility.html"))
+{
+ echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
+}
+if (file_exists("./apiresults/api-violation-summary.html"))
+{
+ echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
+}
+if (file_exists("./apiresults/component-api-violation-all.html"))
+{
+ echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
+}
+if (file_exists("./apiresults/api-tc-summary.html"))
+{
+ echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
+}
+if (file_exists("./apiresults/api-javadoc-summary.html"))
+{
+ echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
+}
+if (file_exists("./apiresults/api-tc-summary.html"))
+{
+ echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
+}
+?> <?php
+if (file_exists("./perfresults/graph/performance.php"))
+{
+ echo "<br />";
+ echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
+ echo "<br />";
+}
+?></td>
+ </tr>
+
+
+ </table>
+ </td>
+ </tr>
+</table>
+
+
+
+<!-- footer -->
+<center>
+<hr>
+<p>All downloads are provided under the terms and conditions of the <a
+ href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
+User Agreement</a> unless otherwise specified.</p>
+
+<p>If you have problems downloading the drops, contact the <font
+ face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
+ href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
+
+</center>
+<!-- end footer -->
+
+
+</body>
+</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-all.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-all.php.template
deleted file mode 100644
index a2148911bf964d5c98b34eac1beee2da55f1bd08..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-all.php.template
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Unit
- Test Results </font></b></td>
- </tr>
-</table>
-<p></p><table border="0">
-</table>
-
-<table width="77%" border="1">
- <tr>
- <td width="81%"><b>Tests Performed</b></td>
- <td width="19%"><b>Errors & Failures</b></td>
- </tr>
-
- %testresults%
-
-</table>
-<br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Plugins
- containing compile errors </font></b></td>
- </tr>
-</table>
-
-<table width="77%" border="1">
- <tr>
- <td><b>Compile Logs (Jar Files)</b></td>
- <td><b>Errors</b></td>
- <td><b>Warnings</b></td>
- </tr>
-
- %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-compile.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-compile.php.template
deleted file mode 100644
index 74927d67b3ec1e766fa53c905a8572a1d18e1f34..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-compile.php.template
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+1">Test Results are not available yet</font></b> </p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Unit
- Tests are in progress. Results will be ready soon... </font></b></td>
- </tr>
-</table>
-<p></p><table border="0">
-</table>
-
-<p></p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Plugins
- containing compile errors </font></b></td>
- </tr>
-</table>
-
-<table width="77%" border="1">
- <tr>
- <td><b>Compile Logs (Jar Files)</b></td>
- <td><b>Errors</b></td>
- <td><b>Warnings</b></td>
- </tr>
-
- %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-tests.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-tests.php.template
deleted file mode 100644
index d31b525a7a13c54cb3d62bd99ff37b6afbd30436..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/monitor-tests.php.template
+++ /dev/null
@@ -1,59 +0,0 @@
-<html>
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-<p><b><font face="Verdana" size="+1">Compilation and Tests are complete, Performance results are not available yet</font></b> </p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Unit
- Performance tests are in progress. Results will be ready soon... </font></b></td>
- </tr>
-</table>
-<p></p><table border="0">
-</table>
-
-<p></p>
-
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Unit
- Test Results </font></b></td>
- </tr>
-</table>
-<p></p><table border="0">
-</table>
-
-<table width="77%" border="1">
- <tr>
- <td width="81%"><b>Tests Performed</b></td>
- <td width="19%"><b>Errors & Failures</b></td>
- </tr>
-
- %testresults%
-
-</table>
-<br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Plugins
- containing compile errors </font></b></td>
- </tr>
-</table>
-
-<table width="77%" border="1">
- <tr>
- <td><b>Compile Logs (Jar Files)</b></td>
- <td><b>Errors</b></td>
- <td><b>Warnings</b></td>
- </tr>
-
- %compilelogs%
-
-</table>
-
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/performance.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/performance.template
deleted file mode 100644
index f8abfbc0612335e7b04ac96f4798e5e473a5097b..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/performance.template
+++ /dev/null
@@ -1,62 +0,0 @@
-<P>
- <A NAME="unit"></A>
- * Missing reference data. Build used for comparison specified in ending parenthesis.
- <BR>green: faster, less memory
- <BR>red: slower, more memory
- <BR>x axis: difference between current value and baseline value as percentage
- <BR>
-</P>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
- Detailed performance data grouped by scenario prefix
- </font></b></td>
- </tr>
-</table>
-
-<?php
- $dir = dir(".");
- while ($anEntry = $dir->read())
- {
- if ($anEntry != "global.php" && substr($anEntry, strlen($anEntry) - 4) == ".php")
- {
- echo "<a href=\"$anEntry\">$anEntry</a><br>";
- }
- }
-?>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td> </td>
- </tr>
-</table>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
- Performance JUnit test results for <?php echo "$buildType $buildName"; ?>
- </font></b></td>
- </tr>
-</table>
-
-<font color="#FFFFFF" face="Arial,Helvetica">
-<table border=1" width="100%">
- <tr>
- <td width="100%"><b>Tests Performed</b></td>
- </tr>
- <?php
- $xmlDir = dir("../xml");
- while ($xmlEntry = $xmlDir->read())
- {
- if ($xmlEntry != "." && $xmlEntry != "..")
- {
- $htmlEntry = substr($xmlEntry, 0, strlen($xmlEntry) - 3) . "html";
- echo "<tr>";
- echo "<td><a href=\"../html/$htmlEntry\">$htmlEntry</a></td>";
- echo "</tr>";
- }
- }
- ?>
-</table>
-</html>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/distribution/dali.site/templateFiles/siteEnablingFeatures.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e4ace4dbc56781af919109b313968edae0b51074
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/siteEnablingFeatures.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+
+ <description>
+ The update site contains the enabling features.
+ </description>
+
+
+
+
+
+
+
+ <category-def
+ name="Enabling Features"
+ label="Enabling Features">
+ <description>
+ This category contains features used by several projects
+ that enable some functionality, but which by themselves are
+ not very interesting.
+ </description>
+ </category-def>
+
+
+
+</site>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/dali.site/templateFiles/siteWTP.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e3a86fa9a791279b052dce11c72283b1b158187c
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/siteWTP.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site
+ pack200="true"
+ mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&format=xml"
+ digestURL="http://download.eclipse.org/webtools/testUpdates/">
+
+ <description
+ url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
+ The update site contains the features of the of Eclipse Web
+ Tools Project (WTP)
+ </description>
+
+ <feature
+ url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
+ id="org.eclipse.wst"
+ version="@org.eclipse.wst@">
+ <category name="Web Tools Platform (WTP)" />
+ </feature>
+
+ <feature
+ url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
+ id="org.eclipse.wst.sdk"
+ version="@org.eclipse.wst.sdk@">
+ <category name="Web Tools Platform (WTP)" />
+ </feature>
+
+ <feature
+ url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
+ id="org.eclipse.jst"
+ version="@org.eclipse.jst@">
+ <category name="Web Tools Platform (WTP)" />
+ </feature>
+
+ <feature
+ url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
+ id="org.eclipse.jst.sdk"
+ version="@org.eclipse.jst.sdk@">
+ <category name="Web Tools Platform (WTP)" />
+ </feature>
+
+
+
+
+ <feature
+ url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
+ id="org.eclipse.jpt.feature"
+ version="@org.eclipse.jpt.feature@">
+ <category name="Web Tools Platform (WTP)" />
+ </feature>
+
+ <feature
+ url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
+ id="org.eclipse.jpt_sdk.feature"
+ version="@org.eclipse.jpt_sdk.feature@">
+ <category name="Web Tools Platform (WTP)" />
+ </feature>
+
+
+ <category-def
+ name="Web Tools Platform (WTP)"
+ label="Web Tools Platform (WTP)">
+ <description>
+ This category contains the features of the Eclipse Web Tools
+ Project (WTP).
+ </description>
+ </category-def>
+
+
+</site>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/testCompileResults.php.template
new file mode 100644
index 0000000000000000000000000000000000000000..48c50857f6ca3e14512698f327d459b34b7ab66c
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/testCompileResults.php.template
@@ -0,0 +1,76 @@
+<html>
+<head>
+
+<?php
+ $parts = explode("/", getcwd());
+ $parts2 = explode("-", $parts[count($parts) - 1]);
+ $buildName = $parts2[1];
+
+ echo "<title>Compile Logs: Test Bundles for $buildName</title>";
+?>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+<style>
+.bold, .bold TD, .bold TH, .bold TR
+{
+font-weight:bold;
+}
+.numeric, .numeric TD
+{
+text-align:right;
+padding-right:2em;
+}
+.normaltable, .normaltable TD, .normaltable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:White;
+}
+.errorltable, .errortable TD, .errortable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Red;
+font-weight:Bold;
+}
+.warningtable, .warningtable TD, .warningtable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:khaki;
+}
+.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Yellow;
+}
+</style>
+</head>
+<body>
+
+<?php
+ echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
+?>
+
+
+<table id=tabledata align = "center" width="75%" border="1">
+ <tr>
+ <td class="bold" align="center">Compile Logs</td>
+ <td class="bold" align="center">Compile Errors</td>
+ <td class="bold" align="center">Compiler Warnings</td>
+ <td class="bold" align="center">Access Violations</td>
+ <td class="bold" align="center">Access Warnings</td>
+ </tr>
+
+ %compilelogs%
+
+</table>
+
+</body>
+</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
index c94cd00e1a808a2e9c1411a018964744a8bdbdfe..ddad0b782bcb23d0a2994168942a98306cfa7524 100644
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
@@ -10,7 +10,50 @@
?>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
+
+<style>
+.bold, .bold TD, .bold TH, .bold TR
+{
+font-weight:bold;
+}
+.numeric, .numeric TD
+{
+text-align:right;
+padding-right:2em;
+}
+.normaltable, .normaltable TD, .normaltable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:White;
+}
+.errorltable, .errortable TD, .errortable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Red;
+font-weight:Bold;
+}
+.warningtable, .warningtable TD, .warningtable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:khaki;
+}
+.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Yellow;
+
+}
+</style>
+
+
</head>
<body>
<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
@@ -23,6 +66,8 @@
</table>
<?php
+if (file_exists("testResults"))
+{
$dir = dir("testResults");
while ($anEntry = $dir->read())
{
@@ -32,6 +77,7 @@ while ($anEntry = $dir->read())
echo "<p><a href=\"$link\">$anEntry</a></p>";
}
}
+}
?>
<table border=0 cellspacing=5 cellpadding=2 width="100%" >
@@ -40,15 +86,16 @@ while ($anEntry = $dir->read())
Test Results for <?php echo "$buildName"; ?> </font></b></td>
</tr>
</table>
-<p></p><table border="0">
-</table>
-<table width="77%" border="1">
+<table id=tableunittestdata align = "center" width="75%" border="1">
<tr>
- <td width="81%"><b>Tests Performed</b></td>
- <td width="19%"><b>Errors & Failures</b></td>
+ <td class="bold" align="center" width="70%">Test Suite</td>
+ <td class="bold" align="center" width="10%">Errors & Failures</td>
+ <td class="bold" align="center" width="10%">Total Tests</td>
+ <td class="bold" align="center" width="10%">Total Time (s)</td>
</tr>
+
%testresults%
</table>
@@ -66,23 +113,7 @@ while ($anEntry = $dir->read())
These <a href="consoleLogs.php">logs</a> contain the console output captured while
running the JUnit automated tests. <br>
<br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Plugins
- containing compile errors </font></b></td>
- </tr>
-</table>
-<table width="77%" border="1">
- <tr>
- <td><b>Compile Logs (Jar Files)</b></td>
- <td><b>Errors</b></td>
- <td><b>Warnings</b></td>
- </tr>
-
- %compilelogs%
-
-</table>
</body>
</html>
diff --git a/releng.wtpbuilder/distribution/dali.site/testManifest.xml b/releng.wtpbuilder/distribution/dali.site/testManifest.xml
deleted file mode 100644
index f12abbfb198609b3858651f9f428f2e00faeb1c0..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.site/testManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<topLevel>
- <zipTypes>
- <zipType name="dali-runtime">
- <platform
- id="DALI-RUN"
- name="All"
- fileName='<a href="dali-@build@.zip">dali-@build@.zip</a>(<a href="checksum/dali-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
-
- <zipType name="dali-tests">
- <platform
- id="DALI-TESTS"
- name="All"
- fileName='<a href="dali-Automated-Tests-@build@.zip">dali-Automated-Tests-@build@.zip</a> (<a href="checksum/dali-Automated-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
-
- </zipTypes>
-</topLevel>
diff --git a/releng.wtpbuilder/distribution/dali.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/dali.site/transformReportToHTML.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5a70cdfc87d6a563e9f508c525713a99a945345
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.site/transformReportToHTML.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ name="xsl-conversion"
+ default="main"
+ basedir=".">
+
+ <target
+ name="main"
+ description="example.bin.xml to produce example.html">
+ <xslt
+ basedir="."
+ destdir="."
+ includes="*.bin.xml"
+ scanincludeddirectories="true"
+ style="compilerXMLOutputToHTML.xsl"
+ force="true" />
+ </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index 01aecf51d1524b56c88172ea671259d8c515a3e4..f558364dcf7ed2a156865b3738e88ea8073788fd 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -1,46 +1,76 @@
<project
name="Build specific targets and properties"
- default="test">
+ default="runTest">
- <!-- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
-
+ <property
+ environment="env" />
+ <fail
+ message="testRoot must be set for this task"
+ unless="testRoot" />
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo
+ level="debug"
+ message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
+
- <!-- ===================================================================== -->
- <!-- Steps to do after the build is done. -->
- <!-- ===================================================================== -->
- <target name="test">
- <antcall target="runTest" />
+ <!--
+ Steps to do after the build is done.
+ -->
+ <target
+ name="test">
+ <dirname
+ file="${ant.file}"
+ property="currentDirectory" />
+ <ant
+ antfile="${ant.file}"
+ target="runTest"
+ dir="${currentDirectory}" />
</target>
- <!-- ===================================================================== -->
- <!-- Steps to do to test the build results -->
- <!-- ===================================================================== -->
- <target name="runTest">
-
+ <!--
+ Steps to do to test the build results
+ -->
+ <target
+ name="runTest">
<dirname
file="${ant.file}"
property="test.component.dir" />
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
- <property file="${wtp.builder.home}/build.properties" />
- <property file="${buildDirectory}/label.properties" />
+ <ant
+ antfile="${wtp.builder.home}/scripts/build/label.xml" />
<property
- name="dependencies.combined"
- value="dependencies.combined.properties" />
-
- <mkdir dir="${testRoot}" />
- <mkdir dir="${testRoot}/results" />
- <mkdir dir="${testRoot}/results/consolelogs" />
+ file="${buildDirectory}/label.properties" />
+ <property
+ file="${wtp.builder.home}/build.properties" />
+ <fail
+ message="testRoot must be set for this task"
+ unless="testRoot" />
+ <mkdir
+ dir="${testRoot}" />
+ <!-- if results already exist, delete them -->
+ <delete
+ dir="${testRoot}/results"
+ failOnError="false" />
+ <mkdir
+ dir="${testRoot}/results" />
+ <mkdir
+ dir="${testRoot}/results/consolelogs" />
+ <mkdir
+ dir="${testRoot}/results/consolelogs/metadata-logs" />
+ <mkdir
+ dir="${testRoot}/results/consolelogs/configuration-logs" />
<copy
todir="${testRoot}"
overwrite="true">
- <fileset dir="${test.component.dir}/testScripts"></fileset>
+ <fileset
+ dir="${test.component.dir}/testScripts" />
</copy>
-
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
<ant
@@ -48,100 +78,96 @@
target="get">
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENGDALI}/maps/${dependencies.combined}" />
+ value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
<property
name="base.install.dir"
value="${testRoot}" />
</ant>
-
- <antcall target="unzipTests" />
-
- <antcall target="runTestEclipse">
+ <antcall
+ target="unzipTests" />
+ <antcall
+ target="runTestEclipse">
<param
name="testTarget"
value="all" />
</antcall>
- <antcall target="postRunTestEclipse">
+ <antcall
+ target="postRunTestEclipse">
<param
name="testTarget"
value="all" />
</antcall>
-
</target>
+ <target
+ name="unzipTests">
- <target name="unzipTests">
-
- <!--unzip the builds and junit tests
- we use 'unzip' here, so we can continue on error
+ <!--unzip the builds and junit tests
+ we use 'unzip' here, so we can continue on error, if desired.
(such as if zip was not created, due to other failures or options).
-->
+ <echo
+ message="installing dali sdk" />
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
- failonerror="false">
- <arg line="-o -qq wtp-jpt-${buildLabel}.zip -d ${testRoot}" />
+ failonerror="true">
+ <arg
+ line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
-
+ <echo
+ message="installing dali tests" />
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
- failonerror="false">
+ failonerror="true">
<arg
- line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
</exec>
-
</target>
+ <!-- time out may need to be set/adjust for api or performance tests?
+ This testTimeLimit is the whole, overall limit on tests. There's a shorter
+ one for individual suites.
+
+ some common values, of milliseconds to more recognizable units:
+ 7200000: 2 hours
+ 3600000: 1 hour
+ 1800000: 30 minutes
+ 600000: 10 minutes
+ -->
<property
name="testTimeLimit"
value="7200000" />
<property
name="testFailOnError"
value="false" />
-
<target
name="runTestEclipse"
description="Run our JUnit's within an instance of antRunner">
-
-
<property
name="test-vm"
- value="${env.JAVA_5_HOME}/bin/java" />
+ value="${env.JAVA_6_HOME}/bin/java" />
<property
name="plugin-path"
- value="${testRoot}/eclipse/plugins" />
+ value="${testRoot}${dropinsFolder}/eclipse/plugins" />
<property
name="vmargs"
value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
- <!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
+ <!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
<property
name="eclipse.home"
value="${testRoot}" />
+ <echo
+ message="Running junits" />
- <echo message="Running junits" />
-
- <!-- If there is not exactly one launcher in the stack,
- we'd best fail fast, since we are not expecting that,
- and may indicate an installation that would produce unpredictable
- results -->
- <!-- requires ant 1.7, and at this point, we're running 1.6 from
- eclipse ...
-
- <condition property="expectedNumberOfLaunchers">
- <resourcecount when="equal" count="1" >
- <fileset dir="${testRoot}/eclipse/plugins">
- <include name="org.eclipse.equinox.launcher_*.jar" />
- </fileset>
- </resourcecount>
- </condition>
- <fail message="Did not find expected number of launcher jars. Check installation." unless="expectedNumberOfLaunchers" />
- -->
- <!--
+ <!--
Remember: using -debug for org.eclipse.ant.core.antRunner
produces ant debug info to be output ... which is a TON of stuff
-->
+ <echo
+ message="eclipse.launcher: ${eclipse.launcher}" />
<java
taskname="unit-test-masterprocess"
fork="true"
@@ -149,39 +175,62 @@
failonerror="false"
timeout="${testTimeLimit}"
dir="${testRoot}/eclipse"
- jvm="${env.JAVA_5_HOME}/bin/java"
+ jvm="${env.JAVA_6_HOME}/bin/java"
classname="org.eclipse.equinox.launcher.Main">
<classpath>
- <fileset dir="${testRoot}/eclipse/plugins">
- <include name="org.eclipse.equinox.launcher_*.jar" />
+ <fileset
+ dir="${testRoot}/eclipse/plugins">
+ <include
+ name="org.eclipse.equinox.launcher_*.jar" />
</fileset>
</classpath>
+ <jvmarg
+ value="-Xmx512m" />
+ <jvmarg
+ value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg
+ value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg
+ value="-Dosgi.arch=${env.BASEARCH}" />
+ <jvmarg
+ value="-Dws=${env.BASEWS}" />
+ <jvmarg
+ value="-Dos=${env.BASEOS}" />
+ <jvmarg
+ value="-Darch=${env.BASEARCH}" />
- <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
- <jvmarg value="-Dosgi.os=${env.BASEOS}" />
- <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
- <jvmarg value="-Dws=${env.BASEWS}" />
- <jvmarg value="-Dos=${env.BASEOS}" />
- <jvmarg value="-Darch=${env.BASEARCH}" />
-
- <jvmarg value="-Dnoclean=true" />
- <jvmarg value="-DbuildBranch=${buildBranch}" />
- <jvmarg value="-DbuildType=${buildType}" />
- <jvmarg value="-DbuildId=${buildId}" />
- <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Dnoclean=true" />
+ <jvmarg
+ value="-DbuildBranch=${buildBranch}" />
+ <jvmarg
+ value="-DbuildType=${buildType}" />
+ <jvmarg
+ value="-DbuildId=${buildId}" />
+ <jvmarg
+ value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
<jvmarg
value="-Dprojectname=${projectname}" />
- <arg value="-nosplash" />
- <arg value="-consolelog" />
-
- <arg value="-data" />
- <arg value="${testRoot}/overallTestWorkspace" />
- <arg value="-application" />
- <arg value="org.eclipse.ant.core.antRunner" />
- <arg value="-file" />
- <arg value="${testRoot}/test.xml" />
- <arg value="-logger" />
- <arg value="org.apache.tools.ant.DefaultLogger" />
+ <arg
+ value="-nosplash" />
+ <arg
+ value="-consolelog" />
+ <arg
+ value="-data" />
+ <arg
+ value="${testRoot}/overallTestWorkspace" />
+ <arg
+ value="-application" />
+ <arg
+ value="org.eclipse.ant.core.antRunner" />
+ <arg
+ value="-file" />
+ <arg
+ value="${testRoot}/test.xml" />
+ <arg
+ value="-logger" />
+ <arg
+ value="org.apache.tools.ant.DefaultLogger" />
<env
key="DISPLAY"
value="${env.DISPLAY}" />
@@ -216,18 +265,62 @@
key="buildLabel"
value="${buildLabel}" />
</java>
-
- <echo message="wtpmasterjunitresult ${wtpmasterjunitresult}" />
+ <echo
+ message="wtpmasterjunitresult ${wtpmasterjunitresult}" />
</target>
-
- <target name="postRunTestEclipse">
+ <target
+ name="postRunTestEclipse">
<copy
- todir="${buildDirectory}/${buildLabel}/testResults"
- overwrite="true">
- <fileset dir="${testRoot}/results">
- <include name="**/*.*" />
+ todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
+ overwrite="true"
+ failonerror="false">
+ <fileset
+ dir="${testRoot}/results">
+ <include
+ name="*output.txt" />
+ </fileset>
+ </copy>
+ <copy
+ todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
+ overwrite="true"
+ failonerror="false">
+ <fileset
+ dir="${testRoot}/results">
+ <include
+ name="*error.txt" />
+ </fileset>
+ </copy>
+ <copy
+ file="${testRoot}/results/fullOutput.txt"
+ toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
+ overwrite="true"
+ failonerror="false">
+ </copy>
+ <copy
+ file="${testRoot}/results/fullErrorLog.txt"
+ toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
+ overwrite="true"
+ failonerror="false">
+ </copy>
+ <copy
+ todir="${buildDirectory}/${buildLabel}/testResults/xml"
+ overwrite="true"
+ failonerror="false">
+ <fileset
+ dir="${testRoot}/results/xml">
+ <include
+ name="*.xml" />
+ </fileset>
+ </copy>
+ <copy
+ todir="${buildDirectory}/${buildLabel}/testResults/html"
+ overwrite="true"
+ failonerror="false">
+ <fileset
+ dir="${testRoot}/results/html">
+ <include
+ name="*.html" />
</fileset>
</copy>
</target>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml
deleted file mode 100644
index 37a9beb381650c91f6483b763ec2963b8eda9122..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<project
- default="main"
- basedir=".">
-
- <!--
- Required inputs:
-
- build.home
- buildType
- buildId
- timestamp
- build.stream [optional]
- build.committers [optional]
- testTarget [optional]
- -->
-
- <property environment="env" />
-
- <target name="main">
- <property
- file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
- <property
- name="local.cache.dir"
- value="${env.LOCAL_PREREQS_CACHE}" />
- <property
- name="testRoot"
- value="${build.home}/testRoot" />
- <delete
- dir="${testRoot}"
- failonerror="false" />
- <mkdir dir="${testRoot}" />
- <antcall target="getReleng" />
- <property
- file="${testRoot}/${env.RELENGDALI}/maps/dependencies.properties" />
- <antcall target="getDependencies" />
- <condition
- property="wtp-sdk"
- value="wtp-sdk-${buildId}.zip"
- else="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip">
- <available file="${local.cache.dir}/wtp-sdk-${buildId}.zip" />
- </condition>
- <condition
- property="wtp-wst-tests"
- value="wtp-wst-Automated-Tests-${buildId}.zip"
- else="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip">
- <available
- file="${local.cache.dir}/wtp-wst-Automated-Tests-${buildId}.zip" />
- </condition>
- <condition
- property="wtp-jst-tests"
- value="wtp-jst-Automated-Tests-${buildId}.zip"
- else="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip">
- <available
- file="${local.cache.dir}/wtp-jst-Automated-Tests-${buildId}.zip" />
- </condition>
- <antcall target="run" />
- <antcall target="upload" />
- <antcall target="clean" />
- </target>
-
- <target name="getReleng">
- <property
- name="releng.tag"
- value="v${buildType}${timestamp}" />
- <cvs
- cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
- package="${env.RELENG}"
- dest="${testRoot}"
- command="export"
- tag="${releng.tag}"
- quiet="${env.CVS_QUIET}"
- reallyquiet="${env.CVS_REALLY_QUIET}" />
- </target>
-
- <target name="getDependencies">
- <ant
- antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testdependency.xml">
- <property
- name="base.install.dir"
- value="${testRoot}" />
- <property
- name="dependencyTargets"
- value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
- </ant>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-sdk-${buildId}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-wst-Automated-Tests-${buildId}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-jst-Automated-Tests-${buildId}.zip" />
- </antcall>
- <antcall target="getAndInstallWTP">
- <param
- name="file"
- value="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip" />
- </antcall>
- </target>
-
- <target name="getAndInstallWTP">
- <available
- file="${local.cache.dir}/${file}"
- property="file.exists" />
- <antcall target="getWTP" />
- <available
- file="${local.cache.dir}/${file}"
- property="file.exists" />
- <antcall target="installWTP" />
- </target>
-
- <target name="getWTP">
- <condition
- property="file.url"
- value="http://download.eclipse.org/webtools/committers/drops/${buildType}-${buildId}-${timestamp}"
- else="http://download.eclipse.org/webtools/downloads/drops/${buildType}-${buildId}-${timestamp}">
- <isset property="build.committers" />
- </condition>
- <antcall target="getWTP2" />
- </target>
-
- <target
- name="getWTP2"
- unless="file.exists">
- <property
- name="file.url"
- value="http://download.eclipse.org/webtools/downloads/drops/${buildType}-${buildId}-${timestamp}" />
- <get
- dest="${local.cache.dir}/${file}"
- src="${file.url}/${file}"
- ignoreerrors="true" />
- </target>
-
- <target
- name="installWTP"
- if="file.exists">
- <unzip
- src="${local.cache.dir}/${file}"
- dest="${testRoot}"
- overwrite="true" />
- </target>
-
- <target name="run">
- <mkdir dir="${testRoot}/results/consolelogs" />
- <copy
- todir="${testRoot}"
- flatten="true"
- overwrite="true">
- <fileset
- dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts" />
- </copy>
- <ant
- antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
- target="runTestEclipse">
- <property
- name="testRoot"
- value="${testRoot}" />
- <property
- name="testTarget"
- value="" />
- </ant>
- <copy
- file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/templateFiles/index.php"
- todir="${testRoot}/results/index.php"
- overwrite="true" />
- </target>
-
- <target
- name="upload"
- if="login">
- <condition
- property="upload.path"
- else="~/downloads/webtools/downloads/drops/${buildType}-${buildId}-${timestamp}/testResults/${config}"
- value="~/downloads/webtools/committers/drops/${buildType}-${buildId}-${timestamp}/testResults/${config}">
- <isset property="build.committers" />
- </condition>
- <exec
- executable="ssh"
- dir="${build.home}">
- <arg
- line="${login}@download1.eclipse.org mkdir ${upload.path}" />
- </exec>
- <exec
- executable="scp"
- dir="${build.home}">
- <arg
- line="-r ./testRoot/results ${login}@download1.eclipse.org:${upload.path}" />
- </exec>
- </target>
-
- <target
- name="clean"
- if="clean">
- <delete
- dir="${testRoot}"
- failonerror="false" />
- <delete
- file="${local.cache.dir}/${wtp-sdk}"
- failonerror="false" />
- <delete
- file="${local.cache.dir}/${wtp-wst-tests}"
- failonerror="false" />
- <delete
- file="${local.cache.dir}/${wtp-jst-tests}"
- failonerror="false" />
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
index 5c2aa4bbd9bc91fc74e6b5864d05aa3319430862..8d236930b451ab42d7cf081eeaaac22ef5f94a6c 100644
--- a/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
@@ -33,19 +33,29 @@
if ($anEntry != "." && $anEntry != "..")
{
$link = "html/".$anEntry;
- echo "<tr><td><a href=\"$link\">";
- echo "$anEntry";
- echo "</a></td>";
$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
$count = 0;
$fileHandle = fopen($xml, "r");
while (!feof($fileHandle))
{
$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $count = $count + substr_count($aLine, '<error>');
+ $count = $count + substr_count($aLine, '<error');
}
fclose($fileHandle);
- echo "<td>$count</td></tr>";
+ if ($count > 0)
+ {
+ echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
+ echo "$anEntry";
+ echo "</font></b></a></td>";
+ echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
+ }
+ else
+ {
+ echo "<tr><td><a href=\"$link\">";
+ echo "$anEntry";
+ echo "</a></td>";
+ echo "<td>$count</td></tr>";
+ }
}
}
?>
@@ -62,7 +72,7 @@
</tr>
</table>
<br>
-These <a href="consolelogs/dalitestlog.txt">logs</a> contain the console output captured while
+These <a href="consolelogs/wtptestlog.txt">logs</a> contain the console output captured while
running the JUnit automated tests. <br>
<br>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/api-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/api-tests.xml
deleted file mode 100644
index 0f4fe03dc4fb081ca6474af20be7647231cc19f5..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/api-tests.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0"?>
-<project
- name="API tests"
- basedir=".">
-
- <property environment="env" />
-
- <property file="${testDir}/buildAll.properties" />
- <property file="${testDir}/build.cfg" />
-
- <property
- name="library-xml-file"
- value="${basedir}/plugins/org.eclipse.test_3.2.0/library.xml" />
- <import file="${library-xml-file}" />
-
- <target name="ui-test">
- <antcall target="runPIAgent">
- <param
- name="application"
- value="org.eclipse.test.uitestapplication" />
- </antcall>
- </target>
-
- <target name="core-test">
- <antcall target="runPIAgent">
- <param
- name="application"
- value="org.eclipse.test.coretestapplication" />
- </antcall>
- </target>
-
- <target name="init">
- <property
- name="piagentDir"
- value="${testDir}/piagent" />
- <property
- name="component.core"
- value="releng.wtptools/api/org.eclipse.wtp.releng.tools.component.core" />
- <condition property="piAgent.exists">
- <or>
- <available
- property="piAgent.dll.exists"
- file="${piagentDir}/piAgent.dll" />
- <available
- property="libpiAgent.so.exists"
- file="${piagentDir}/libpiAgent.so" />
- </or>
- </condition>
- <antcall target="init2" />
- </target>
-
- <target
- name="init2"
- unless="piAgent.exists">
- <mkdir dir="${piagentDir}" />
- <cvs
- cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
- package="${component.core}"
- dest="${piagentDir}"
- command="export"
- tag="HEAD"
- quiet="${env.CVS_QUIET}"
- reallyquiet="${env.CVS_REALLY_QUIET}" />
- <mkdir dir="${piagentDir}/${component.core}/bin" />
- <javac
- srcdir="${piagentDir}/${component.core}/src"
- destdir="${piagentDir}/${component.core}/bin"
- fork="true">
- <classpath>
- <fileset dir="${baseLocation}/plugins">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- </javac>
- <condition
- property="piAgentURL"
- value="${piAgentURL.linux}">
- <equals
- arg1="${os}"
- arg2="linux" />
- </condition>
- <condition
- property="piAgentURL"
- value="${piAgentURL.win32}">
- <equals
- arg1="${os}"
- arg2="win32" />
- </condition>
- <condition
- property="piAgentFile"
- value="${piAgentFile.linux}">
- <equals
- arg1="${os}"
- arg2="linux" />
- </condition>
- <condition
- property="piAgentFile"
- value="${piAgentFile.win32}">
- <equals
- arg1="${os}"
- arg2="win32" />
- </condition>
- <condition property="os.linux">
- <equals
- arg1="${os}"
- arg2="linux" />
- </condition>
- <condition property="os.win32">
- <equals
- arg1="${os}"
- arg2="win32" />
- </condition>
- <available
- file="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}"
- property="piAgent.exists" />
- <antcall target="getPIAgent" />
- <antcall target="setupPIAgentLinux" />
- <antcall target="setupPIAgentWin32" />
- </target>
-
- <target
- name="getPIAgent"
- unless="piAgent.exists">
- <get
- src="${piAgentURL}"
- dest="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}" />
- </target>
-
- <target
- name="setupPIAgentLinux"
- if="os.linux">
- <unzip
- dest="${piagentDir}"
- src="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}">
- <patternset>
- <include name="**/*.so" />
- </patternset>
- </unzip>
- <move
- todir="${piagentDir}"
- flatten="true">
- <fileset dir="${piagentDir}/lib" />
- </move>
- <copy
- file="${piagentDir}/${component.core}/apiagent/libpiAgent.so"
- tofile="${piagentDir}/libpiAgent.so"
- overwrite="true" />
- </target>
-
- <target
- name="setupPIAgentWin32"
- if="os.win32">
- <unzip
- dest="${piagentDir}"
- src="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}">
- <patternset>
- <include name="**/*.dll" />
- </patternset>
- </unzip>
- <move
- todir="${piagentDir}"
- flatten="true">
- <fileset dir="${piagentDir}/bin" />
- </move>
- <copy
- file="${piagentDir}/${component.core}/apiagent/piAgent.dll"
- tofile="${piagentDir}/piAgent.dll"
- overwrite="true" />
- </target>
-
- <target
- name="runPIAgent"
- depends="init">
- <property
- name="piagentDir"
- value="${testDir}/piagent" />
- <property
- name="component.core"
- value="releng.wtptools/api/org.eclipse.wtp.releng.tools.component.core" />
- <condition property="piAgent.exists">
- <and>
- <or>
- <available
- property="piAgent.dll.exists"
- file="${piagentDir}/piAgent.dll" />
- <available
- property="libpiAgent.so.exists"
- file="${piagentDir}/libpiAgent.so" />
- </or>
- <available
- property="buildDirectory.exists"
- file="${buildDirectory}" />
- <isset property="package.includes" />
- </and>
- </condition>
- <antcall target="runPIAgent2" />
- </target>
-
- <target
- name="runPIAgent2"
- if="piAgent.exists">
- <java
- classname="org.eclipse.wtp.releng.tools.component.piagent.PIAgentFiltersEmitter"
- fork="true"
- maxmemory="256m">
- <arg
- line="-eclipseDirs ${buildDirectory}/plugins -compXMLDirs ${buildDirectory}/plugins -outputFile ${piagentDir}/piagent_filters.txt -includes ${package.includes}" />
- <classpath>
- <pathelement path="${piagentDir}/${component.core}/bin" />
- <fileset dir="${baseLocation}/plugins">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- </java>
- <tstamp>
- <format
- property="TIMENOW"
- pattern="HHmmssSSSS" />
- </tstamp>
- <property
- name="vmargs"
- value="" />
- <property
- name="launcher"
- value="org.eclipse.core.launcher.Main" />
- <property
- name="formatter"
- value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
- <property
- name="extraVMargs"
- value="" />
- <property
- name="plugin-path"
- value="" />
- <property
- name="timeout"
- value="7200000" />
- <property file="${testDir}/eclipse/configuration/config.ini" />
- <echo message="Running ${classname}" />
- <mkdir dir="${buildDirectory}/apitools/piagentoutput" />
- <delete
- file="${buildDirectory}/apitools/piagentoutput/${classname}.trcxml"
- failonerror="false" />
- <exec
- dir="${piagentDir}"
- executable="java"
- timeout="${timeout}">
- <env
- key="LD_LIBRARY_PATH"
- value="${piagentDir}" />
- <env
- key="java.library.path"
- value="${piagentDir}" />
- <env
- key="PLUGIN_PATH"
- value="${plugin-path}" />
- <arg
- line="-cp ${testDir}/eclipse/startup.jar -XrunpiAgent:server=standalone,profile=${piagentDir}/${component.core}/apiagent/piagent_options.txt,filters=${piagentDir}/piagent_filters.txt,file=${buildDirectory}/apitools/piagentoutput/${plugin-name}-${classname}.trcxml -Xmx512M ${vmargs} ${extraVMargs} ${launcher} -application ${application} -dev bin -data ${data-dir} formatter=${formatter},${testDir}/eclipse/${classname}.xml -testPluginName ${plugin-name} -className ${classname} -os ${os} -ws ${ws} -arch ${arch} -consolelog" />
- </exec>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
similarity index 62%
rename from releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml
rename to releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
index 3bedbf3308d7f1bae161de8a61125f1632ebcc42..5108dad4eb2d699cf302373e0be848ed107baccd 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
@@ -2,39 +2,45 @@
<project
name="JUnit tests"
basedir=".">
-
- <property environment="env" />
-
- <target name="init">
- <!--
+ <property
+ environment="env" />
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo
+ level="debug"
+ message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
+
+ <target
+ name="init">
+ <!--
Parameters:
(Mandatory)
data-dir - the workspace directory for Eclipse to write its data
plugin-name - symboic name of the plugin to test
- testPlugin - directory name of plugin (with version suffix)
+ testPlugin - directory name of plugin (with version suffix)
classname - the name of the test class
(Optional - overrides defaults set in script)
extraVMargs - allows separate setting of VM args from separate caller.
timeout - overrides default test timeout value (in milliseconds).
-->
-
<property
name="junit-report-output"
value="${testRoot}/results" />
- <mkdir dir="${junit-report-output}/raw" />
+ <mkdir
+ dir="${junit-report-output}/raw" />
- <!-- if not otherwise set, be sure extraVMargs is at least empty string -->
+ <!-- if not otherwise set, be sure extraVMargs is at least empty string -->
<property
name="extraVMargs"
value="" />
- <!-- if not otherwise set, use a unique workspace name -->
+ <!-- if not otherwise set, use a unique workspace name -->
<property
name="data-dir"
value="${testRoot}/junitworkspaces/workspace-${classname}" />
-
<property
name="testRoot"
value="${testRoot}" />
@@ -46,7 +52,7 @@
value="${junit-report-output}" />
<property
name="plugin-path"
- value="${testRoot}/plugins/${testPlugin}" />
+ value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}" />
<property
name="formatter"
value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
@@ -55,13 +61,10 @@
value="${junit-report-output}/raw/${classname}.xml" />
<property
name="jvm"
- value="${env.JAVA_5_HOME}/bin/java" />
-
+ value="${env.JAVA_6_HOME}/bin/java" />
<dirname
file="${ant.file}"
property="currentDir" />
-
-
<echo
level="debug"
message="data-dir: ${data-dir}" />
@@ -83,7 +86,6 @@
<echo
level="debug"
message="testRoot: ${testRoot}" />
-
<echo
level="debug"
message="basedir: ${basedir}" />
@@ -107,11 +109,8 @@
message="buildLabel: ${buildLabel}" />
<echo
level="debug"
- message="jvm: ${env.JAVA_5_HOME}/bin/java" />
-
+ message="jvm: ${jvm}" />
</target>
-
-
<target
name="core-test"
depends="init">
@@ -127,8 +126,6 @@
value="org.eclipse.test.coretestapplication" />
</ant>
</target>
-
-
<target
name="ui-test"
depends="init">
@@ -144,11 +141,9 @@
value="org.eclipse.test.uitestapplication" />
</ant>
</target>
-
<target
name="eclipse-test"
description="Runs the specified classname as a plug-in test.">
-
<echo
level="info"
message="Running ${classname}" />
@@ -159,18 +154,18 @@
level="debug"
message="DISPLAY: ${env.DISPLAY}" />
- <!-- If there is not exactly one launcher in the stack,
+ <!-- If there is not exactly one launcher in the stack,
we'd best fail fast, since we are not expecting that,
and may indicate an installation that would produce unpredictable
results -->
- <!-- requires ant 1.7, and at this point, we're running 1.6 from
+ <!-- requires ant 1.7, and at this point, we're running 1.6 from
eclipse ...
<condition property="expectedNumberOfLaunchers">
<resourcecount when="equal" count="1" >
<fileset dir="${testRoot}/eclipse/plugins">
<include name="org.eclipse.equinox.launcher_*.jar" />
- </fileset>
+ </fileset>
</resourcecount>
</condition>
<fail message="Did not find expected number of launcher jars. Check installation." unless="expectedNumberOfLaunchers" />
@@ -182,43 +177,65 @@
failonerror="false"
timeout="${timeout}"
dir="${testRoot}/eclipse"
- jvm="${env.JAVA_5_HOME}/bin/java"
+ jvm="${jvm}"
classname="org.eclipse.equinox.launcher.Main">
<classpath>
- <fileset dir="${testRoot}/eclipse/plugins">
- <include name="org.eclipse.equinox.launcher_*.jar" />
+ <fileset
+ dir="${testRoot}/eclipse/plugins">
+ <include
+ name="org.eclipse.equinox.launcher_*.jar" />
</fileset>
</classpath>
-
- <jvmarg value="-Xmx758m" />
-
- <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
- <jvmarg value="-Dosgi.os=${env.BASEOS}" />
- <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
- <jvmarg value="-DbuildLabel=${buildLabel}" />
- <jvmarg value="-DbuildDirectory=${buildDirectory}" />
-
- <jvmarg value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
- <jvmarg value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log" />
-
- <jvmarg value="-Dwtp.autotest.noninteractive=true" />
- <jvmarg value="-DPLUGIN_PATH=${plugin-path}" />
- <jvmarg line="${extraVMargs}" />
- <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Xmx512m" />
+ <jvmarg
+ value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg
+ value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg
+ value="-Dosgi.arch=${env.BASEARCH}" />
+ <jvmarg
+ value="-DbuildLabel=${buildLabel}" />
+ <jvmarg
+ value="-DbuildDirectory=${buildDirectory}" />
+ <jvmarg
+ value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
+ <jvmarg
+ value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log" />
+ <jvmarg
+ value="-Dwtp.autotest.noninteractive=true" />
+ <jvmarg
+ value="-DPLUGIN_PATH=${plugin-path}" />
+ <jvmarg
+ line="${extraVMargs}" />
+ <jvmarg
+ value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
<jvmarg
value="-Dprojectname=${projectname}" />
- <arg value="-nosplash" />
- <arg value="-consolelog" />
- <arg value="-debug" />
- <arg value="-data" />
- <arg value="${data-dir}" />
- <arg value="-application" />
- <arg value="${application}" />
- <arg value="formatter=${formatter},${test-output}" />
- <arg value="-testPluginName" />
- <arg value="${plugin-name}" />
- <arg value="-className" />
- <arg value="${classname}" />
+ <arg
+ value="-nosplash" />
+ <arg
+ value="-consolelog" />
+ <arg
+ value="-debug" />
+ <arg
+ value="-data" />
+ <arg
+ value="${data-dir}" />
+ <arg
+ value="-application" />
+ <arg
+ value="${application}" />
+ <arg
+ value="formatter=${formatter},${test-output}" />
+ <arg
+ value="-testPluginName" />
+ <arg
+ value="${plugin-name}" />
+ <arg
+ value="-className" />
+ <arg
+ value="${classname}" />
<env
key="DISPLAY"
value="${env.DISPLAY}" />
@@ -226,58 +243,75 @@
output="${junit-report-output}/${classname}.output.txt"
error="${junit-report-output}/${classname}.error.txt" />
</java>
-
-
-
-
-
-
- <antcall target="collect-results" />
-
<echo
level="info"
message="suitejunitresult: ${suitejunitresult}" />
-
+ <antcall
+ target="summarizeFailure" />
+ <antcall
+ target="collect-results" />
</target>
-
- <target name="collect-results">
+ <target
+ name="collect-results">
<dirname
property="output-dir"
file="${test-output}" />
<basename
property="output-file-name"
file="${test-output}" />
- <mkdir dir="${junit-report-output}/xml" />
+ <mkdir
+ dir="${junit-report-output}/xml" />
<junitreport
todir="${junit-report-output}/xml"
tofile="${classname}.xml">
- <fileset dir="${output-dir}">
- <include name="${output-file-name}" />
+ <fileset
+ dir="${output-dir}">
+ <include
+ name="${output-file-name}" />
</fileset>
</junitreport>
-
- <mkdir dir="${junit-report-output}/html" />
+ <mkdir
+ dir="${junit-report-output}/html" />
<xslt
style="${testRoot}/JUNIT.XSL"
basedir="${junit-report-output}"
includes="${classname}.xml"
destdir="${junit-report-output}/html" />
-
-
<copy
file="${data-dir}/.metadata/.log"
toFile="${testRoot}/results/consolelogs/metadata-logs/${classname}.workspace.log"
overwrite="true"
failonError="false" />
- <!-- todo: this, especially, should be concat (there could be more than one, in theory) -->
+ <!-- todo: this, especially, should be concat (there could be more than one, in theory) -->
<copy
file="${testRoot}/eclipse/configuration/*.log"
toFile="${testRoot}/results/consolelogs/configuration-logs/${classname}.config.log"
overwrite="true"
failonError="false" />
-
</target>
-
-
-</project>
+ <target
+ name="collect">
+ <!-- deprecated, each test.xml uses it, and we should remove, eventually -->
+ </target>
+ <target
+ name="summarizeFailure"
+ depends="checkFailure"
+ if="doFailure">
+ <echo
+ append="true"
+ file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
+ </target>
+ <target
+ name="checkFailure">
+ <condition
+ property="doFailure">
+ <not>
+ <equals
+ arg1="${suitejunitresult}"
+ arg2="0"
+ trim="true" />
+ </not>
+ </condition>
+ </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/performance-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/performance-tests.xml
deleted file mode 100644
index d72002db92a161c34ec8a3c53eede3831d05f1bc..0000000000000000000000000000000000000000
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/performance-tests.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<project
- name="WTP Performance"
- default="default"
- basedir=".">
-
- <property
- name="library-xml-file"
- value="${basedir}/plugins/org.eclipse.test_3.2.0/library.xml" />
- <import file="${library-xml-file}" />
-
- <target name="ui-test">
- <antcall target="ui-test-normal" />
- <antcall target="ui-test-perf" />
- </target>
-
- <target name="core-test">
- <antcall target="core-test-normal" />
- <antcall target="core-test-perf" />
- </target>
-
- <target
- name="ui-test-normal"
- unless="runAsPerfApp">
- <antcall target="run">
- <param
- name="target"
- value="ui-test" />
- </antcall>
- </target>
-
- <target
- name="core-test-normal"
- unless="runAsPerfApp">
- <antcall target="run">
- <param
- name="target"
- value="core-test" />
- </antcall>
- </target>
-
- <target
- name="ui-test-perf"
- if="runAsPerfApp">
- <antcall target="run">
- <param
- name="target"
- value="eclipse-test" />
- <param
- name="application"
- value="org.eclipse.wst.common.tests.performance.uitestapplication" />
- </antcall>
- </target>
-
- <target
- name="core-test-perf"
- if="runAsPerfApp">
- <antcall target="run">
- <param
- name="target"
- value="eclipse-test" />
- <param
- name="application"
- value="org.eclipse.wst.common.tests.performance.coretestapplication" />
- </antcall>
- </target>
-
- <target name="run">
-
- <property
- name="eclipse.perf.dbloc"
- value="-Declipse.perf.dbloc=${build.home}/${perf.dbloc}" />
- <property
- name="eclipse.perf.config"
- value="-Declipse.perf.config=config=${perf.config};build=${perf.buildId};jvm=${perf.jvm}" />
- <property
- name="eclipse.perf.assertAgainst"
- value="-Declipse.perf.assertAgainst=config=${perf.ref.config};build=${perf.ref.buildId};jvm=${perf.ref.jvm}" />
- <property
- name="extraVMargs"
- value="" />
-
- <ant
- target="${target}"
- antfile="${library-xml-file}"
- dir="${basedir}">
- <property
- name="application"
- value="${application}" />
- <property
- name="data-dir"
- value="${data-dir}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="extraVMargs"
- value="${eclipse.perf.dbloc} ${eclipse.perf.config} ${eclipse.perf.assertAgainst} ${extraVMargs} -Dwtp.autotest.noninteractive=true" />
- </ant>
-
- </target>
-
- <target name="default" />
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
index 5eab83e188eccc656246502f80de34ae75482c93..3c1933db8a493ea7e480cfe9d877c04d49c5fe25 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
@@ -2,6 +2,16 @@
name="Automated Eclipse Testing"
default="all"
basedir=".">
+ <property
+ environment="env" />
+
+ <!-- required to get proper value of dropinsFolder -->
+ <property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+ <echo
+ level="debug"
+ message="keyCfgFile: ${keyCfgFile}" />
+ <property file="${keyCfgFile}" />
+
<echo
level="info"
message="starting Automated Eclipse Testing" />
@@ -14,11 +24,6 @@
<fail
message="testRoot must be set"
unless="testRoot" />
-
- <property environment="env" />
- <!--properties file containing the Dali tests plugin names and versions -->
- <property
- file="${env.LOCAL_BUILD_PROPERTIES_DIR}/daliTestPluginsVersions.properties" />
<!--properties file containing the build information-->
<property
@@ -37,48 +42,21 @@
<!-- The root of the eclipse installation -->
<property
name="eclipse-home"
- value="${testRoot}/eclipse" />
+ value="${testRoot}${dropinsFolder}/eclipse/" />
<!-- The directory that will contain the xml and html results from the tests that are run -->
<property
name="results"
value="${testRoot}/results" />
-
<target
name="init">
-<!--
<antcall
target="computePluginVersion" />
--->
<property
file="${testRoot}/test2.properties" />
</target>
-
- <target
- name="setup"
- if="clean"
- description="Reinstall the test Eclipse installation if specified by user">
- <delete
- dir="${install}" />
- <mkdir
- dir="${install}" />
- <exec
- dir="."
- executable="unzip">
- <arg
- line="-o -qq ../downloads/*.zip -d ${install}" />
- </exec>
- <exec
- dir="."
- executable="unzip">
- <arg
- line="-o -qq wtp-wst-tests-feature*.zip -d ${install}" />
- </exec>
- </target>
-
<target
name="runtests"
- depends="setup"
description="Runs ant on the test.xml for a specified plugin.">
<available
file="${eclipse-home}/plugins/${testPlugin}/test.xml"
@@ -105,7 +83,7 @@
dir="${eclipse-home}">
<property
name="library-file"
- value="${testRoot}/junit-tests.xml" />
+ value="${testRoot}/dali-junit-tests.xml" />
</ant>
<copy
file="${eclipse-home}/${report}.xml"
@@ -114,46 +92,28 @@
<antcall
target="genHtml" />
</target>
-
- <!-- Dali tests -->
- <target
- name="jpt-utility-tests"
- depends="init"
- description="Runs the org.eclipse.jpt.utility.tests test.xml">
- <echo message="Running target=runtests - testPlugin=${org.eclipse.jpt.utility.tests}" />
- <antcall
- target="runtests">
- <param
- name="testPlugin"
- value="${org.eclipse.jpt.utility.tests}" />
- <param
- name="report"
- value="org.eclipse.jpt.utility.tests" />
- </antcall>
- </target>
-
<target
- name="dali-core-tests"
- description="Runs the org.eclipse.jpt.core.tests test.xml">
- <echo message="Running target=runtests - testPlugin=${org.eclipse.jpt.core.tests}" />
+ name="dali-tests"
+ depends="init">
<antcall
target="runtests">
<param
name="testPlugin"
- value="${org.eclipse.jpt.core.tests}" />
+ value="${org.eclipse.jpt.eclipselink.core.tests}" />
<param
name="report"
- value="org.eclipse.jpt.core.tests" />
+ value="org.eclipse.jpt.eclipselink.core.tests" />
</antcall>
</target>
+
<!-- releng Tests -->
+ <!--
<target
name="releng-tests"
depends="init"
description="Runs the releng tests.">
- <antcall
- target="runtests">
+ <antcall target="runtests">
<param
name="testPlugin"
value="${org.eclipse.wtp.releng.tests}" />
@@ -162,36 +122,29 @@
value="org.eclipse.wtp.releng.tests" />
</antcall>
</target>
-
- <!-- Target: all -->
+ -->
<target
name="all"
depends="init">
<echo
level="info"
- message="Starting releng tests" />
- <antcall
- target="releng-tests" />
+ message="Starting Unit Tests" />
+ <!--
<echo
level="info"
- message="Starting JPT Unit Tests" />
- <echo
- level="info"
- message="Starting jpt-utility-tests" />
- <antcall
- target="jpt-utility-tests" />
-
+ message="Starting releng tests" />
+ <antcall target="releng-tests" />
+ -->
<echo
level="info"
- message="Starting dali-core-tests" />
+ message="Starting dali-tests" />
<antcall
- target="dali-core-tests" />
+ target="dali-tests" />
<echo
level="info"
- message="Ended JPT Unit Tests" />
+ message="Ended Unit Tests" />
</target>
-
<target
name="genHtml"
description="Generates HTML results with provided JUNIT.XSL provided"
@@ -201,7 +154,6 @@
basedir="${results}/xml"
destdir="${results}/html" />
</target>
-
<target
name="computePluginVersion"
depends="test2properties"
@@ -213,10 +165,11 @@
location="ComputePluginVersion.jar" />
</classpath>
<arg
- value="${testRoot}/eclipse/plugins" />
+ value="${eclipse-home}/plugins" />
<arg
value="${testRoot}/test2.properties" />
- <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+ <jvmarg
+ value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
</java>
</target>
<target
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index 8ec58f9bc356f279eca1f387c1390803aca2f85e..36f563bb45aa7b4d314d3bbe34313d047e27e4e6 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -6,56 +6,67 @@
local.cache.dir
dependency.properties
- This file should not be used by the main WTP build
====================================================================== -->
<project
name="test"
default="get">
-
+ <property
+ environment="env" />
+<!-- required to get proper value of dropinsFolder -->
+<property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
+<echo
+ level="debug"
+ message="keyCfgFile: ${keyCfgFile}" />
+<property file="${keyCfgFile}" />
<target name="get">
-
- <antcall target="getAndInstall">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="emf" />
</antcall>
- <antcall target="getAndInstall">
- <param
- name="groupId"
- value="emfxsd" />
- </antcall>
- <antcall target="getAndInstall">
+ <antcall target="getAndInstallDropins">
+ <param
+ name="groupId"
+ value="emfxsd" />
+ </antcall>
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="gef" />
</antcall>
- <antcall target="getAndInstall">
+
+
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
value="dtp" />
</antcall>
- <!-- This file should not be used by the main WTP build -->
- <antcall target="getAndInstall">
+ <antcall target="getAndInstallBase">
<param
name="groupId"
- value="wtp" />
+ value="eclipse" />
</antcall>
-
- <antcall target="getAndInstall">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
- value="eclipse" />
+ value="eclipseTestFramework" />
</antcall>
- <antcall target="getAndInstall">
+ <antcall target="getAndInstallDropins">
<param
name="groupId"
- value="eclipseTestFramework" />
+ value="wtp" />
+ </antcall>
+ <antcall
+ target="getAndInstallBase">
+ <param
+ name="groupId"
+ value="jpt-persistence.jar"/>
</antcall>
</target>
- <target name="getAndInstall">
+ <target name="getAndInstallBase">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
@@ -73,8 +84,30 @@
name="install.destination"
value="${base.install.dir}" />
</ant>
+ </target>
+ <target name="getAndInstallDropins">
+ <ant
+ antfile="${dependencyTargets}"
+ target="checkDependency">
+ <property
+ name="groupId"
+ value="${groupId}" />
+ </ant>
+ <ant
+ antfile="${dependencyTargets}"
+ target="installDependency">
+ <property
+ name="groupId"
+ value="${groupId}" />
+ <property
+ name="install.destination"
+ value="${base.install.dir}${dropinsFolder}" />
+ </ant>
</target>
+
+
+
</project>