Skip to content
Snippets Groups Projects
Commit 8f37c5e0 authored by david_williams's avatar david_williams
Browse files

various partial fixes towards improved download page

parent 193368dd
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 379 additions and 330 deletions
releng.wtpbuilder/distribution/dali.site/publish.xml
+ 0
− 3
View file @ 8f37c5e0
......@@ -52,9 +52,6 @@
<!-- Insert Build Name -->
<replace file="${result}/${indexFileName}" token="@build@" value="${buildLabel}" />
<!-- Insert Mirror Name -->
<replace file="${result}/${indexFileName}" token="@mirror@" value="${daliDownloadURL}/${buildLabel}/" />
<!-- Insert PreRequsites -->
<replace file="${result}/${indexFileName}" token="@eclipseFile@" value="${eclipse.file.linux-gtk-x86}" />
......
releng.wtpbuilder/distribution/dali.site/testManifest.xml
+ 2
− 2
View file @ 8f37c5e0
......@@ -5,7 +5,7 @@
<platform
id="DALI-RUN"
name="All"
fileName='&lt;a href="@mirror@dali-@build@.zip"&gt;dali-@build@.zip&lt;/a&gt;(&lt;a href="checksum/dali-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
fileName='&lt;a href="dali-@build@.zip"&gt;dali-@build@.zip&lt;/a&gt;(&lt;a href="checksum/dali-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
......@@ -13,7 +13,7 @@
<platform
id="DALI-TESTS"
name="All"
fileName='&lt;a href="@mirror@dali-Automated-Tests-@build@.zip"&gt;dali-Automated-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/dali-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
fileName='&lt;a href="dali-Automated-Tests-@build@.zip"&gt;dali-Automated-Tests-@build@.zip&lt;/a&gt; (&lt;a href="checksum/dali-Automated-Tests-@build@.zip.md5"&gt;md5&lt;/a&gt;) &lt;font size="2"&gt;&lt;/font&gt;'>
</platform>
</zipType>
......
releng.wtpbuilder/distribution/patches.site/publish.xml
+ 0
− 14
View file @ 8f37c5e0
......@@ -142,14 +142,6 @@
token="@build@"
value="${buildLabel}" />
<!-- Insert Mirror Name -->
<!--
<replace file="${resultingIndex}"
token="@mirror@"
value="\${downloadprefix}" />
-->
<!-- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" /> -->
<!-- Insert PreRequsites -->
<replace
......@@ -288,12 +280,6 @@
token="@build@"
value="${buildLabel}" />
<!-- Insert Mirror Name -->
<replace
file="${resultingIndex}"
token="@mirror@"
value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
<!-- Insert PreRequsites -->
<replace
......
releng.wtpbuilder/distribution/wtp.site/build.xml
+ 79
− 36
View file @ 8f37c5e0
<project name="Build specific targets and properties" default="build" basedir=".">
<project
name="Build specific targets and properties"
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
......@@ -6,26 +9,32 @@
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" />
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" />
<!-- load standard properties for production environment -->
<property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
<!-- = = = end standard properties pattern = = = -->
<!-- load standard properties for production environment -->
<property
file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
<!-- = = = end standard properties pattern = = = -->
<echo message="ant.file: ${ant.file}"/>
<echo message="ant.file: ${ant.file}" />
<target name="build">
<java jar="${eclipse.launcher}" fork="true" failonerror="true">
<java
jar="${eclipse.launcher}"
fork="true"
failonerror="true">
<jvmarg value="-Dosgi.clean=true" />
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildBranch=${buildBranch}" />
<jvmarg value="-Dbuild.pack-all-in-one=${build.pack-all-in-one}" />
<jvmarg
value="-Dbuild.pack-all-in-one=${build.pack-all-in-one}" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-DjavacDebugInfo=on" />
......@@ -47,44 +56,78 @@
<!-- Steps to do to publish the build results -->
<!-- ===================================================================== -->
<target name="publish">
<dirname file="${ant.file}" property="component.dir" />
<dirname
file="${ant.file}"
property="component.dir" />
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
<property file="${buildDirectory}/label.properties" />
<property name="publish.xml" value="${component.dir}/publish.xml" />
<property
name="publish.xml"
value="${component.dir}/publish.xml" />
<property name="indexFileName" value="index.php" />
<property name="result" value="${buildDirectory}/${buildLabel}" />
<property name="indexTemplateFilename" 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/html" />
<property
name="indexFileName"
value="index.php" />
<property
name="result"
value="${buildDirectory}/${buildLabel}" />
<property
name="indexTemplateFilename"
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/html" />
</condition>
<ant antfile="${publish.xml}" dir="${component.dir}">
<property name="dropTokenList" 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="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
<ant
antfile="${publish.xml}"
dir="${component.dir}">
<property
name="dropTokenList"
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="webtoolsDownloadURL"
value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
<property name="buildBranch" value="${buildBranch}" />
<property name="build.pack-all-in-one" value="${build.pack-all-in-one}"/>
<property
name="buildBranch"
value="${buildBranch}" />
<property
name="build.pack-all-in-one"
value="${build.pack-all-in-one}" />
<property name="isBuildTested" value="${isBuildTested}" />
<property name="indexTemplateFilename" value="${indexTemplateFilename}" />
<property
name="isBuildTested"
value="${isBuildTested}" />
<property
name="indexTemplateFilename"
value="${indexTemplateFilename}" />
</ant>
<!-- Get the build map over for the results to point to. -->
<copy file="${buildDirectory}/directory.txt" tofile="${result}/directory.txt" />
<copy
file="${buildDirectory}/directory.txt"
tofile="${result}/directory.txt" />
<!-- Copy info for build identification -->
<copy file="${buildDirectory}/buildmachineinfo.properties" tofile="${result}/buildmachineinfo.properties" />
<copy
file="${buildDirectory}/buildmachineinfo.properties"
tofile="${result}/buildmachineinfo.properties" />
<!-- final count files -->
<countBuildFiles
sourceDirectory="${buildDirectory}/${buildLabel}"
filterString=".zip,.tar.gz"
outputFile="${buildDirectory}/${buildLabel}/files.count" />
<!-- final count files -->
<countBuildFiles sourceDirectory="${buildDirectory}/${buildLabel}"
filterString=".zip,.tar.gz"
outputFile="${buildDirectory}/${buildLabel}/files.count" />
</target>
......
releng.wtpbuilder/distribution/wtp.site/publish.xml
+ 297
− 274
View file @ 8f37c5e0
This diff is collapsed.
releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
+ 1
− 1
View file @ 8f37c5e0
......@@ -72,7 +72,7 @@ if ($debugScript) {
$keytestMirrorString=$eclipseMirrorScript . "/webtools/downloads/drops/$buildBranch/$build/wtp-sdk-$build.zip";
// well known URL that is mirrored, purely for testing script
$keytestMirrorString = "http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0.1-20070926042742/wtp-sdk-R-2.0.1-20070926042742.zip";
// $keytestMirrorString = "http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0.1-20070926042742/wtp-sdk-R-2.0.1-20070926042742.zip";
//if (strpos($serverName, "eclipse.org") && isMirrored($keytestMirrorString) ) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent