Skip to content
Snippets Groups Projects
Commit 2a01c5ad authored by david_williams's avatar david_williams
Browse files

fix to use UTC in time stamps and zip file names

parent 7505f1eb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
releng.wtpbuilder/distribution/wtp.site/build.xml
+ 55
− 52
View file @ 2a01c5ad
<project name="Build specific targets and properties" default="build">
<target name="build">
<java classpath="${build.home}/${eclipse.builder}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
<jvmarg value="-Dosgi.ws=${basews}" />
<jvmarg value="-Dosgi.os=${baseos}" />
<jvmarg value="-Dosgi.arch=${basearch}" />
<jvmarg value="-Dbasews=${basews}" />
<jvmarg value="-Dbaseos=${baseos}" />
<jvmarg value="-Dbasearch=${basearch}" />
<jvmarg value="-Dbuild.home=${build.home}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-DjavacDebugInfo=on" />
<jvmarg value="-DmapVersionTag=${mapVersionTag}" />
<jvmarg value="-Dbuild.distribution=${build.distribution}" />
<jvmarg value="-DbuildDirectory=${buildDirectory}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
<arg value="-application" />
<arg value="org.eclipse.ant.core.antRunner" />
<arg value="-buildfile" />
<arg value="${ant.file}" />
<arg value="publish" />
</java>
</target>
<target name="build">
<java classpath="${build.home}/${eclipse.builder}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
<jvmarg value="-Dosgi.ws=${basews}" />
<jvmarg value="-Dosgi.os=${baseos}" />
<jvmarg value="-Dosgi.arch=${basearch}" />
<jvmarg value="-Dbasews=${basews}" />
<jvmarg value="-Dbaseos=${baseos}" />
<jvmarg value="-Dbasearch=${basearch}" />
<jvmarg value="-Dbuild.home=${build.home}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-DjavacDebugInfo=on" />
<jvmarg value="-DmapVersionTag=${mapVersionTag}" />
<jvmarg value="-Dbuild.distribution=${build.distribution}" />
<jvmarg value="-DbuildDirectory=${buildDirectory}" />
<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
<arg value="-application" />
<arg value="org.eclipse.ant.core.antRunner" />
<arg value="-buildfile" />
<arg value="${ant.file}" />
<arg value="publish" />
</java>
</target>
<!-- ===================================================================== -->
<!-- Steps to do to publish the build results -->
<!-- ===================================================================== -->
<target name="publish">
<dirname file="${ant.file}" property="component.dir" />
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
<property file="${buildDirectory}/label.properties" />
<!-- ===================================================================== -->
<!-- Steps to do to publish the build results -->
<!-- ===================================================================== -->
<target name="publish">
<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" />
<property name="indexFileName" value="index.php" />
<property name="result" value="${buildDirectory}/${buildLabel}" />
<property name="indexTemplateFilename" value="index.html.template" />
<condition property="isBuildTested" value="true">
<available file="${buildDirectory}/${buildLabel}/testResults/consolelogs/wtptestlog.txt" />
</condition>
<condition property="isBuildTested" value="false">
<not>
<available file="${buildDirectory}/${buildLabel}/testResults/consolelogs/wtptestlog.txt" />
</not>
</condition>
<condition property="isBuildTested" value="true">
<available file="${buildDirectory}/${buildLabel}/testResults/consolelogs/wtptestlog.txt" />
</condition>
<condition property="isBuildTested" value="false">
<not>
<available file="${buildDirectory}/${buildLabel}/testResults/consolelogs/wtptestlog.txt" />
</not>
</condition>
<ant antfile="${publish.xml}" dir="${component.dir}">
<property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-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%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%" />
<property name="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
<property name="isBuildTested" value="${isBuildTested}" />
<property name="indexTemplateFilename" value="${indexTemplateFilename}" />
</ant>
<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" />
<!-- Get the build map over for the results to point to. -->
<copy file="${buildDirectory}/directory.txt" tofile="${result}/directory.txt" />
</target>
<!-- Copy info for build identification -->
<copy file="${buildDirectory}/buildmachineinfo.properties" tofile="${result}/buildmachineinfo.properties" />
</target>
</project>
releng.wtpbuilder/scripts/build/label.xml
+ 23
− 6
View file @ 2a01c5ad
<project default="label" basedir=".">
<!-- Load environment variables -->
<property environment="env"/>
<!-- Capture the computer name in a cross-platform manner -->
<property name="env.COMPUTERNAME" value="${env.HOSTNAME}"/>
<target name="label">
<available file="${buildDirectory}/label.properties" property="label.properties.exists"/>
<antcall target="create.label.properties"/>
<antcall target="create.label.properties"/>
</target>
<target name="create.label.properties" unless="label.properties.exists">
<mkdir dir="${buildDirectory}" />
<tstamp/>
<property name="date" value="${DSTAMP}" />
<property name="time" value="${TSTAMP}" />
<tstamp>
<format property="date" pattern="yyyyMMdd" timezone="UTC"/>
</tstamp>
<tstamp>
<format property="time" pattern="HHmm" timezone="UTC"/>
</tstamp>
<property name="timestamp" value="${date}${time}" />
<property name="buildType" value="I" />
<property name="buildId" value="${buildType}${date}" />
<property name="buildId" value="${buildType}${timestamp}" />
<!--this naming convention used by php scripts on download server-->
<property name="buildLabel" value="${buildType}-${buildId}-${timestamp}" />
......@@ -36,6 +46,13 @@
<echo file="${buildDirectory}/label.properties" append="true" >
time=${time}
</echo>
</target>
<echo file="${buildDirectory}/buildmachineinfo.properties" append="true">
buildComputer="${env.COMPUTERNAME}"
buildOS="${env.OS}"
</echo>
</target>
</project>
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