clean up and prep for bug 339818
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index 8464635..ecf82b2 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -41,6 +41,11 @@
name="build"
depends="init"
if="build_distro_target_exists">
+
+ <!-- remove eclipse builder at start of every major build, so it will be reinstalled -->
+
+ <delete dir="${eclipse.builder.base.install.dir}" />
+
<property
name="buildfile"
value="${wtp.builder.home}/distribution/${build.distribution}.build/build.xml"/>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
index bf63252..796f764 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
@@ -6,9 +6,7 @@
<target
name="build"
depends="getBaseBuilder">
- <dirname
- file="${ant.file}"
- property="distribution.wtp.build.dir"/>
+
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
@@ -47,26 +45,12 @@
<!-- invoking runbuild.xml targetting getBaseBuilder -->
<target
- name="getBaseBuilder"
- if="eclipse.builder.fetch">
- <dirname
- file="${ant.file}"
- property="wtbuilder.dir"/>
- <property
- name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <echo
- level="info"
- message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+ name="getBaseBuilder">
+
<ant
- antfile="${buildTargets}"
+ antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
target="getBaseBuilder"/>
+
</target>
- <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/buildtemplates/distribution/template.site/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
index 415803f..0455f5c 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
@@ -28,9 +28,14 @@
<istrue value="${env.USE_QUIET}"/>
</condition>
<java
- jar="${eclipse.launcher}"
fork="true"
- failonerror="true">
+ failonerror="true"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg value="-Dosgi.os=${env.BASEOS}"/>
<jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index e415df4..c690940 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -177,12 +177,7 @@
expected number of launcher jars. Check installation."
unless="expectedNumberOfLaunchers" />
-->
- <!--
- Remember: using dash 'debug' for org.eclipse.ant.core.antRunner
- produces ant debug info to be output ... which is a TON of
- stuff. Even 'verbose' is a bit too much.
- -->
- <echo message="eclipse.launcher: ${eclipse.launcher}"/>
+
<condition
property="antQuietValue"
value="-quiet"
diff --git a/releng.wtpbuilder/distribution/dali.build/build.xml b/releng.wtpbuilder/distribution/dali.build/build.xml
index 78e2a66..681a1e5 100644
--- a/releng.wtpbuilder/distribution/dali.build/build.xml
+++ b/releng.wtpbuilder/distribution/dali.build/build.xml
@@ -24,9 +24,6 @@
name="build"
depends="getBaseBuilder">
- <dirname
- file="${ant.file}"
- property="distribution.wtp.build.dir"/>
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
@@ -101,19 +98,11 @@
<!-- invoking runbuild.xml targetting getBaseBuilder -->
<target
- name="getBaseBuilder"
- if="eclipse.builder.fetch">
- <dirname
- file="${ant.file}"
- property="wtbuilder.dir"/>
- <property
- name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <echo
- level="info"
- message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+ name="getBaseBuilder">
+
<ant
- antfile="${buildTargets}"
+ antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
target="getBaseBuilder"/>
+
</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 2e82295..188d4f8 100644
--- a/releng.wtpbuilder/distribution/dali.site/build.xml
+++ b/releng.wtpbuilder/distribution/dali.site/build.xml
@@ -26,9 +26,14 @@
</condition>
<target name="build">
<java
- jar="${eclipse.launcher}"
fork="true"
- failonerror="true">
+ failonerror="true"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg value="-Dosgi.os=${env.BASEOS}"/>
<jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
index 44c9c9e..461abf0 100644
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ b/releng.wtpbuilder/distribution/dali.site/publish.xml
@@ -2,20 +2,29 @@
name="Publish Build"
default="default"
basedir=".">
-
- <!-- 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>
+ <!--
+ 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"/>
-
+ <fail
+ unless="buildDirectory"
+ message="buildDirectory must be provided to publish"/>
+ <fail
+ unless="buildLabel"
+ message="buildLabel must be provided to publish"/>
+ <fail
+ unless="wtp.builder.home"
+ message="wtp.builder.home must be provided to publish"/>
+ <fail
+ unless="build.distribution"
+ message="build.distribution must be provided to publish"/>
<property
name="resultDir"
value="${buildDirectory}/${buildLabel}"/>
- <!--name of generated index page-->
+ <!--name of generated index page-->
<property
name="indexFileName"
value="index.php"/>
@@ -35,90 +44,84 @@
level="debug"
message="resultingIndex: ${resultingIndex}"/>
-
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+ <available
+ file="${dependency.properties}"
+ property="dependency.properties.exists"/>
+ <fail
+ message="dependency file not found: ${dependency.properties}"
+ unless="dependency.properties.exists"/>
+ <echo message="dependency file: ${dependency.properties}"/>
<target name="default">
+ <copy todir="${resultDir}">
+ <fileset dir="${templateDir}/templateFiles"/>
+ </copy>
+
+ <copy
+ todir="${resultDir}"
+ file="${buildDirectory}/maps/${env.RELENG}/distribution/${build.distribution}.site/prereqsToDisplay.php"/>
+
<copy
overwrite="true"
file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
tofile="${resultingIndex}"/>
+ <copy
+ overwrite="true"
+ file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/components.template.php"
+ tofile="${resultDir}/components/components.php"/>
<antcall target="countFiles"/>
<antcall target="generateCompileIndex"/>
<antcall target="generateJUnitTestsIndex"/>
<antcall target="getStaticFiles"/>
</target>
-
<target name="generateCompileIndex">
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
- <!--
- <taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
- -->
+ <available
+ file="${dependency.properties}"
+ property="dependency.properties.exists"/>
- <!--
- 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
+ <fail
+ message="dependency file not found: ${dependency.properties}"
+ unless="dependency.properties.exists"/>
-
-
- -->
- <property file="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties"/>
-
- <!-- create tables of test plugin compiles first -->
- <antcall target="generateCompileOutput">
+ <!-- create tables of test plugin compiles first -->
+ <antcall target="generateTestCompileOutput">
<param
name="outputDirectory"
value="${resultDir}/testcompilelogs"/>
</antcall>
- <!-- create table of code plugins compiles -->
- <summarizeResults
- isBuildTested="false"
- includeAll="true"
- dropTokenList="${dropTokenList}"
- xmlDirectoryName=""
- dropDirectoryName="${resultDir}"
- testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
- testResultsHtmlFileName="compileResults.php"
- hrefTestResultsTargetPath="testResults/html"
- hrefCompileLogsTargetPath="compilelogs"
- compileLogsDirectoryName="${resultDir}/compilelogs"/>
- <xslt
- basedir="${resultDir}/compilelogs"
- destdir="${resultDir}/compilelogs"
- includes="**/*.bin.xml"
- scanincludeddirectories="true"
- style="compilerXMLOutputToHTML.xsl"
- force="true"/>
+ <!-- create table of code plugins compiles -->
+ <antcall target="generateCompileOutput">
+ <param
+ name="outputDirectory"
+ value="${resultDir}/compilelogs"/>
+ </antcall>
+
<tstamp>
<format
property="TODAY"
pattern="MMMM d, yyyy"/>
</tstamp>
+ <antcall target="replaceData"/>
- <!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
- <replace
- dir="${resultDir}"
- includes="**/*.php,*.xml"
- token="@buildtype@"
- value="${buildType}"/>
-
- <antcall target="writeData"/>
-
- <!-- Update timestamp on file to permit overwrite through Ant copy task -->
+ <!--
+ Update timestamp on file to permit overwrite through Ant
+ copy task
+ -->
<touch file="${resultingIndex}"/>
+
</target>
<target
- name="generateCompileOutput"
+ name="generateTestCompileOutput"
depends="checkIfCompileLogs"
if="doCompileLogs">
<summarizeResults
@@ -132,10 +135,30 @@
hrefTestResultsTargetPath=""
hrefCompileLogsTargetPath="testcompilelogs"
compileLogsDirectoryName="${outputDirectory}"/>
+ <antcall target="compilerXMLToHTML"/>
+ </target>
+ <target
+ name="generateCompileOutput"
+ depends="checkIfCompileLogs"
+ if="doCompileLogs">
+ <summarizeResults
+ isBuildTested="false"
+ includeAll="true"
+ dropTokenList="${dropTokenList}"
+ xmlDirectoryName=""
+ dropDirectoryName="${resultDir}"
+ testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
+ testResultsHtmlFileName="compileResults.php"
+ hrefTestResultsTargetPath="testResults/html"
+ hrefCompileLogsTargetPath="compilelogs"
+ compileLogsDirectoryName="${outputDirectory}"/>
+ <antcall target="compilerXMLToHTML"/>
+ </target>
+ <target name="compilerXMLToHTML">
<xslt
basedir="${outputDirectory}"
destdir="${outputDirectory}"
- includes="**/*.bin.xml"
+ includes="**/*.xml"
scanincludeddirectories="true"
style="compilerXMLOutputToHTML.xsl"
force="true"/>
@@ -144,32 +167,44 @@
name="generateJUnitTestsIndex"
depends="checkIfTested"
if="doTests">
-
- <!--
- 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
-
-
-
+ <!--
+ 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.RELENGDALI}/maps/dependencies.properties"/>
- <!-- create table of test plugin compiles first -->
- <!-- set isBuildTested to true for the "compile only" results -->
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+ <available
+ file="${dependency.properties}"
+ property="dependency.properties.exists"/>
+ <fail
+ message="dependency file not found: ${dependency.properties}"
+ unless="dependency.properties.exists"/>
+
+ <!-- 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"
+ testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template.php"
testResultsHtmlFileName="testResults.php"
hrefTestResultsTargetPath="testResults/html"
compileLogsDirectoryName=""/>
@@ -179,28 +214,25 @@
pattern="MMMM d, yyyy"/>
</tstamp>
-
- <!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
- <replace
- dir="${resultDir}"
- includes="**/*.php,*.xml"
- token="@buildtype@"
- value="${buildType}"/>
-
- <antcall target="writeData"/>
-
- <!-- Update timestamp on file to permit overwrite through Ant copy task -->
+ <antcall target="replaceData"/>
+
+ <!--
+ 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-->
+ <!--get static files required in the buildLabel directory-->
<copy todir="${resultDir}">
<fileset dir="${templateDir}/staticDropFiles"/>
</copy>
- <!--copy buildnotes from plugin directories-->
+ <!--copy buildnotes from plugin directories-->
<mkdir dir="${resultDir}/buildnotes"/>
<copy
+ failonerror="false"
todir="${resultDir}/buildnotes"
flatten="true">
<fileset
@@ -211,59 +243,27 @@
includes="**/buildnotes_*.html"/>
</copy>
<copy
+ failonerror="false"
file="${templateDir}/staticDropFiles/logIndex.php"
tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
<copy
+ failonerror="false"
file="${templateDir}/staticDropFiles/logIndex.php"
tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
<copy
+ failonerror="false"
file="${templateDir}/staticDropFiles/logIndex.php"
tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
</target>
- <target name="repository">
-
- <!-- get our authored, tokenized site.xml file -->
- <copy
- file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
- tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
- overwrite="true"
- failonerror="true"/>
- <!-- get the ${buildDirectory}/finalPluginsVersions.properties, and
- read as properties -->
- <!-- substitute property value for tokens -->
- <replace
- file="${buildDirectory}/${buildLabel}/repository/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.jpa.feature@"
- property="org.eclipse.jpt.jpa.feature"/>
- <replacefilter
- token="@org.eclipse.jpt.jpa_sdk.feature@"
- property="org.eclipse.jpt.jpa_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.
- -->
- <countBuildFiles
- sourceDirectory="${resultDir}"
- filterString=".zip,.tar.gz"
- outputFile="${resultDir}/files.count"/>
+
+ <resourcecount property="files.count">
+ <fileset dir="${resultDir}">
+ <include name="*.zip"/>
+ </fileset>
+ </resourcecount>
+ <echo file="${resultDir}/files.count">${files.count}</echo>
</target>
@@ -283,218 +283,54 @@
<condition property="doCompileLogs">
<available file="${outputDirectory}"/>
</condition>
+ <echo message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
</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="@emfxsdFile@"
- value="${emfxsd.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdURL@"
- value="${emfxsd.url}/${emfxsd.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdBuildHome@"
- value="${emfxsd.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsd.mirror.prefixuri@"
- value="${emfxsd.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="@jstFile@"
- value="${jst.file}"/>
- <replace
- file="${resultingIndex}"
- token="@jstURL@"
- value="${jst.url}/${jst.file}"/>
- <replace
- file="${resultingIndex}"
- token="@jstBuildHome@"
- value="${jst.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@jst.mirror.prefixuri@"
- value="${jst.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}"/>
+ <target name="replaceData">
- <!-- 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
+
+ <writePropertiesAsPHP
+ propFileName="${dependency.properties}"
+ outPHPFileName="${resultDir}/dependency.properties.php"
+ buildlabel="${buildLabel}"/>
+
+
+
+ <!--
+
+ <property file="${dependency.properties}"/>
+
-->
+
<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}"/>
+ dir="${resultDir}"
+ includes="**/buildvariables.php"
+ value=""
+ propertyFile="${dependency.properties}">
+
+ <!-- general build info -->
+
+ <replacefilter
+ token="@buildtype@"
+ value="${buildType}"/>
+
+ <replacefilter
+ token="@date@"
+ value="${TODAY}"/>
+
+ <replacefilter
+ token="@build@"
+ value="${buildLabel}"/>
+
+ <replacefilter
+ token="@buildBranch@"
+ value="${buildBranch}"/>
+
+ <replacefilter
+ token="@build_distribution@"
+ value="${build.distribution}"/>
+
+ </replace>
+
</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 9d8dc8b..76325cb 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -182,12 +182,7 @@
expected number of launcher jars. Check installation."
unless="expectedNumberOfLaunchers" />
-->
- <!--
- Remember: using dash 'debug' for org.eclipse.ant.core.antRunner
- produces ant debug info to be output ... which is a TON of
- stuff. Even 'verbose' is a bit too much.
- -->
- <echo message="eclipse.launcher: ${eclipse.launcher}"/>
+
<condition
property="antQuietValue"
value="-quiet"
diff --git a/releng.wtpbuilder/distribution/jsdt.build/build.xml b/releng.wtpbuilder/distribution/jsdt.build/build.xml
index f922a95..2c6be21 100644
--- a/releng.wtpbuilder/distribution/jsdt.build/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.build/build.xml
@@ -24,9 +24,6 @@
name="build"
depends="getBaseBuilder">
- <dirname
- file="${ant.file}"
- property="distribution.wtp.build.dir"/>
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
@@ -70,20 +67,12 @@
<!-- invoking runbuild.xml targetting getBaseBuilder -->
<target
- name="getBaseBuilder"
- if="eclipse.builder.fetch">
- <dirname
- file="${ant.file}"
- property="wtbuilder.dir"/>
- <property
- name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <echo
- level="info"
- message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+ name="getBaseBuilder">
+
<ant
- antfile="${buildTargets}"
+ antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
target="getBaseBuilder"/>
+
</target>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
index 15e007b..53018db 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/build.xml
@@ -35,9 +35,14 @@
check and appropriate cleanup/finishup actions before failing -->
<java
- jar="${eclipse.launcher}"
fork="true"
- failonerror="true">
+ failonerror="true"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg value="-Dosgi.os=${env.BASEOS}"/>
<jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/publish.xml b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
index f09993f..461abf0 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
@@ -257,16 +257,13 @@
</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.
- -->
- <countBuildFiles
- sourceDirectory="${resultDir}"
- filterString=".zip,.tar.gz"
- outputFile="${resultDir}/files.count"/>
+
+ <resourcecount property="files.count">
+ <fileset dir="${resultDir}">
+ <include name="*.zip"/>
+ </fileset>
+ </resourcecount>
+ <echo file="${resultDir}/files.count">${files.count}</echo>
</target>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index 665d2c3..b9c5c80 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -305,12 +305,7 @@
expected number of launcher jars. Check installation."
unless="expectedNumberOfLaunchers" />
-->
- <!--
- Remember: using dash 'debug' for org.eclipse.ant.core.antRunner
- produces ant debug info to be output ... which is a TON of
- stuff. Even 'verbose' is a bit too much.
- -->
- <echo message="eclipse.launcher: ${eclipse.launcher}"/>
+
<condition
property="antQuietValue"
value="-quiet"
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index afb396c..c52b88c 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -24,9 +24,6 @@
name="build"
depends="getBaseBuilder">
- <dirname
- file="${ant.file}"
- property="distribution.wtp.build.dir"/>
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
@@ -97,17 +94,9 @@
<target
name="getBaseBuilder"
if="eclipse.builder.fetch">
- <dirname
- file="${ant.file}"
- property="wtbuilder.dir"/>
- <property
- name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <echo
- level="info"
- message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+
<ant
- antfile="${buildTargets}"
+ antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
target="getBaseBuilder"/>
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 15e007b..53018db 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -35,9 +35,14 @@
check and appropriate cleanup/finishup actions before failing -->
<java
- jar="${eclipse.launcher}"
fork="true"
- failonerror="true">
+ failonerror="true"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg value="-Dosgi.os=${env.BASEOS}"/>
<jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index f09993f..461abf0 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -257,16 +257,13 @@
</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.
- -->
- <countBuildFiles
- sourceDirectory="${resultDir}"
- filterString=".zip,.tar.gz"
- outputFile="${resultDir}/files.count"/>
+
+ <resourcecount property="files.count">
+ <fileset dir="${resultDir}">
+ <include name="*.zip"/>
+ </fileset>
+ </resourcecount>
+ <echo file="${resultDir}/files.count">${files.count}</echo>
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index df3369f..0b42280 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -318,12 +318,7 @@
expected number of launcher jars. Check installation."
unless="expectedNumberOfLaunchers" />
-->
- <!--
- Remember: using dash 'debug' for org.eclipse.ant.core.antRunner
- produces ant debug info to be output ... which is a TON of
- stuff. Even 'verbose' is a bit too much.
- -->
- <echo message="eclipse.launcher: ${eclipse.launcher}"/>
+
<condition
property="antQuietValue"
value="-quiet"
diff --git a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
index ed6524f..aa49836 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/perfbuild.xml
@@ -193,12 +193,7 @@
expected number of launcher jars. Check installation."
unless="expectedNumberOfLaunchers" />
-->
- <!--
- Remember: using dash 'debug' for org.eclipse.ant.core.antRunner
- produces ant debug info to be output ... which is a TON of
- stuff. Even 'verbose' is a bit too much.
- -->
- <echo message="eclipse.launcher: ${eclipse.launcher}"/>
+
<condition
property="antQuietValue"
value="-quiet"
diff --git a/releng.wtpbuilder/distribution/wtp4x.build/build.xml b/releng.wtpbuilder/distribution/wtp4x.build/build.xml
index dd66dc4..b38e35d 100644
--- a/releng.wtpbuilder/distribution/wtp4x.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.build/build.xml
@@ -24,9 +24,6 @@
name="build"
depends="getBaseBuilder">
- <dirname
- file="${ant.file}"
- property="distribution.wtp.build.dir"/>
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
@@ -96,17 +93,9 @@
<target
name="getBaseBuilder"
if="eclipse.builder.fetch">
- <dirname
- file="${ant.file}"
- property="wtbuilder.dir"/>
- <property
- name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <echo
- level="info"
- message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+
<ant
- antfile="${buildTargets}"
+ antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
target="getBaseBuilder"/>
</target>
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/build.xml b/releng.wtpbuilder/distribution/wtp4x.site/build.xml
index 43bc56d..d00193e 100644
--- a/releng.wtpbuilder/distribution/wtp4x.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.site/build.xml
@@ -35,9 +35,14 @@
<istrue value="${env.USE_QUIET}"/>
</condition>
<java
- jar="${eclipse.launcher}"
fork="true"
- failonerror="true">
+ failonerror="true"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg value="-Dosgi.os=${env.BASEOS}"/>
<jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
diff --git a/releng.wtpbuilder/distribution/wtp4x.site/publish.xml b/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
index cd2246e..461abf0 100644
--- a/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.site/publish.xml
@@ -82,9 +82,11 @@
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
+
<fail
message="dependency file not found: ${dependency.properties}"
unless="dependency.properties.exists"/>
@@ -102,6 +104,7 @@
name="outputDirectory"
value="${resultDir}/compilelogs"/>
</antcall>
+
<tstamp>
<format
property="TODAY"
@@ -115,6 +118,7 @@
copy task
-->
<touch file="${resultingIndex}"/>
+
</target>
<target
name="generateTestCompileOutput"
@@ -211,12 +215,13 @@
</tstamp>
<antcall target="replaceData"/>
-
+
<!--
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-->
@@ -252,16 +257,13 @@
</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.
- -->
- <countBuildFiles
- sourceDirectory="${resultDir}"
- filterString=".zip,.tar.gz"
- outputFile="${resultDir}/files.count"/>
+
+ <resourcecount property="files.count">
+ <fileset dir="${resultDir}">
+ <include name="*.zip"/>
+ </fileset>
+ </resourcecount>
+ <echo file="${resultDir}/files.count">${files.count}</echo>
</target>
@@ -329,5 +331,6 @@
value="${build.distribution}"/>
</replace>
+
</target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp4x.tests/build.xml b/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
index df3369f..0b42280 100644
--- a/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.tests/build.xml
@@ -318,12 +318,7 @@
expected number of launcher jars. Check installation."
unless="expectedNumberOfLaunchers" />
-->
- <!--
- Remember: using dash 'debug' for org.eclipse.ant.core.antRunner
- produces ant debug info to be output ... which is a TON of
- stuff. Even 'verbose' is a bit too much.
- -->
- <echo message="eclipse.launcher: ${eclipse.launcher}"/>
+
<condition
property="antQuietValue"
value="-quiet"
diff --git a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
index e0ece81..977a8a1 100644
--- a/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpbuildTools.build/build.xml
@@ -25,9 +25,6 @@
name="build"
depends="getBaseBuilder">
- <dirname
- file="${ant.file}"
- property="distribution.wtp.build.dir"/>
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
@@ -99,22 +96,14 @@
<echo message="compilation.problem path buildDirectory: ${buildDirectory}/plugins/*/"/>
</target>
-<!-- invoking runbuild.xml targetting getBaseBuilder -->
+ <!-- invoking runbuild.xml targetting getBaseBuilder -->
<target
- name="getBaseBuilder"
- if="eclipse.builder.fetch">
- <dirname
- file="${ant.file}"
- property="wtbuilder.dir"/>
- <property
- name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <echo
- level="info"
- message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+ name="getBaseBuilder">
+
<ant
- antfile="${buildTargets}"
+ antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
target="getBaseBuilder"/>
+
</target>
diff --git a/releng.wtpbuilder/distribution/wtpcap.build/build.xml b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
index e1be215..fa933f6 100644
--- a/releng.wtpbuilder/distribution/wtpcap.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
@@ -6,9 +6,7 @@
<target
name="build"
depends="getBaseBuilder">
- <dirname
- file="${ant.file}"
- property="distribution.wtp.build.dir"/>
+
<property
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
@@ -46,27 +44,12 @@
</target>
<!-- invoking runbuild.xml targetting getBaseBuilder -->
- <target
- name="getBaseBuilder"
- if="eclipse.builder.fetch">
- <dirname
- file="${ant.file}"
- property="wtbuilder.dir"/>
- <property
- name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <echo
- level="info"
- message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
+ <target name="getBaseBuilder">
+
<ant
- antfile="${buildTargets}"
+ antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
target="getBaseBuilder"/>
+
</target>
- <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/wtpcap.site/build.xml b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
index ee93631..dfdb2e9 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
@@ -28,9 +28,14 @@
<target name="build">
<mkdir dir="${buildDirectory}/${buildLabel}"/>
<java
- jar="${eclipse.launcher}"
fork="true"
- failonerror="true">
+ failonerror="true"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg value="-Dosgi.os=${env.BASEOS}"/>
<jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
index b4410c3..461abf0 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
@@ -43,42 +43,53 @@
<echo
level="debug"
message="resultingIndex: ${resultingIndex}"/>
+
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+ <available
+ file="${dependency.properties}"
+ property="dependency.properties.exists"/>
+ <fail
+ message="dependency file not found: ${dependency.properties}"
+ unless="dependency.properties.exists"/>
+ <echo message="dependency file: ${dependency.properties}"/>
+
<target name="default">
+ <copy todir="${resultDir}">
+ <fileset dir="${templateDir}/templateFiles"/>
+ </copy>
+
+ <copy
+ todir="${resultDir}"
+ file="${buildDirectory}/maps/${env.RELENG}/distribution/${build.distribution}.site/prereqsToDisplay.php"/>
+
<copy
overwrite="true"
file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
tofile="${resultingIndex}"/>
+ <copy
+ overwrite="true"
+ file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/components.template.php"
+ tofile="${resultDir}/components/components.php"/>
<antcall target="countFiles"/>
<antcall target="generateCompileIndex"/>
<antcall target="generateJUnitTestsIndex"/>
<antcall target="getStaticFiles"/>
</target>
<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).
- 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}/${dependencyFileLocation}"/>
+
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+
+ <available
+ file="${dependency.properties}"
+ property="dependency.properties.exists"/>
+
+ <fail
+ message="dependency file not found: ${dependency.properties}"
+ unless="dependency.properties.exists"/>
<!-- create tables of test plugin compiles first -->
<antcall target="generateTestCompileOutput">
@@ -93,26 +104,21 @@
name="outputDirectory"
value="${resultDir}/compilelogs"/>
</antcall>
+
<tstamp>
<format
property="TODAY"
pattern="MMMM d, yyyy"/>
</tstamp>
+ <antcall target="replaceData"/>
- <!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
- <replace
- dir="${resultDir}"
- includes="**/*.php,*.xml"
- token="@buildtype@"
- value="${buildType}"/>
-
- <antcall target="writeData"/>
<!--
Update timestamp on file to permit overwrite through Ant
copy task
-->
<touch file="${resultingIndex}"/>
+
</target>
<target
name="generateTestCompileOutput"
@@ -180,7 +186,16 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
- <property file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+ <available
+ file="${dependency.properties}"
+ property="dependency.properties.exists"/>
+ <fail
+ message="dependency file not found: ${dependency.properties}"
+ unless="dependency.properties.exists"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
@@ -189,7 +204,7 @@
dropTokenList="${dropTokenList}"
dropDirectoryName="${resultDir}"
xmlDirectoryName="${resultDir}/testResults/xml"
- testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
+ testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template.php"
testResultsHtmlFileName="testResults.php"
hrefTestResultsTargetPath="testResults/html"
compileLogsDirectoryName=""/>
@@ -199,20 +214,14 @@
pattern="MMMM d, yyyy"/>
</tstamp>
-
- <!-- Insert Build Type descriptor, I, S, etc. (php files have to expand to 'Integration', etc., as desired -->
- <replace
- dir="${resultDir}"
- includes="**/*.php,*.xml"
- token="@buildtype@"
- value="${buildType}"/>
-
- <antcall target="writeData"/>
+ <antcall target="replaceData"/>
+
<!--
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-->
@@ -223,6 +232,7 @@
<!--copy buildnotes from plugin directories-->
<mkdir dir="${resultDir}/buildnotes"/>
<copy
+ failonerror="false"
todir="${resultDir}/buildnotes"
flatten="true">
<fileset
@@ -233,63 +243,27 @@
includes="**/buildnotes_*.html"/>
</copy>
<copy
+ failonerror="false"
file="${templateDir}/staticDropFiles/logIndex.php"
tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
<copy
+ failonerror="false"
file="${templateDir}/staticDropFiles/logIndex.php"
tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
<copy
+ failonerror="false"
file="${templateDir}/staticDropFiles/logIndex.php"
tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
</target>
- <target name="repository">
-
- <!-- get our authored, tokenized site.xml file -->
- <copy
- file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
- tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
- overwrite="true"
- failonerror="true"/>
- <!--
- get the ${buildDirectory}/finalPluginsVersions.properties,
- and read as properties
- -->
- <!-- substitute property value for tokens -->
- <replace
- file="${buildDirectory}/${buildLabel}/repository/site.xml"
- propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
- <replacefilter
- token="@org.eclipse.wtp@"
- property="org.eclipse.wtp"/>
- <replacefilter
- token="@org.eclipse.wtp.sdk@"
- property="org.eclipse.wtp.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.jpa.feature@"
- property="org.eclipse.jpt.jpa.feature"/>
- <replacefilter
- token="@org.eclipse.jpt.jpa_sdk.feature@"
- property="org.eclipse.jpt.jpa_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.
- -->
- <countBuildFiles
- sourceDirectory="${resultDir}"
- filterString=".zip,.tar.gz"
- outputFile="${resultDir}/files.count"/>
+
+ <resourcecount property="files.count">
+ <fileset dir="${resultDir}">
+ <include name="*.zip"/>
+ </fileset>
+ </resourcecount>
+ <echo file="${resultDir}/files.count">${files.count}</echo>
</target>
@@ -309,435 +283,54 @@
<condition property="doCompileLogs">
<available file="${outputDirectory}"/>
</condition>
+ <echo message="doCompileLogs: ${doCompileLogs) outputDirectory: ${outputDirectory}"/>
</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="@eclipseplatformFile@"
- value="${eclipseplatform.file.linux-gtk-x86}"/>
- <replace
- file="${resultingIndex}"
- token="@eclipseplatformURL@"
- value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
- <replace
- file="${resultingIndex}"
- token="@eclipseplatformBuildURL@"
- value="${eclipseplatform.url}"/>
- <replace
- file="${resultingIndex}"
- token="@eclipseplatformfilelinux@"
- value="${eclipseplatform.file.linux-gtk-x86}"/>
- <replace
- file="${resultingIndex}"
- token="@eclipseplatformfilewindows@"
- value="${eclipseplatform.file.win32-win32-x86}"/>
- <replace
- file="${resultingIndex}"
- token="@eclipseplatformfilemacos@"
- value="${eclipseplatform.file.macosx-carbon-ppc}"/>
- <replace
- file="${resultingIndex}"
- token="@eclipseplatformBuildHome@"
- value="${eclipseplatform.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@eclipseplatform.mirror.prefixuri@"
- value="${eclipseplatform.mirror.prefixuri}"/>
- <replace
- file="${resultingIndex}"
- token="@eclipseplatform.fspath.prefix@"
- value="${eclipseplatform.fspath.prefix}"/>
- <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="@emfName@"
- value="${emf.name}"/>
- <replace
- file="${resultingIndex}"
- token="@emfDescription@"
- value="${emf.description}"/>
- <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="@emfsourceURL@"
- value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfsourceFile@"
- value="${emfsourcedoc.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfsourceName@"
- value="${emfsourcedoc.name}"/>
- <replace
- file="${resultingIndex}"
- token="@emfsourceDescription@"
- value="${emfsourcedoc.description}"/>
- <replace
- file="${resultingIndex}"
- token="@emfsourceBuildHome@"
- value="${emfsourcedoc.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@emfsource.mirror.prefixuri@"
- value="${emfsourcedoc.mirror.prefixuri}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdsourceURL@"
- value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdsourceFile@"
- value="${emfxsdsourcedoc.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdsourceName@"
- value="${emfxsdsourcedoc.name}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdsourceDescription@"
- value="${emfxsdsourcedoc.description}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdsourceBuildHome@"
- value="${emfxsdsourcedoc.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdsource.mirror.prefixuri@"
- value="${emfxsdsourcedoc.mirror.prefixuri}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdFile@"
- value="${emfxsd.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdName@"
- value="${emfxsd.name}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdDescription@"
- value="${emfxsd.description}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdURL@"
- value="${emfxsd.url}/${emfxsd.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsdBuildHome@"
- value="${emfxsd.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@emfxsd.mirror.prefixuri@"
- value="${emfxsd.mirror.prefixuri}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationFile@"
- value="${emfvalidation.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationURL@"
- value="${emfvalidation.url}/${emfvalidation.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationBuildHome@"
- value="${emfvalidation.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidation.mirror.prefixuri@"
- value="${emfvalidation.mirror.prefixuri}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationName@"
- value="${emfvalidation.name}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationDescription@"
- value="${emfvalidation.description}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationsourceFile@"
- value="${emfvalidationsourcedoc.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationsourceURL@"
- value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationsourceBuildHome@"
- value="${emfvalidationsourcedoc.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationsource.mirror.prefixuri@"
- value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationsourceName@"
- value="${emfvalidationsourcedoc.name}"/>
- <replace
- file="${resultingIndex}"
- token="@emfvalidationsourceDescription@"
- value="${emfvalidationsourcedoc.description}"/>
- <replace
- file="${resultingIndex}"
- token="@wstName@"
- value="${wst.name}"/>
- <replace
- file="${resultingIndex}"
- token="@wstDescription@"
- value="${wst.description}"/>
- <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="@jstName@"
- value="${jst.name}"/>
- <replace
- file="${resultingIndex}"
- token="@jstDescription@"
- value="${jst.description}"/>
- <replace
- file="${resultingIndex}"
- token="@jstFile@"
- value="${jst.file}"/>
- <replace
- file="${resultingIndex}"
- token="@jstURL@"
- value="${jst.url}/${jst.file}"/>
- <replace
- file="${resultingIndex}"
- token="@jstBuildHome@"
- value="${jst.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@jst.mirror.prefixuri@"
- value="${jst.mirror.prefixuri}"/>
- <replace
- file="${resultingIndex}"
- token="@wtpName@"
- value="${wtp.name}"/>
- <replace
- file="${resultingIndex}"
- token="@wtpDescription@"
- value="${wtp.description}"/>
- <replace
- file="${resultingIndex}"
- token="@wtpFile@"
- value="${wtp.file}"/>
- <replace
- file="${resultingIndex}"
- token="@wtpURL@"
- value="${wtp.url}/${wtp.file}"/>
- <replace
- file="${resultingIndex}"
- token="@wtpBuildHome@"
- value="${wtp.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@wtp.mirror.prefixuri@"
- value="${wtp.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="@gefName@"
- value="${gef.name}"/>
- <replace
- file="${resultingIndex}"
- token="@gefDescription@"
- value="${gef.description}"/>
- <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}"/>
+ <target name="replaceData">
- <!-- no longer used. Post 1.5.5 -->
+
+ <writePropertiesAsPHP
+ propFileName="${dependency.properties}"
+ outPHPFileName="${resultDir}/dependency.properties.php"
+ buildlabel="${buildLabel}"/>
+
+
+
+ <!--
+
+ <property file="${dependency.properties}"/>
+
+ -->
+
<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}"/>
- <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}"/>
- <replace
- file="${resultingIndex}"
- token="@dtpName@"
- value="${dtp.name}"/>
- <replace
- file="${resultingIndex}"
- token="@dtpDescription@"
- value="${dtp.description}"/>
- <replace
- file="${resultingIndex}"
- token="@dltkFile@"
- value="${dltk.file}"/>
- <replace
- file="${resultingIndex}"
- token="@dltkURL@"
- value="${dltk.url}/${dltk.file}"/>
- <replace
- file="${resultingIndex}"
- token="@dltkBuildHome@"
- value="${dltk.build.home}"/>
- <replace
- file="${resultingIndex}"
- token="@dltk.mirror.prefixuri@"
- value="${dltk.mirror.prefixuri}"/>
- <replace
- file="${resultingIndex}"
- token="@dltkName@"
- value="${dltk.name}"/>
- <replace
- file="${resultingIndex}"
- token="@dltkDescription@"
- value="${dltk.description}"/>
+ dir="${resultDir}"
+ includes="**/buildvariables.php"
+ value=""
+ propertyFile="${dependency.properties}">
+
+ <!-- general build info -->
+
+ <replacefilter
+ token="@buildtype@"
+ value="${buildType}"/>
+
+ <replacefilter
+ token="@date@"
+ value="${TODAY}"/>
+
+ <replacefilter
+ token="@build@"
+ value="${buildLabel}"/>
+
+ <replacefilter
+ token="@buildBranch@"
+ value="${buildBranch}"/>
+
+ <replacefilter
+ token="@build_distribution@"
+ value="${build.distribution}"/>
+
+ </replace>
+
</target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/runAntRunner.xml b/releng.wtpbuilder/scripts/build/runAntRunner.xml
index c692bfb..682bf25 100644
--- a/releng.wtpbuilder/scripts/build/runAntRunner.xml
+++ b/releng.wtpbuilder/scripts/build/runAntRunner.xml
@@ -43,12 +43,7 @@
<fail
unless="builderVersion"
message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
- <fail
- unless="eclipse.builder.version"
- message="Could not get eclipse.builder.version. Perhaps an old format build.cfg?"/>
- <property
- name="basebuilder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
+
<property
name="failOnError"
value="true"/>
@@ -74,9 +69,14 @@
</condition>
<java
taskname="AntRunner"
- jar="${eclipse.launcher}"
- fork="true"
- failonerror="${failOnError}">
+ fork="true"
+ failonerror="${failOnError}"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
<jvmarg value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplog-antrunner.log"/>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
@@ -86,8 +86,7 @@
<jvmarg value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
<jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
<jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
- <jvmarg value="-Declipse.builder.version=${eclipse.builder.version}"/>
- <jvmarg value="-Declipse.builder=${eclipse.builder}"/>
+
<jvmarg value="-Dprojectname=${projectname}"/>
<jvmarg value="-DbuildDirectory=${buildDirectory}"/>
<jvmarg value="-DbuildLabel=${buildLabel}"/>
diff --git a/releng.wtpbuilder/scripts/build/runAppRunner.xml b/releng.wtpbuilder/scripts/build/runAppRunner.xml
index 24c30a5..633bbc5 100644
--- a/releng.wtpbuilder/scripts/build/runAppRunner.xml
+++ b/releng.wtpbuilder/scripts/build/runAppRunner.xml
@@ -40,12 +40,8 @@
<fail
unless="builderVersion"
message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
- <fail
- unless="eclipse.builder.version"
- message="Could not get eclipse.builder.version. Perhaps an old format build.cfg?"/>
- <property
- name="basebuilder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
+
+
<property
name="failOnError"
value="true"/>
@@ -70,9 +66,14 @@
<mkdir dir="${buildDirectory}/${buildLabel}/buildworkspaces"/>
<java
taskname="AppRunner"
- jar="${eclipse.launcher}"
- fork="true"
- failonerror="${failOnError}">
+ fork="true"
+ failonerror="${failOnError}"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
<jvmarg value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplog-AppRunner.log"/>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
@@ -82,8 +83,7 @@
<jvmarg value="-DJAVA_6_HOME=${env.JAVA_6_HOME}"/>
<jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}"/>
<jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}"/>
- <jvmarg value="-Declipse.builder.version=${eclipse.builder.version}"/>
- <jvmarg value="-Declipse.builder=${eclipse.builder}"/>
+
<jvmarg value="-Dprojectname=${projectname}"/>
<jvmarg value="-DbuildDirectory=${buildDirectory}"/>
<jvmarg value="-DbuildLabel=${buildLabel}"/>
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index d28806b..86cec10 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -4,65 +4,11 @@
default="runbuild"
basedir=".">
- <!-- = = = standard properties pattern = = = -->
- <!--
- 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 = = = -->
- <fail
- unless="env.BUILD_HOME"
- message="all scripts need a BUILD_HOME"/>
-
- <property
- name="keyCfgFile"
- value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
- <echo
- level="debug"
- message="keyCfgFile: ${keyCfgFile}"/>
- <property file="${keyCfgFile}"/>
- <fail
- unless="builderVersion"
- message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
- <fail
- unless="eclipse.builder.version"
- message="Could not get eclipse.builder.version. Perhaps an old format build.cfg?"/>
- <property
- name="basebuilder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
- <echo
- level="info"
- message="buildDirectory: ${buildDirectory}"/>
-
- <!--
- We should not always normalize ("-repack") jars by default,
- since in production we sign the jars (which does the -repack for
- us) and not in production we don't really care so why spend the
- extra time. For jars which are not supposed to be normalized,
- such as pre-existing jars, they need to be added to the
- pack.properties file (see the updatePackProperties task). Note:
- signing does the -repack when we sign. This can be over-ridden
- by the caller setting normalize to true, but there are know
- known cases where we want to normalize (and eventually pack) the
- jar files but not sign them.
- -->
- <property
- name="normalizeJarFiles"
- value="false"/>
<!-- main -->
- <target name="runbuild">
+ <target
+ name="runbuild"
+ depends="init">
<dirname
file="${ant.file}"
property="scripts.build.dir"/>
@@ -72,7 +18,7 @@
<!-- invoke runEclipseBuild to invokde antBuidler (just in case we
are not in ant builder, already) -->
- <antcall target="runEclipseBuild"/>
+ <antcall target="runEclipseBuild"/>
<!-- fast fail, if serious problem indicated in output logs -->
<ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
@@ -116,13 +62,11 @@
<echo
level="debug"
message="component: ${component}"/>
- <echo
- level="debug"
- message="buildDirectory: ${buildDirectory}"/>
+
<echo
level="debug"
message="wtp.builder.home: ${wtp.builder.home}"/>
- <!--
+ <!--
tip from Andrew, in bug 309723
https://bugs.eclipse.org/bugs/show_bug.cgi?id=309723
Also, the property ${eclipse.pdebuild.scripts} is defined by pde.build and
@@ -131,10 +75,7 @@
instead of the more error prone manual "pde.build.scripts"
-->
<echo message="eclipse.pdebuild.scripts: ${eclipse.pdebuild.scripts}"/>
- <echo
- level="debug"
- message="buildBranch: ${buildBranch}"/>
- <fail unless="buildBranch"/>
+
<ant
antfile="build.xml"
dir="${eclipse.pdebuild.scripts}">
@@ -150,42 +91,28 @@
<property
name="dependencyTargets"
value="${wtp.builder.home}/scripts/dependency/build.xml"/>
- <property
- name="local.cache.dir"
- value="${env.LOCAL_PREREQS_CACHE}"/>
+
<property
name="baseLocation"
value="${env.PROJECT_PROJECTS}/${projectname}/eclipse"/>
<property
name="buildRoot"
value="${env.PROJECT_PROJECTS}/${projectname}"/>
- <property
- name="testRoot"
- value="${env.PROJECT_TESTS}/${projectname}"/>
</ant>
</target>
<!-- check if PDE basebuilder and WTP builder is present -->
<target
name="checkBaseBuilder"
- depends="checkWTPBaseBuilder">
+ depends="init">
<!--
we just check if both base, and our wtp specific one are
current, if either is not, we'll get them both
-->
<condition property="basebuilderlocal">
- <and>
- <available file="${pde.builder.path}"/>
- <!--
- should we check explicitly for "true" instead of
- just isset? either should work for this case, but
- which is better ant style?
- -->
- <isset property="wtpBuilderPresent"/>
- </and>
+ <available file="${pde.builder.path}"/>
</condition>
- <echo message="basebuilderlocal: ${basebuilderlocal}"/>
- <echo message="wtpBuilderPresent: ${wtpBuilderPresent}"/>
+
</target>
<!--
1)init -> set buildBranch, and create label.properties
@@ -197,42 +124,65 @@
-->
<target
name="getBaseBuilder"
- depends="init,checkBaseBuilder,touchBaseBuilder"
+ depends="init,checkBaseBuilder,installedEclipseBuilder,installEclipseBuilder,touchBaseBuilder"
+ if="eclipse.builder.fetch"
unless="basebuilderlocal">
- <!-- *** change the repo info -->
- <property
- name="builderCvsRoot"
- value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse"/>
- <!--
- note: untagged or some default version of base builder is
- not good to use. in some cases, won't run at all, in the
- best of cases, will simply be unstable, so we'll fail if we
- forgot to specify it
- -->
- <fail unless="eclipse.builder.version"/>
- <mkdir dir="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
- <cvs
- reallyquiet="${env.CVS_REALLY_QUIET}"
- cvsRoot="${builderCvsRoot}"
- package="${eclipse.builder}"
- dest="${basebuilder.path}"
- tag="${eclipse.builder.version}"/>
- <fail unless="wtpBuildTools.url"/>
- <!-- now add our WTP base builder if not there -->
- <antcall target="getWTPBaseBuilder"/>
+ <fail if="p2DirectorInstallFailed"/>
+
+ <echo message="installed eclipse builder: ${pde.builder.path}"/>
+
</target>
- <!--
+ <target
+ name="installedEclipseBuilder"
+ depends="init,checkBaseBuilder"
+ if="basebuilderlocal">
+
+ <echo message="found installed eclipse builder: ${pde.builder.path}"/>
+
+ </target>
+
+ <target
+ name="installEclipseBuilder"
+ depends="init,checkBaseBuilder"
+ unless="basebuilderlocal">
+
+ <property
+ name="dependency.properties"
+ value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${dependencyFileLocation}"/>
+ <available
+ file="${dependency.properties}"
+ property="dependency.properties.exists"/>
+ <fail
+ message="dependency file not found: ${dependency.properties}"
+ unless="dependency.properties.exists"/>
+ <property file="${dependency.properties}"/>
+ <ant
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
+ target="prereq.eclipsebuilder"/>
+
+ <ant
+ antfile="${wtp.builder.home}/scripts/dependency/dependency.xml"
+ target="prereq.wtpbuildtools"/>
+
+ <!-- remember, we install wtp tools only when eclipse builder is installed,
+ so we'll want to remove the eclipse builder at the very start of every main build,
+ to make sure all is fresh and current
+ <antcall target="getWTPBaseBuilder"/>-->
+
+ </target>
+ <!--
touch base builder when used (but not fetched), so cleanup scripts that
look for "modified time" will know it is still being used. Modified times are sometimes
used instead of access times in scripts since even ls or find will change access times
-->
<target
name="touchBaseBuilder"
+ depends="init"
if="basebuilderlocal">
<touch>
- <fileset dir="${env.BASE_BUILDERS}/${eclipse.builder.version}"/>
+ <fileset dir="${eclipse.builder.base.install.dir}"/>
</touch>
</target>
@@ -242,94 +192,122 @@
-->
<target
name="getWTPBaseBuilder"
- depends="checkWTPBaseBuilder"
- unless="wtpBuilderPresent">
- <get
- dest="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"
- src="${wtpBuildTools.url}/${wtpBuildTools.file}"
- usetimestamp="true"/>
- </target>
- <!--
- check if WTP builder exists
- org.eclipse.wtp.releng.tools_version.jar exist in basebuilder
- set wtpBuilderPresent property
- -->
- <target name="checkWTPBaseBuilder">
- <condition property="wtpBuilderPresent">
- <available file="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"/>
+ depends="init">
+
+ <java
+ taskname="p2Director Install of wtp tools"
+ fork="true"
+ resultProperty="p2DirectorInstallResult"
+ failonerror="false"
+ timeout="1800000"
+ dir="${pde.builder.path}"
+ jvm="${env.JAVA_6_HOME}/bin/java"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
+ <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
+ <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}"/>
+ <jvmarg value="-Dbuild.distribution=${build.distribution}"/>
+ <arg value="-nosplash"/>
+ <arg value="-debug"/>
+ <arg value="-consolelog"/>
+ <arg value="-data"/>
+ <arg value="${pde.builder.path}/wtptoolsp2DirectorInstall"/>
+ <jvmarg value="-Dosgi.instance.area=${pde.builder.path}/configuration"/>
+
+ <arg value="-application"/>
+ <arg value="org.eclipse.equinox.p2.director"/>
+ <arg value="-destination"/>
+ <arg value="${pde.builder.path}"/>
+
+ <arg value="-repository"/>
+ <arg value="${wtpBuildTools.repository}"/>
+ <arg value="-installIU"/>
+ <arg value="${wtpBuildTools.feature}"/>
+
+ <!-- make sure our forked env has a DISPLAY -->
+ <env
+ key="DISPLAY"
+ value="${env.DISPLAY}"/>
+ <redirector
+ output="${pde.builder.path}/fullOutputLogWTPp2Directory.txt"
+ error="${pde.builder.path}/fullErrorLogWTPp2Directory.txt"/>
+
+ </java>
+ <!-- If the task succeeds, this ouput log won't be that relevent ... (can be make better in future ... but for now we'll make a copy,
+ just in case we need it -->
+ <echo message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
+
+ <condition property="p2DirectorInstallFailed">
+ <not>
+ <equals
+ arg1="0"
+ arg2="${p2DirectorInstallResult}"/>
+ </not>
</condition>
+
</target>
+
<!-- set buildBranch, and create label.properties-->
- <target name="init">
- <condition
- property="buildBranch"
- value="R3.0.1">
- <equals
- arg1="${mapVersionTag}"
- arg2="R3_0_1_patches"/>
- </condition>
- <condition
- property="buildBranch"
- value="R3.1">
- <equals
- arg1="${mapVersionTag}"
- arg2="HEAD"/>
- </condition>
- <condition
- property="buildBranch"
- value="R3.0">
- <equals
- arg1="${mapVersionTag}"
- arg2="R3_0_maintenance"/>
- </condition>
- <condition
- property="buildBranch"
- value="R0.7">
- <equals
- arg1="${mapVersionTag}"
- arg2="R0_7_maintenance"/>
- </condition>
- <condition
- property="buildBranch"
- value="R1.0">
- <equals
- arg1="${mapVersionTag}"
- arg2="R1_0_maintenance"/>
- </condition>
- <condition
- property="buildBranch"
- value="R1.5">
- <equals
- arg1="${mapVersionTag}"
- arg2="R1_5_maintenance"/>
- </condition>
- <condition
- property="buildBranch"
- value="R1.5.5">
- <equals
- arg1="${mapVersionTag}"
- arg2="R1_5_5_patches"/>
- </condition>
- <condition
- property="buildBranch"
- value="R2.0">
- <equals
- arg1="${mapVersionTag}"
- arg2="R2_0_maintenance"/>
- </condition>
- <condition
- property="buildBranch"
- value="R2.0.2">
- <equals
- arg1="${mapVersionTag}"
- arg2="R2_0_2_patches"/>
- </condition>
- <!-- if not set above, assume R3.0 -->
- <!-- this happens, for example, when using a "tempTest" branch -->
+ <target
+ name="init"
+ unless="runBuildInitialized">
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ 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 = = = -->
+ <fail
+ unless="env.BUILD_HOME"
+ message="all scripts need a BUILD_HOME"/>
+
<property
- name="buildBranch"
- value="R3.1"/>
+ name="keyCfgFile"
+ value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+ <echo
+ level="debug"
+ message="keyCfgFile: ${keyCfgFile}"/>
+ <property file="${keyCfgFile}"/>
+ <fail
+ unless="builderVersion"
+ message="Could not get builderVersion. Probably could not checkout build.cfg?"/>
+
+ <echo
+ level="info"
+ message="buildDirectory: ${buildDirectory}"/>
+
+ <!--
+ We should not always normalize ("-repack") jars by default,
+ since in production we sign the jars (which does the -repack for
+ us) and not in production we don't really care so why spend the
+ extra time. For jars which are not supposed to be normalized,
+ such as pre-existing jars, they need to be added to the
+ pack.properties file (see the updatePackProperties task). Note:
+ signing does the -repack when we sign. This can be over-ridden
+ by the caller setting normalize to true, but there are know
+ known cases where we want to normalize (and eventually pack) the
+ jar files but not sign them.
+ -->
+ <property
+ name="normalizeJarFiles"
+ value="false"/>
+
<!--
strip trailing blanks. Seems either Eclipse, or CVS make it
hard to not have trailing spaces
@@ -341,7 +319,9 @@
replace=""/>
<property file="${wtp.builder.home}/build.properties"/>
<ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
+
<property file="${buildDirectory}/label.properties"/>
+
<!--
fetch the HEAD stream of all projects if build type
specified as N
@@ -363,11 +343,22 @@
file="${wtp.builder.home}/components/${component}"
type="dir"/>
</condition>
+
+ <property
+ name="local.cache.dir"
+ value="${env.LOCAL_PREREQS_CACHE}"/>
+
+ <!-- this should only be set here ... the purpose is we install only once per build session -->
+ <property
+ name="runBuildInitialized"
+ value="true"/>
+
</target>
<target
name="runEclipseBuild"
+ depends="init"
if="buildId">
- <fail unless="eclipse.builder.version"/>
+
<fail
message="dependency.properties must be specified by distribution script"
unless="dependency.properties"/>
@@ -411,9 +402,11 @@
<echo message="JavaSE-1.6=${JavaSE-1.6}"/>
<echo message="J2SE-1.5=${J2SE-1.5}"/>
<echo message="J2SE-1.4=${J2SE-1.4}"/>
+ <!--
<mkdir dir="${buildDirectory}/${buildLabel}"/>
<mkdir dir="${buildDirectory}/${buildLabel}/buildworkspaces"/>
- <!--
+ -->
+ <!--
TODO: should we capture exit code in resultproperty (javaEclipseBuildResult)
and (eventually) take some 'fail' action ... after saving logs, etc.? ...
but where?
@@ -426,12 +419,15 @@
</condition>
<java
taskname="build-${build.distribution}-${component}"
- jar="${eclipse.launcher}"
+ classname="org.eclipse.equinox.launcher.Main"
fork="true"
failonerror="false"
resultproperty="javaResult">
- <jvmarg value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
- <jvmarg value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromcodebuild.log"/>
+ <classpath>
+ <fileset dir="${pde.builder.path}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar"/>
+ </fileset>
+ </classpath>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg value="-Dosgi.os=${env.BASEOS}"/>
<jvmarg value="-Dosgi.arch=${env.BASEARCH}"/>
@@ -448,8 +444,7 @@
<jvmarg value="-DbuildId=${buildId}"/>
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
- <jvmarg value="-Declipse.builder.version=${eclipse.builder.version}"/>
- <jvmarg value="-Declipse.builder=${eclipse.builder}"/>
+
<jvmarg value="-Dprojectname=${projectname}"/>
<jvmarg value="-DbuildLabel=${buildLabel}"/>
<jvmarg value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}"/>
diff --git a/releng.wtpbuilder/scripts/dependency/dependency.xml b/releng.wtpbuilder/scripts/dependency/dependency.xml
index 10c6202..36536ca 100644
--- a/releng.wtpbuilder/scripts/dependency/dependency.xml
+++ b/releng.wtpbuilder/scripts/dependency/dependency.xml
@@ -25,6 +25,10 @@
</condition>
</fail>
<property file="${keyCfgFile}"/>
+
+ <property
+ name="dependencyTargets"
+ value="${wtp.builder.home}/scripts/dependency/build.xml"/>
<target name="get">
<property
@@ -47,19 +51,13 @@
<property file="${dependency.properties}"/>
<property file="${tobeinstalled.properties}"/>
- <property
- name="pde.builder.path"
- value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}"/>
- <echo
- level="debug"
- message="pde.builder.path: ${pde.builder.path}"/>
- <echo
- level="debug"
- message="eclipse.builder.version: ${eclipse.builder.version}"/>
- <echo
- level="debug"
- message="eclipse.builder: ${eclipse.builder}"/>
+ <echo message="pde.builder.path: ${pde.builder.path}"/>
+ <echo message="eclipsebuilder.id: ${eclipsebuilder.id}"/>
+
+ <property
+ name="dependencyTargets"
+ value="${wtp.builder.home}/scripts/dependency/build.xml"/>
<echo message="dependencyTargets: ${dependencyTargets}"/>
<echo message="base.install.dir: ${base.install.dir}"/>
<echo message="tobeinstalled.properties: ${tobeinstalled.properties}"/>
@@ -86,6 +84,34 @@
<antcall target="prereq.wtpandtests"/>
</target>
+<!-- Note: this target is called from "install base buider" routines, not "install prereqs" like most targets here -->
+ <target name="prereq.eclipsebuilder">
+ <echo message="eclipse builder installing to: ${eclipse.builder.base.install.dir}"/>
+ <mkdir dir="${eclipse.builder.base.install.dir}"/>
+ <antcall target="getAndInstall">
+ <param
+ name="groupId"
+ value="eclipsebuilder"/>
+ <param
+ name="base.install.dir"
+ value="${eclipse.builder.base.install.dir}"/>
+ </antcall>
+ </target>
+ <!-- Note: this target is called from "install base buider" routines, not "install prereqs" like most targets here -->
+ <target name="prereq.wtpbuildtools">
+ <echo message="wtp build tools installing to: ${pde.builder.path}"/>
+ <!-- TODO could check if ${eclipse.builder.base.install.dir} exists, since would be error if not -->
+
+ <antcall target="getAndInstallRepo">
+ <param
+ name="groupId"
+ value="wtpBuildTools"/>
+ <param
+ name="base.install.dir"
+ value="${eclipse.builder.base.install.dir}"/>
+ </antcall>
+ </target>
+
<target
name="prereq.eclipse"
if="getprereq.eclipse">
diff --git a/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR32.txt b/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR32.txt
index eb377bc..65063bf 100644
--- a/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR32.txt
+++ b/releng.wtpbuilder/smokeTestTemplates/smoketestRequestTemplateR32.txt
@@ -1,18 +1,17 @@
-
Smoke Test Request for WTP 3.2.4 M-build towards WTP 3.2.4
Please document your Project's testing and approval of this build,
-by Friday, 12 noon (Eastern Time) (at the latest),
+by Thursday, 2:00 PM (Eastern Time) (at the latest),
or let us know if that's not possible.
-As discussed in status meeting, we will be rebuilding to pick up the
-fix for the compile error in a unit test, but the code itself should
-should still be testable for smoke testing. But, I did cancel its
-unit tests, so the rebuild could get started.
-ETA approximately 10 pm Eastern.
+The unit tests are still running, but suspect they'll finish within a few hours.
+
+Remember there will be no I-build to smoke test or declare this week, since we just delivered
+a milestone, and this week is milestone planning week.
Current Build
-http://build.eclipse.org/webtools/committers/wtp-R3.2.4-M/20110310145050/M-3.2.4-20110310145050/
+http://build.eclipse.org/webtools/committers/wtp-R3.2.4-M/20110317061523/M-3.2.4-20110317061523/
Smoketest Results
-http://wiki.eclipse.org/WTP_Smoke_Test_Results_R324_03102011
+http://wiki.eclipse.org/WTP_Smoke_Test_Results_R324_03172011
+