Sync maintenance with changes made in master

29 files changed, 268 insertions, 1121 deletions

diff --git a/eclipse-parent/pom.xml b/eclipse-parent/pom.xml
index cc3cef0a7..4cd68d617 100644
--- a/eclipse-parent/pom.xml
+++ b/eclipse-parent/pom.xml
@@ -29,6 +29,7 @@
     <aspectj-repo.url>http://download.eclipse.org/tools/ajdt/aspectj/update</aspectj-repo.url>
     <egit-repo.url>http://download.eclipse.org/egit/updates</egit-repo.url>
     <tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <cbi-jdt-repo.url>http://build.eclipse.org/eclipse/cbi-jdt/</cbi-jdt-repo.url>
     <cbi-jdt-version>3.9.0.v20121208-144805</cbi-jdt-version>
   </properties>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index 5f85ab071..ccea43983 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -30,6 +30,7 @@
 
   <!--
     igorf: I *guess* junit-tests is built by PDE/Build from org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests 
+    davidw: Yes. 
    -->
 
   <build>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
index 21eaa5227..d4e70d7a5 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
@@ -523,6 +523,21 @@
         </condition>
         <condition
             property="runtimeArchive"
+            value="eclipse-SDK-${buildId}-hpux-gtk-ia64.zip">
+            <and>
+                <equals
+                    arg1="${os}"
+                    arg2="hpux" />
+                <equals
+                    arg1="${ws}"
+                    arg2="gtk" />
+                <equals
+                    arg1="${arch}"
+                    arg2="ia64" />
+            </and>
+        </condition>
+        <condition
+            property="runtimeArchive"
             value="eclipse-SDK-${buildId}-hpux-gtk.zip">
             <and>
                 <equals
@@ -1350,7 +1365,8 @@
         <antcall target="uinavigator" />
         <antcall target="uiworkbenchtexteditor" />
 
-        <!-- don't run now, for 4.2, but 3.8 ok. See bug 380553. 
+        
+        <!-- don't run now, for 4.2. See bug 380553.
         <antcall target="uircp" />
         -->
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
index 1d9a77ce9..cf3b5780d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
@@ -38,42 +38,6 @@
             message="The UNIX versions of your build output will be invalid.  Windows will not preserve symbolic links and permissions on executable files." />
     </target>
 
-    <target name="setLabels">
-        <!--required-->
-        <!-- setup the label.properties file packaged in the source builds. -->
-        <!--Set this property to empty string-->
-        <property
-            name="buildType"
-            value="" />
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy" />
-            <format
-                property="TSTAMP"
-                pattern="HHmm" />
-        </tstamp>
-        <copy
-            file="label.properties.template"
-            tofile="${buildDirectory}/label.properties"
-            overwrite="true" />
-        <replace
-            file="${buildDirectory}/label.properties"
-            token="@builddate@"
-            value="${TODAY}" />
-        <replace
-            file="${buildDirectory}/label.properties"
-            token="@buildtype@"
-            value="${buildType}" />
-        <replace
-            file="${buildDirectory}/label.properties"
-            token="@ds@"
-            value="${timestamp}" />
-        <replace
-            file="${buildDirectory}/label.properties"
-            token="@buildid@"
-            value="${buildId}" />
-    </target>
 
 
     <target name="buildStandAloneSWT">
@@ -377,12 +341,13 @@
         <antcall target="configure.team.cvs.test" />
 
         <!--replace buildid in vm.properties for JVM location settings-->
+   <!-- I cant see how this is needed any longer
         <replace
             dir="${eclipse.build.configs}/sdk.tests/testConfigs"
             token="@buildid@"
             value="${buildId}"
             includes="**/vm.properties" />
-
+-->
         <antcall target="addnoperfmarker" />
 
         <parallel>
@@ -424,11 +389,12 @@
                 dir="${buildDirectory}/${buildLabel}"
                 includes="testresults/**,*.php" />
         </copy>
+        <!--
         <replace
             file="${postingDirectory}/${buildLabel}/testResults.php"
             token="@build@"
             value="${buildId}" />
-
+         -->
     </target>
 
     <!-- ===================================================================== -->
@@ -465,6 +431,7 @@
             failonerror="false" />
     </target>
 
+    <!-- cvs team should do what they need here, not builder. 
     <target
         name="configure.team.cvs.test"
         unless="test.xml.tmp"
@@ -490,7 +457,7 @@
         </replace>
         <delete file="${eclipse.build.configs}/sdk.tests/testScripts/test.xml.tmp" />
     </target>
-
+-->
     <target name="generateEclipseIndex">
         <condition
             property="generatorClass"
@@ -545,95 +512,6 @@
                 value="${publishingContent}/testManifest.xml" />
         </ant>
 
-        <!--  Replace build label in generated html files -->
-        <replace
-            dir="${postingDirectory}/${buildLabel}"
-            token="@buildlabel@"
-            value="${buildLabel}"
-            includes="**/*.php" />
-         <replace
-             dir="${postingDirectory}/${buildId}"
-             token="@eclipseStream@"
-             value="${eclipseStream}"
-             includes="**/*.php" />
-
-    </target>
-
-    <target name="generatePerformanceResults">
-        <mkdir dir="${buildDirectory}/${buildLabel}/performance" />
-        <mkdir dir="${postingDirectory}/${buildLabel}/performance" />
-        <taskdef
-            name="performanceResults"
-            classname="org.eclipse.releng.performance.PerformanceResultHtmlGenerator" />
-        <condition
-            property="configArgs"
-            value="-ws gtk -arch ppc">
-            <equals
-                arg1="${os.arch}"
-                arg2="ppc64" />
-        </condition>
-        <condition
-            property="configArgs"
-            value="-ws gtk -arch x86">
-            <equals
-                arg1="${os.arch}"
-                arg2="i386" />
-        </condition>
-        <property
-            name="configArgs"
-            value="" />
-
-        <java
-            jar="${basedir}/../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar"
-            fork="true"
-            maxmemory="512m"
-            error="${buildlogs}/perfgenerror.txt"
-            output="${buildlogs}/perfgenoutput.txt">
-            <arg
-                line="${configArgs} -consolelog -nosplash -data ${buildDirectory}/perf-workspace -application org.eclipse.test.performance.ui.resultGenerator
-                        -current ${buildId}
-                        -jvm ${eclipse.perf.jvm}
-                        -print                  
-                        -output ${postingDirectory}/${buildLabel}/performance/
-                        -config eplnx1,eplnx2,epwin2,epwin3
-                        -dataDir ${postingDirectory}/../../data/v38
-                        -config.properties ${eclipse.perf.config.descriptors}
-                        -scenario.pattern org.eclipse.%.test%" />
-            <!-- baselines arguments are no longer necessary since bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=209322 has been
-                 fixed...
-                        -baseline ${eclipse.perf.ref}
-                        -baseline.prefix R-3.4_200806172000
-            -->
-            <!-- add this argument to list above when there are milestone builds to highlight
-            -highlight.latest 3.3M1_
-            -->
-            <env
-                key="LD_LIBRARY_PATH"
-                value="${basedir}/../org.eclipse.releng.basebuilder" />
-            <sysproperty
-                key="eclipse.perf.dbloc"
-                value="${dbloc}" />
-        </java>
-
-        <performanceResults
-            xmlDirectoryName="${postingDirectory}/${buildLabel}/performance/xml"
-            dropDirectoryName="${postingDirectory}/${buildLabel}"
-            testResultsTemplateFileName="${publishingContent}/templateFiles/performance.php.template"
-            testResultsHtmlFileName="performance/performance.php"
-            hrefTestResultsTargetPath="html"
-            testManifestFileName="${publishingContent}/performanceTestManifest.xml" />
-
-        <replace
-            file="${postingDirectory}/${buildLabel}/performance/performance.php"
-            token="@buildType@"
-            value="${buildType}" />
-        <copy
-            todir="/home/users/ecperf/data/"
-            failonerror="false"
-            overwrite="true">
-            <fileset dir=" /builds/transfer/files/master/data/v38" />
-        </copy>
-
     </target>
 
     <target
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml
deleted file mode 100644
index 79a108fb1..000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml
+++ /dev/null
@@ -1,733 +0,0 @@
-<project
-    name="Helper targets"
-    default="noDefault">
-    <property
-        name="postingDirectory"
-        value="${buildDirectory}" />
-    <property
-        name="publishingContent"
-        value="${eclipse.build.configs}/../publishingFiles" />
-
-    <!-- stream specific. Kepler only is ia64. Juno is ia64_32 -->
-    <property
-        name="hpuxia64bitness"
-        value="ia64_32" />
-    
-    <!-- ===================================================================== -->
-    <!-- Set of helper targets for building the Eclipse SDK -->
-    <!-- ===================================================================== -->
-    <target name="discoverOS">
-        <condition property="onUnix">
-            <and>
-                <os family="unix" />
-            </and>
-        </condition>
-        <condition property="onWindows">
-            <and>
-                <os family="windows" />
-            </and>
-        </condition>
-    </target>
-
-    <target
-        name="printWarnings"
-        if="onWindows"
-        depends="discoverOS">
-        <echo
-            message="The UNIX versions of your build output will be invalid.  Windows will not preserve symbolic links and permissions on executable files." />
-    </target>
-
-    <target name="setLabels">
-        <!--required -->
-        <!-- setup the label.properties file packaged in the source builds. -->
-        <!--Set this property to empty string -->
-        <property
-            name="buildType"
-            value="" />
-        <tstamp>
-            <format
-                property="TODAY"
-                pattern="MMMM d, yyyy" />
-            <format
-                property="TSTAMP"
-                pattern="HHmm" />
-        </tstamp>
-        <copy
-            file="label.properties.template"
-            tofile="${buildDirectory}/label.properties"
-            overwrite="true" />
-        <replace
-            file="${buildDirectory}/label.properties"
-            token="@builddate@"
-            value="${TODAY}" />
-        <replace
-            file="${buildDirectory}/label.properties"
-            token="@buildtype@"
-            value="${buildType}" />
-        <replace
-            file="${buildDirectory}/label.properties"
-            token="@ds@"
-            value="${timestamp}" />
-        <replace
-            file="${buildDirectory}/label.properties"
-            token="@buildid@"
-            value="${buildId}" />
-    </target>
-
-
-    <target name="buildStandAloneSWT">
-        <parallel failonany="true">
-            <sequential>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="ws"
-                        value="win32" />
-                    <param
-                        name="os"
-                        value="win32" />
-                    <param
-                        name="arch"
-                        value="x86" />
-                </antcall>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="ws"
-                        value="win32" />
-                    <param
-                        name="os"
-                        value="win32" />
-                    <param
-                        name="arch"
-                        value="x86_64" />
-                </antcall>
-            </sequential>
-        </parallel>
-        <parallel failonany="true">
-            <antcall target="packageSwtStandalone">
-                <param
-                    name="os"
-                    value="aix" />
-                <param
-                    name="ws"
-                    value="gtk" />
-                <param
-                    name="arch"
-                    value="ppc" />
-            </antcall>
-            <antcall target="packageSwtStandalone">
-                <param
-                    name="os"
-                    value="aix" />
-                <param
-                    name="ws"
-                    value="gtk" />
-                <param
-                    name="arch"
-                    value="ppc64" />
-            </antcall>
-        </parallel>
-        <parallel failonany="true">
-            <sequential>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="solaris" />
-                    <param
-                        name="ws"
-                        value="gtk" />
-                    <param
-                        name="arch"
-                        value="sparc" />
-                </antcall>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="solaris" />
-                    <param
-                        name="ws"
-                        value="gtk" />
-                    <param
-                        name="arch"
-                        value="x86" />
-                </antcall>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="hpux" />
-                    <param
-                        name="ws"
-                        value="gtk" />
-                    <param
-                        name="arch"
-                        value="${hpuxia64bitness}" />
-                </antcall>
-            </sequential>
-        </parallel>
-        <parallel failonany="true">
-            <sequential>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="linux" />
-                    <param
-                        name="ws"
-                        value="gtk" />
-                    <param
-                        name="arch"
-                        value="x86" />
-                </antcall>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="macosx" />
-                    <param
-                        name="ws"
-                        value="cocoa" />
-                    <param
-                        name="arch"
-                        value="" />
-                </antcall>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="macosx" />
-                    <param
-                        name="ws"
-                        value="cocoa" />
-                    <param
-                        name="arch"
-                        value="x86_64" />
-                </antcall>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="linux" />
-                    <param
-                        name="ws"
-                        value="gtk" />
-                    <param
-                        name="arch"
-                        value="x86_64" />
-                </antcall>
-                <antcall target="packageSwtStandalone">
-                    <param
-                        name="os"
-                        value="linux" />
-                    <param
-                        name="ws"
-                        value="gtk" />
-                    <param
-                        name="arch"
-                        value="ppc64" />
-                </antcall>
-            </sequential>
-        </parallel>
-
-    </target>
-
-
-
-    <target name="packageSwtStandalone">
-        <condition
-            property="downloadFile"
-            value="swt-${buildId}-${ws}-${os}.zip">
-            <equals
-                arg1="${arch}"
-                arg2="" />
-        </condition>
-        <property
-            name="downloadFile"
-            value="swt-${buildId}-${ws}-${os}-${arch}.zip" />
-        <property
-            name="destination"
-            value="${postingDirectory}/${buildLabel}" />
-        <property
-            name="archiveFullPath"
-            value="${destination}/${downloadFile}" />
-
-        <condition
-            property="swtdir"
-            value="${buildDirectory}/plugins/org.eclipse.swt.${ws}.${os}">
-            <equals
-                arg1="${arch}"
-                arg2="" />
-        </condition>
-
-        <property
-            name="swtdir"
-            value="${buildDirectory}/plugins/org.eclipse.swt.${ws}.${os}.${arch}" />
-        <ant
-            antfile="build.xml"
-            target="swtdownload"
-            dir="${swtdir}">
-        </ant>
-    </target>
-
-
-    <target
-        name="publish"
-        description="Preparing to post the build...">
-
-        <mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
-        <exec
-            executable="sh"
-            dir="${postingDirectory}/${buildLabel}">
-            <arg line="${eclipse.build.configs}/../../extras/produceChecksum" />
-        </exec>
-
-        <!--post clickThroughs -->
-        <copy todir="${postingDirectory}/${buildLabel}">
-            <fileset
-                dir="${buildDirectory}/maps/org.eclipse.releng"
-                includes="clickThroughs/" />
-        </copy>
-
-        <!--post directory.txt -->
-        <copy
-            file="${buildDirectory}/directory.txt"
-            todir="${postingDirectory}/${buildLabel}" 
-            failonerror="false" />
-
-        <!--post instructions on automated testing -->
-        <copy
-            file="${eclipse.build.configs}/sdk.tests/testScripts/readme.html"
-            tofile="${postingDirectory}/${buildLabel}/automatedtesting.html" />
-        <copy
-            file="${buildDirectory}/plugins/org.eclipse.test/testframework.html"
-            tofile="${postingDirectory}/${buildLabel}/testframework.html" />
-
-        <antcall target="generateEclipseIndex" />
-
-        <!--get static files required in the buildLabel directory -->
-        <copy todir="${postingDirectory}/${buildLabel}">
-            <fileset dir="${publishingContent}/staticDropFiles" />
-        </copy>
-
-        <!--copy buildnotes from plugin directories -->
-        <mkdir dir="${postingDirectory}/${buildLabel}/buildnotes" />
-        <copy
-            todir="${postingDirectory}/${buildLabel}/buildnotes"
-            flatten="true">
-            <fileset
-                dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html,**/buildnotes_*.htm,**/jdt_core_style.css" />
-        </copy>
-
-        <!--copy javadoc logs -->
-        <copy
-            file="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/doc.bin.log"
-            tofile="${postingDirectory}/${buildLabel}/compilelogs/platform.doc.isv.javadoc.txt"
-            failonerror="false" />
-        <copy
-            file="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv/doc.bin.log"
-            tofile="${postingDirectory}/${buildLabel}/compilelogs/jdt.doc.isv.javadoc.txt"
-            failonerror="false" />
-        <copy
-            file="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv/jdtapt.doc.bin.log"
-            tofile="${postingDirectory}/${buildLabel}/compilelogs/jdt.apt.javadoc.txt"
-            failonerror="false" />
-        <copy
-            file="${buildDirectory}/plugins/org.eclipse.pde.doc.user/doc.bin.log"
-            tofile="${postingDirectory}/${buildLabel}/compilelogs/pde.doc.user.javadoc.txt"
-            failonerror="false" />
-        <copy
-            file="${buildDirectory}/plugins/org.eclipse.platform.doc.isv/platformconvert.txt"
-            tofile="${postingDirectory}/${buildLabel}/compilelogs/platform.doc.isv.schema.txt"
-            failonerror="false" />
-        <copy
-            file="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv/jdtconvert.txt"
-            tofile="${postingDirectory}/${buildLabel}/compilelogs/jdt.doc.isv.schema.txt"
-            failonerror="false" />
-        <copy
-            file="${buildDirectory}/plugins/org.eclipse.pde.doc.user/pdeconvert.txt"
-            tofile="${postingDirectory}/${buildLabel}/compilelogs/pde.doc.user.schema.txt"
-            failonerror="false" />
-
-    </target>
-
-
-    <!-- ===================================================================== -->
-    <!-- Target used to test the build -->
-    <!-- ===================================================================== -->
-    <target
-        name="testAll"
-        unless="skip.tests">
-        <waitfor
-            maxwait="4"
-            maxwaitunit="hour"
-            checkevery="1"
-            checkeveryunit="minute">
-            <and>
-                <available file="${postingDirectory}/${buildLabel}/checksum/eclipse-Automated-Tests-${buildId}.zip.md5" />
-                <available file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-win32.zip.md5" />
-                <available file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-linux-gtk.tar.gz.md5" />
-                <available file="${postingDirectory}/${buildLabel}/checksum/eclipse-SDK-${buildId}-macosx-cocoa.tar.gz.md5" />
-                <available file="${postingDirectory}/${buildLabel}/checksum/eclipse-${buildId}-delta-pack.zip.md5" />
-                <available file="${postingDirectory}/${buildLabel}/checksum/eclipse-platform-${buildId}-win32.zip.md5" />
-                <available file="${postingDirectory}/${buildLabel}/checksum/eclipse-platform-${buildId}-linux-gtk.tar.gz.md5" />
-                <available file="${postingDirectory}/${buildLabel}/checksum/eclipse-platform-${buildId}-macosx-cocoa.tar.gz.md5" />
-            </and>
-        </waitfor>
-
-        <condition
-            property="cvstest.properties"
-            value="/shared/eclipse/buildtests/cvstest.properties">
-            <and>
-                <equals
-                    arg1="${hudson}"
-                    arg2="true" />
-                <and>
-                    <os family="unix" />
-                    <not>
-                        <os family="mac" />
-                    </not>
-                </and>
-            </and>
-        </condition>
-        <condition
-            property="cvstest.properties"
-            value="c:\users\hudsonbuild\cvstest.properties">
-            <and>
-                <equals
-                    arg1="${hudson}"
-                    arg2="true" />
-                <os family="windows" />
-            </and>
-        </condition>
-        <condition
-            property="cvstest.properties"
-            value="/Users/hudsonbuild/cvstest.properties">
-            <and>
-                <equals
-                    arg1="${hudson}"
-                    arg2="true" />
-                <os family="mac" />
-            </and>
-        </condition>
-        <property
-            name="cvstest.properties"
-            value="${base.builder}/../eclipseInternalBuildTools/cvstest.properties" />
-        <echo message="cvstest.properties ${cvstest.properties}" />
-        <antcall target="configure.team.cvs.test" />
-
-        <!--replace buildid in vm.properties for JVM location settings -->
-        <replace
-            dir="${eclipse.build.configs}/sdk.tests/testConfigs"
-            token="@buildid@"
-            value="${buildId}"
-            includes="**/vm.properties" />
-
-        <antcall target="addnoperfmarker" />
-
-        <parallel>
-            <antcall target="test-JUnit" />
-            <antcall target="test-performance" />
-        </parallel>
-    </target>
-
-    <target
-        name="addnoperfmarker"
-        if="skip.performance.tests">
-        <mkdir dir="${postingDirectory}/${buildLabel}/noperf" />
-    </target>
-
-    <target name="test-JUnit">
-        <echo message="Starting tests." />
-        <property
-            name="dropLocation"
-            value="${postingDirectory}" />
-        <!-- <ant antfile="testAll.xml" dir="${eclipse.build.configs}/sdk.tests/testConfigs" /> -->
-        <property
-            name="testDirectory"
-            value="${buildDirectory}/tests" />
-        <property
-            name="testingDirectory"
-            value="${buildDirectory}/tests/eclipse-testing" />
-        <mkdir dir="${testDirectory}" />
-        <mkdir dir="${testingDirectory}" />
-        <echo message="testingDirectory ${testingDirectory}" />
-
-        <antcall target="generateEclipseIndex" />
-
-        <!--copy the test results and new index page to the posting location -->
-        <copy
-            todir="${postingDirectory}/${buildLabel}"
-            overwrite="true">
-            <fileset
-                dir="${buildDirectory}/${buildLabel}"
-                includes="testresults/**,*.php" />
-        </copy>
-        <replace
-            file="${postingDirectory}/${buildLabel}/testResults.php"
-            token="@build@"
-            value="${buildId}" />
-    </target>
-
-
-    <!-- ===================================================================== -->
-    <!-- Target used to test the build -->
-    <!-- ===================================================================== -->
-    <target
-        name="test-performance"
-        unless="skip.performance.tests">
-
-        <echo message="Starting performance tests." />
-        <property
-            name="dropLocation"
-            value="${postingDirectory}" />
-        <ant
-            antfile="testAll.xml"
-            dir="${eclipse.build.configs}/sdk.tests/testConfigs"
-            target="performanceTests" />
-        <antcall target="generatePerformanceResults" />
-    </target>
-
-    <!-- ===================================================================== -->
-    <!-- Helper targets -->
-    <!-- ===================================================================== -->
-    <target
-        name="mail"
-        unless="noMail">
-        <!-- helper target for sending email messages related to build. -->
-        <mail
-            mailhost="${host}"
-            from="${sender}"
-            tolist="${recipients}"
-            subject="[eclipse-build] ${buildId}: ${subject}"
-            message="${message}"
-            failonerror="false" />
-    </target>
-
-    <target
-        name="configure.team.cvs.test"
-        unless="test.xml.tmp"
-        if="cvstest.properties">
-        <copy
-            file="${eclipse.build.configs}/sdk.tests/testScripts/test.xml"
-            tofile="${eclipse.build.configs}/sdk.tests/testScripts/test.xml.tmp" />
-        <replace
-            file="${eclipse.build.configs}/sdk.tests/testScripts/test.xml"
-            propertyFile="${cvstest.properties}">
-            <replacefilter
-                token="${cvs_user}"
-                property="cvs_user" />
-            <replacefilter
-                token="${cvs_password}"
-                property="cvs_password" />
-            <replacefilter
-                token="${cvs_host}"
-                property="cvs_host" />
-            <replacefilter
-                token="${cvs_root}"
-                property="cvs_root" />
-        </replace>
-        <delete file="${eclipse.build.configs}/sdk.tests/testScripts/test.xml.tmp" />
-    </target>
-
-    <target name="generateEclipseIndex">
-        <condition
-            property="generatorClass"
-            value="org.eclipse.releng.generators.EclipseTestResultsGeneratorNoMail">
-            <equals
-                arg1="${hudson}"
-                arg2="true" />
-        </condition>
-        <property
-            name="generatorClass"
-            value="org.eclipse.releng.generators.EclipseTestResultsGenerator" />
-
-        <available
-            classname="${generatorClass}"
-            property="class"
-            value="${generatorClass}" />
-
-        <!--regenerate the index page with links to test results -->
-        <ant
-            antfile="${base.builder}/plugins/org.eclipse.build.tools/scripts/publish.xml"
-            dir="${publishingContent}"
-            target="generateIndex">
-            <property
-                name="isBuildTested"
-                value="true" />
-            <property
-                name="buildType"
-                value="${buildType}" />
-            <property
-                name="dropTokenList" 
-                value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
-            <property
-                name="platformIdentifierToken"
-                value="%platform%" />
-            <property
-                name="platformSpecificTemplateList"
-                value="Windows,${publishingContent}/templateFiles/platform.php.template,winPlatform.php;Linux,${publishingContent}/templateFiles/platform.php.template,linPlatform.php;Solaris,${publishingContent}/templateFiles/platform.php.template,solPlatform.php;AIX,${publishingContent}/templateFiles/platform.php.template,aixPlatform.php;Macintosh,${publishingContent}/templateFiles/platform.php.template,macPlatform.php;HP-UX,${publishingContent}/templateFiles/platform.php.template,hpuxPlatform.php" />
-            <property
-                name="indexFileName"
-                value="index.php" />
-            <property
-                name="result"
-                value="${postingDirectory}/${buildLabel}" />
-            <property
-                name="testResultsTemplateFileName"
-                value="${publishingContent}/templateFiles/testResults.php.template" />
-            <property
-                name="dropTemplateFileName"
-                value="${publishingContent}/templateFiles/index.php.template" />
-            <property
-                name="testManifestFileName"
-                value="${publishingContent}/testManifest.xml" />
-        </ant>
-
-        <!-- Replace build label in generated html files -->
-         <replace
-            dir="${postingDirectory}/${buildLabel}"
-             token="@buildlabel@"
-             value="${buildLabel}"
-             includes="**/*.php" />
-         <replace
-             dir="${postingDirectory}/${buildId}"
-             token="@eclipseStream@"
-             value="${eclipseStream}"
-             includes="**/*.php" />
-
-
-
-    </target>
-
-    <target name="generatePerformanceResults">
-        <mkdir dir="${buildDirectory}/${buildLabel}/performance" />
-        <mkdir dir="${postingDirectory}/${buildLabel}/performance" />
-        <taskdef
-            name="performanceResults"
-            classname="org.eclipse.releng.performance.PerformanceResultHtmlGenerator" />
-        <condition
-            property="configArgs"
-            value="-ws gtk -arch ppc">
-            <equals
-                arg1="${os.arch}"
-                arg2="ppc64" />
-        </condition>
-        <condition
-            property="configArgs"
-            value="-ws gtk -arch x86">
-            <equals
-                arg1="${os.arch}"
-                arg2="i386" />
-        </condition>
-        <property
-            name="configArgs"
-            value="" />
-
-        <java
-            jar="${basedir}/../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar"
-            fork="true"
-            maxmemory="512m"
-            error="${buildlogs}/perfgenerror.txt"
-            output="${buildlogs}/perfgenoutput.txt">
-            <arg
-                line="${configArgs} -consolelog -nosplash -data ${buildDirectory}/perf-workspace -application org.eclipse.test.performance.ui.resultGenerator
-                        -current ${buildId}
-                        -jvm ${eclipse.perf.jvm}
-                        -print                  
-                        -output ${postingDirectory}/${buildLabel}/performance/
-                        -config eplnx1,eplnx2,epwin2,epwin3
-                        -dataDir ${postingDirectory}/../../data/v38
-                        -config.properties ${eclipse.perf.config.descriptors}
-                        -scenario.pattern org.eclipse.%.test%" />
-            <!-- baselines arguments are no longer necessary since bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=209322 has been
-                fixed...
-                -baseline ${eclipse.perf.ref}
-                -baseline.prefix R-3.4_200806172000
-            -->
-            <!-- add this argument to list above when there are milestone builds to highlight
-                -highlight.latest 3.3M1_
-            -->
-            <env
-                key="LD_LIBRARY_PATH"
-                value="${basedir}/../org.eclipse.releng.basebuilder" />
-            <sysproperty
-                key="eclipse.perf.dbloc"
-                value="${dbloc}" />
-        </java>
-
-        <performanceResults
-            xmlDirectoryName="${postingDirectory}/${buildLabel}/performance/xml"
-            dropDirectoryName="${postingDirectory}/${buildLabel}"
-            testResultsTemplateFileName="${publishingContent}/templateFiles/performance.php.template"
-            testResultsHtmlFileName="performance/performance.php"
-            hrefTestResultsTargetPath="html"
-            testManifestFileName="${publishingContent}/performanceTestManifest.xml" />
-
-        <replace
-            file="${postingDirectory}/${buildLabel}/performance/performance.php"
-            token="@buildType@"
-            value="${buildType}" />
-        <copy
-            todir="/home/users/ecperf/data/"
-            failonerror="false"
-            overwrite="true">
-            <fileset dir=" /builds/transfer/files/master/data/v38" />
-        </copy>
-
-    </target>
-
-    <target
-        name="verifyCompile"
-        if="eclipse.running">
-        <echo message="Checking for compile errors..." />
-        <!--create html output for compile logs -->
-        <eclipse.convert
-            input="${postingDirectory}/${buildLabel}/compilelogs"
-            validation="true" />
-        <!-- Sends email to recipient list in monitor.properties with compile logs attached if errors found -->
-        <verifyCompile install="${postingDirectory}/${buildLabel}/compilelogs" />
-    </target>
-
-    <target
-        name="rSyncWithSnzZrh"
-        if="rsync">
-        <!--copy drops to local directory for rsync with zrh -->
-        <copy todir="/builds/transfer/files/zrh">
-            <fileset
-                dir="${postingDirectory}"
-                includes="${buildLabel}/eclipse-SDK-*-win32.zip,${buildLabel}/eclipse-SDK-*-linux-*.tar.gz"
-                excludes="${buildLabel}/eclipse-SDK-examples-*-win32.zip,${buildLabel}/eclipse-SDK-*-linux-gtk-x86_64.tar.gz,${buildLabel}/eclipse-SDK-*-linux-gtk-ppc.tar.gz,${buildLabel}/eclipse-SDK-*-linux-motif.tar.gz,${buildLabel}/eclipse-SDK-*-linux-gtk-s390.tar.gz,${buildLabel}/eclipse-SDK-*-linux-gtk-s390x.tar.gz,${buildLabel}/eclipse-SDK-*-linux-gtk-ppc64.tar.gz" />
-        </copy>
-    </target>
-    <!-- ===================================================================== -->
-    <!-- Default target -->
-    <!-- ===================================================================== -->
-    <target name="noDefault">
-        <echo message="You must specify a target when invoking this file" />
-    </target>
-
-    <target
-        name="cleanSites"
-        unless="skip.clean.sites">
-        <cleanSite
-            ageInMinutes="1440"
-            directoryName="/builds/transfer/files/master/downloads/drops"
-            realDelete="true" />
-        <cleanSite
-            ageInMinutes="1440"
-            directoryName="/builds/transfer/files/master/equinox/drops"
-            realDelete="true" />
-        <cleanSite
-            ageInMinutes="1440"
-            directoryName="/builds/transfer/files/bogus/downloads/drops"
-            realDelete="true" />
-        <cleanSite
-            ageInMinutes="1440"
-            directoryName="/builds/transfer/files/bogus/equinox/drops"
-            realDelete="true" />
-        <cleanSite
-            ageInMinutes="1440"
-            directoryName="/builds/transfer/files/zrh"
-            realDelete="true" />
-        <cleanSite
-            ageInMinutes="1440"
-            directoryName="/builds/transfer/files/snz"
-            realDelete="true" />
-    </target>
-
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildNotes.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildNotes.php
index 13b1af18c..613936cc1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildNotes.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildNotes.php
@@ -1,24 +1,10 @@
 <html>
 <head>
 <?php
-$parts = explode("/", getcwd());
-$parts2 = explode("-", $parts[count($parts) - 1]);
-$buildName = $parts2[0] . "-" . $parts2[1];
 
-// Get build type names
+include("buildproperties.php");
 
-$fileHandle = fopen("./dlconfig2.txt", "r");
-while (!feof($fileHandle)) {
-
-    $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-    $parts = explode(",", $aLine);
-    $dropNames[trim($parts[0])] = trim($parts[1]);
-}
-fclose($fileHandle);
-
-$buildType = $dropNames[$parts2[0]];
-
-echo "<title>Build Notes for $buildType $buildName </title>";
+echo "<title>Build Notes for $BUILD_ID </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="../../../default_style.css" type="text/css">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildlogs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildlogs.php
index e6809374a..7dcd56dcf 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildlogs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/buildlogs.php
@@ -3,7 +3,7 @@
 <head>
 
 <?php
-
+include ('buildproperties.php');
 function listLogs($myDir) {
 
         $aDirectory = dir($myDir);
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/coverage.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/coverage.php
index 6363030f6..d61836056 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/coverage.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/coverage.php
@@ -4,6 +4,8 @@
 
 <?php
 
+include("buildproperties.php");
+
 function listLogs($myDir) {
 
         $aDirectory = dir($myDir);
@@ -31,30 +33,6 @@ function listLogs($myDir) {
         }
 }
 
-function getBuildId() {
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[0] . "-" . $parts2[1];
-
-        // Get build type names
-        $fileHandle = fopen("./dlconfig2.txt", "r");
-        while (!feof($fileHandle)) {
-                $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-                $parts = explode(",", $aLine);
-                $dropNames[trim($parts[0])] = trim($parts[1]);
-        }
-        fclose($fileHandle);
-
-        $buildType = $dropNames[$parts2[0]];
-
-        $buildId = $buildType.$buildName;
-
-        return($buildId);
-
-}
-
-
-
 
 ?>
 <STYLE TYPE="text/css">
@@ -133,11 +111,9 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 <div id="midcolumn">
 <div class="homeitem3col">
 <?php
-    global $buildId;
-    $buildId = getBuildId();
-    echo "<title>Code coverage for $buildId </title>\n";
+    echo "<title>Code coverage for $BUILD_ID </title>\n";
 
-echo "<h3>Code coverage for $buildId</h3>\n";
+echo "<h3>Code coverage for $BUILD_ID</h3>\n";
 ?>
 
 <?php
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php
index 178a2a603..a2d297e36 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/download.php
@@ -5,7 +5,7 @@
 <link rel="stylesheet" href="../../../default_style.css" type="text/css">
 <?php
 
-
+include("buildproperties.php");
 
    if (array_key_exists("SERVER_NAME", $_SERVER)) {
         $servername = $_SERVER["SERVER_NAME"];
@@ -52,14 +52,6 @@
 		    $url = "http://$servername$path$script";
 		}
 
-		$dropdir = explode("/", getcwd());
-		$parts2 = explode("-", $dropdir[count($dropdir) - 1]);
-                if ($parts2[1]) {
-		    $buildName = $parts2[0] . "-" .$parts2[1];
-                } else {
-		    $buildName = $parts2[1];
-                }
-
         $mirror=true;
         if (strstr($servername,"eclipse.org")) {
 #       if (strstr($servername,"ibm.com")) {
@@ -70,7 +62,7 @@
         }
 
 		$clickFile = "clickThroughs/";
-                $clickFileName = str_replace("-$buildName","",$dropFile);
+                $clickFileName = str_replace("-$BUILD_ID","",$dropFile);
 		$clickFile = $clickFile.$clickFileName.".txt";
 
 		if (file_exists($clickFile)) {
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php
index bde8630c8..f99ad5b0b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/logs.php
@@ -4,6 +4,8 @@
 
 <?php
 
+include("buildproperties.php");
+
 function checkPlatform($line) {
 
     if (preg_match("/win7|win32|linux|macosx/i", $line)) {
@@ -110,32 +112,6 @@ function listDegailedLogs ($machineplatform) {
     }
 }
 
-function getBuildId() {
-    $parts = explode("/", getcwd());
-    $parts2 = explode("-", $parts[count($parts) - 1]);
-    $buildName = $parts2[0] . "-" . $parts2[1];
-    // echo "<p>buildName: $buildName</p>";
-    // Get build type names
-    $fileHandle = fopen("./dlconfig2.txt", "r");
-    while (!feof($fileHandle)) {
-        $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-        $parts = explode(",", $aLine);
-        $dropNames[trim($parts[0])] = trim($parts[1]);
-    }
-    fclose($fileHandle);
-
-    $buildType =  $buildType=substr($buildName,0,1);
-    // echo "<p>buildType: $buildType</p>";
-
-    $buildId = $buildName;
-    // echo "<p>buildId: $buildId</p>";
-
-    return($buildId);
-
-}
-
-
-
 
 ?>
 <STYLE TYPE="text/css">
@@ -226,10 +202,9 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 <div id="midcolumn">
 <div class="homeitem3col">
 <?php
-global $buildId;
-$buildId = getBuildId();
-echo "<title>Test Results for $buildId </title>\n";
-echo "<h2>Test Results for $buildId </title></h2>\n";
+
+echo "<title>Test Results for $BUILD_ID </title>\n";
+echo "<h2>Test Results for $BUILD_ID </h2>\n";
 
 echo "<h3>Logs</h3>\n";
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResults.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResults.php
index e845bcfee..4b908b584 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResults.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testResults.php
@@ -2,24 +2,10 @@
 <head>
 
 <?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	// Get build type names
 
-	$fileHandle = fopen("./dlconfig2.txt", "r");
-	while (!feof($fileHandle)) {
-		
-		$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-		$parts = explode(",", $aLine);
-		$dropNames[trim($parts[0])] = trim($parts[1]);
- 	}
-	fclose($fileHandle);
+include("buildproperties.php");
 
-	$buildType = $dropNames[$parts2[0]];
-
-	echo "<title>Test Results for $buildType $buildName </title>";
+	echo "<title>Test Results for $BUILD_ID </title>";
 ?>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
index 5e4a8cc31..08753fd63 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
@@ -3,6 +3,9 @@
 <?php
 //ini_set("display_errors", "true");
 //error_reporting (E_ALL);
+
+include("buildproperties.php");
+
 if (array_key_exists("SERVER_NAME", $_SERVER)) {
     $servername = $_SERVER["SERVER_NAME"];
     if ($servername === "build.eclipse.org") {
@@ -178,7 +181,7 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 		<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" >
 		<tr>
 			<td>
-				<p><b><font face="Verdana" size="+3">Eclipse @eclipseStream@ @type@ Build: @build@</font></b><br> @date@.
+				<p><b><font face="Verdana" size="+3">Eclipse <?php echo $STREAM; ?> <?php echo $BUILD_TYPE_NAME; ?> Build: <?php echo $BUILD_ID; ?></font></b><br> <?php echo $BUILD_PRETTY_DATE; ?>.
 				These downloads are provided under the <a href="http://www.eclipse.org/legal/epl/notice.html">
 				<b>Eclipse Foundation Software User Agreement</b></a>.</p>
 			</td><tr><tr>
@@ -327,8 +330,8 @@ function genLinks($servername,$buildlabel,$zipfile) {
      echo "<td>$filesize</td>";
      echo "<td>$zipfile</td>";
      // make relative so works on build.eclipse.org
-     //echo "<td><a href=\"http://download.eclipse.org/eclipse/downloads/drops/@buildlabel@/checksum/$zipfile.md5\">(md5)</a>";
-     //echo " <a href=\"http://download.eclipse.org/eclipse/downloads/drops/@buildlabel@/checksum/$zipfile.sha1\">(sha1)</a>";
+     //echo "<td><a href=\"http://download.eclipse.org/eclipse/downloads/drops/$BUILD_ID/checksum/$zipfile.md5\">(md5)</a>";
+     //echo " <a href=\"http://download.eclipse.org/eclipse/downloads/drops/$BUILD_ID/checksum/$zipfile.sha1\">(sha1)</a>";
      echo "<td><a href=\"./checksum/$zipfile.md5\">(md5)</a>";
      echo " <a href=\"./checksum/$zipfile.sha1\">(sha1)</a>";
 }
@@ -340,35 +343,7 @@ function genLinks($servername,$buildlabel,$zipfile) {
 <table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="99%" bordercolor="#999999" >
 <tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?>
 </tr> %sdk% </table><?php
-		 $parts = explode("/", getcwd());
-		 $parts2 = explode("-", $parts[count($parts) - 1]);
-		 $buildName = $parts2[1];
 		
-		 // Get build type names
-
-		 $fileHandle = fopen("./dlconfig2.txt", "r");
-		 while (!feof($fileHandle)) {
-		 		
-		 		 $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-		 		 $parts = explode(",", $aLine);
-		 		 // if two parts do not exist, it is likely just incorrect dlconfig.txt file,
-		 		 // or perhaps empty line. We'll ignore for now, but better solution would be to
-		 		 // display something to error output?
-		 		 if (array_key_exists(1, $parts)) {
-		       		 $dropNames[trim($parts[0])] = trim($parts[1]);
-		       		 // echo "<p>".$parts2[0]."</p>";
-                     // echo "<p>".$dropNames[$parts2[0]]."</p>";
-                     // without this check, was getting 7 "Undefined index: I20120410"
-                     // I assume something in dlconfig2 is out of date ... or something?
-                     // (there are 7 lines in dlconfig2.txt)
-                     // ah, figured it out. the file had windows EOLs. We'll check anyway.
-                     // and, assume there's just one "buildType" so the last value obtained suffices?
-                     if (array_key_exists($parts2[0], $dropNames)) {
-                           $buildType = $dropNames[$parts2[0]];
-                     }
-                }
-      		 }
-		 fclose($fileHandle);
 		
 ?>
 </div></td></tr>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template
index fbd737997..37c7be6b4 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/performance.php.template
@@ -8,6 +8,9 @@
 <TR> <TD ALIGN=LEFT VALIGN=TOP COLSPAN="3" BGCOLOR="#0080C0"><B><FONT COLOR="#FFFFFF" FACE="Arial,Helvetica">
 Performance fingerprint</FONT></B></TD></TR></TABLE>
 <?php
+
+include("buildproperties.php");
+
     $performance = dir(".");
     $index=0;
     $fpcount=0;
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
index 2d3884179..bfa73c2ab 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
@@ -52,6 +52,9 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 		<li class="tabstart">&#160;&#160;&#160;</li>
 		<li><a class="" href="index.php" target="_self">All Platforms</a></li>
 <?php
+include("buildproperties.php");
+
+
 	$platform = "%platform%";
 	$platforms = array(1 => "Windows", "Linux", "Solaris", "AIX", "Macintosh", "HP-UX");
 	$files = array(1 => "winPlatform.php", "linPlatform.php", "solPlatform.php", "aixPlatform.php", "macPlatform.php", "hpuxPlatform.php");
@@ -120,7 +123,7 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 		<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" >
 		<tr>
 			<td>
-				<p><b><font face="Verdana" size="+3">@type@ Build: @build@ - </font><font face="Verdana" size="+2"> <?php echo $platform; ?> </font></b><br> @date@.
+				<p><b><font face="Verdana" size="+3"><?php echo "Build: $BUILD_ID"; ?> - </font><font face="Verdana" size="+2"> <?php echo $platform; ?> </font></b><br> @date@.
 				These downloads are provided under the <a href="http://www.eclipse.org/legal/epl/notice.html">
 				<b>Eclipse Foundation Software User Agreement</b></a>.</p>
 			</td><tr><tr>
@@ -239,10 +242,10 @@ function getDropSize($zipfile) {
 
 }
 
-function genLinks($servername,$buildlabel,$zipfile) {
+function genLinks($servername,$BUILD_ID,$zipfile) {
 
 if (preg_match("/.eclipse.org/i",$servername)) {
-#     $httplink = "http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/$buildlabel/$zipfile";
+#     $httplink = "http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/$BUILD_ID/$zipfile";
      $httplink = "download.php?dropFile=$zipfile";
      $httplabel = $zipfile;
      $httpline =  "<div align=\"left\"><a href=\"$httplink\">$httplabel</a>";
@@ -261,8 +264,8 @@ if (preg_match("/.eclipse.org/i",$servername)) {
   echo "&nbsp;&nbsp";
   echo "<td>$filesize</td>";
   echo "<td>$zipfile</td>";
-  echo "<td><a href=\"http://download.eclipse.org/eclipse/downloads/drops/@buildlabel@/checksum/$zipfile.md5\">(md5)</a>";
-  echo " <a href=\"http://download.eclipse.org/eclipse/downloads/drops/@buildlabel@/checksum/$zipfile.sha1\">(sha1)</a>";
+  echo "<td><a href=\"http://download.eclipse.org/eclipse/downloads/drops/$BUILD_ID/checksum/$zipfile.md5\">(md5)</a>";
+  echo " <a href=\"http://download.eclipse.org/eclipse/downloads/drops/$BUILD_ID/checksum/$zipfile.sha1\">(sha1)</a>";
 }
 ?>	
 
@@ -272,23 +275,7 @@ if (preg_match("/.eclipse.org/i",$servername)) {
 <table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="99%" bordercolor="#999999" >
 <tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($_SERVER["SERVER_NAME"]); ?>
 </tr> %sdk% </table><?php
-		 $parts = explode("/", getcwd());
-		 $parts2 = explode("-", $parts[count($parts) - 1]);
-		 $buildName = $parts2[1];
-		
-		 // Get build type names
-
-		 $fileHandle = fopen("./dlconfig2.txt", "r");
-		 while (!feof($fileHandle)) {
-		 		
-		 		 $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-		 		 $parts = explode(",", $aLine);
-		 		 $dropNames[trim($parts[0])] = trim($parts[1]);
- 		 }
-		 fclose($fileHandle);
-
-		 $buildType = $dropNames[$parts2[0]];
-		
+		 
 ?>
 </div></td></tr>
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template
index d2df93215..2986c0ea1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/testResults.php.template
@@ -3,7 +3,7 @@
 <?php
 //ini_set("display_errors", "true");
 //error_reporting (E_ALL);
-include 'buildProperties.php';
+include ('buildproperties.php');
 if (array_key_exists("SERVER_NAME", $_SERVER)) {
     $servername = $_SERVER["SERVER_NAME"];
     if ($servername === "build.eclipse.org") {
@@ -32,24 +32,8 @@ else {
 <head>
 
 <?php
-		 $parts = explode("/", getcwd());
-		 $parts2 = explode("-", $parts[count($parts) - 1]);
-		 $buildName = $parts2[0] . "-" . $parts2[1];
-		
-		 // Get build type names
-
-		 $fileHandle = fopen("./dlconfig2.txt", "r");
-		 while (!feof($fileHandle)) {
-		 		
-		 		 $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-		 		 $parts = explode(",", $aLine);
-		 		 $dropNames[trim($parts[0])] = trim($parts[1]);
- 		 }
-		 fclose($fileHandle);
-
-		 $buildType = $dropNames[$parts2[0]];
-
-		 echo "<title>Test Results for $buildType $buildName </title>";
+
+		 echo "<title>Test Results for $BUILD_ID </title>";
 ?>
 
 
@@ -142,7 +126,7 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
 <div id="midcolumn">
 <p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
 <div class="homeitem">
-<h3><a name="Logs"> Logs <?php echo "$buildType $buildName"; ?></h3>
+<h3><a name="Logs"> Logs <?php echo "$BUILD_ID"; ?></h3>
 <ul>
 <!-- have removed chkpii processing on build.eclilpse.org
 <li> <a href="logs.php#chkpii"><b> CHKPII Test Logs </b></a>
@@ -174,18 +158,18 @@ echo "  This tool generates a report for API deprecated since 3.7.1 </li> ";
 echo"<li><a href=\"apitools/report.html\"><b>API Tools Post-API Freeze Report</b></a>  This report describes API changes since 3.7.  Exclusions are listed in org.eclipse.releng/apiexclude/exclude_list.txt. </li>";
 ?>
 <?php
-echo " <li><a href=\"apitools/apifilters-$buildName.zip\"><b>Zip of .api_filters files used in the build</b></a></li>";
+echo " <li><a href=\"apitools/apifilters-$TIMESTAMP.zip\"><b>Zip of .api_filters files used in the build</b></a></li>";
 ?>
 <?php
 
-    echo"<li>org.eclipse.releng.eclipsebuilder: $eclipsebuilderBranch</li> ";
-    echo"<li>org.eclipse.releng.basebuilder: $basebuilderBranch</li> ";
+    echo"<li>org.eclipse.releng.eclipsebuilder: $BRANCH (hash: $AGGR_HASH)</li> ";
+    echo"<li>org.eclipse.releng.basebuilder: $BASEBUILDER_TAG</li> ";
 
 ?>
 </div>
 
 <div class="homeitem3col">
-<h3><a name="UnitTest"> Unit Test Results for <?php echo "$buildType $buildName"; ?> </a></h3>
+<h3><a name="UnitTest"> Unit Test Results for <?php echo "$BUILD_ID"; ?> </a></h3>
 
 <p>The table shows the unit test results for this build on the platforms
 tested. You may access the test results page specific to each
diff --git a/production/build-functions.sh b/production/build-functions.sh
index 1d8a5b26a..30e39e3f9 100755
--- a/production/build-functions.sh
+++ b/production/build-functions.sh
@@ -130,7 +130,8 @@ fn-git-reset-submodules ()
 fn-build-id () 
 {
     BUILD_TYPE="$1"; shift
-    echo $BUILD_TYPE$(date +%Y%m%d)-$(date +%H%M)
+     TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE )
+echo ${BUILD_TYPE}${TIMESTAMP}
 }
 
 # USAGE: fn-local-repo URL [TO_REPLACE]
@@ -726,13 +727,13 @@ fn-gather-compile-logs ()
 }
 
 
-# USAGE: fn-gather-main-index BUILD_ID REPO_DIR BUILD_DIR STREAM BUILD_TYPE BUILD_DATE
+# USAGE: fn-gather-main-index BUILD_ID REPO_DIR BUILD_DIR STREAM BUILD_TYPE BUILD_PRETTY_DATE
 #   BUILD_ID: I20121116-0700
 #   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
 #   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
 #   STREAM: 4.2.2
 #   BUILD_TYPE: M, I, N
-#   BUILD_DATE: Thu Nov 20 17:47:35 EST 2012
+#   BUILD_PRETTY_DATE: Thu Nov 20 17:47:35 EST 2012
 fn-gather-main-index () 
 {
     BUILD_ID="$1"; shift
@@ -740,26 +741,29 @@ fn-gather-main-index ()
     BUILD_DIR="$1"; shift
     STREAM="$1"; shift
     BUILD_TYPE="$1"; shift
-    BUILD_TYPE_NAME=Integration
-    if [ "$BUILD_TYPE" = M ]; then
-        BUILD_TYPE_NAME=Maintenance
-    fi
-    BUILD_DATE="$1"; shift
+    #BUILD_TYPE_NAME=Integration
+    #if [ "$BUILD_TYPE" = M ]; then
+    #    BUILD_TYPE_NAME=Maintenance
+    #fi
+    BUILD_PRETTY_DATE="$1"; shift
     pushd "$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/templateFiles
 
-    # fail fast if not set up correctly
-    rc=$(fn-check-dir-exists TMP_DIR)
-    checkForErrorExit "$rc" "$rc"
-
-    T1=${TMP_DIR}/t1_$$
-    T2=${TMP_DIR}/t2_$$
-    sed "s/@eclipseStream@/$STREAM/g" index.php.template >$T1
-    sed "s/@type@/$BUILD_TYPE_NAME/g" $T1 >$T2
-    sed "s/@build@/$BUILD_ID/g" $T2 >$T1
-    sed "s/@date@/$BUILD_DATE/g" $T1 >$T2
-    sed "s/@buildlabel@/$BUILD_ID/g" $T2 >$T1
-    cp $T1 "$BUILD_DIR"/index.php
-    rm $T1 $T2
+    # Simplified by creating PHP variables in buildproperties.php
+    cp "index.php.template" "$BUILD_DIR"/index.php
+
+    #    # fail fast if not set up correctly
+    #rc=$(fn-check-dir-exists TMP_DIR)
+    #checkForErrorExit "$rc" "$rc"
+
+    #T1=${TMP_DIR}/t1_$$
+    #T2=${TMP_DIR}/t2_$$
+    #sed "s/@eclipseStream@/$STREAM/g" index.php.template >$T1
+    #sed "s/@type@/$BUILD_TYPE_NAME/g" $T1 >$T2
+    #sed "s/@build@/$BUILD_ID/g" $T2 >$T1
+    #sed "s/@date@/$BUILD_PRETTY_DATE/g" $T1 >$T2
+    #sed "s/@buildlabel@/$BUILD_ID/g" $T2 >$T1
+    #cp $T1 "$BUILD_DIR"/index.php
+    #rm $T1 $T2
     popd
 }
 
@@ -902,3 +906,73 @@ fn-check-dir-exists ()
     fi
 }
 
+# USAGE: fn-write-property VAR_NAME
+#   VAR_NAME: Variable name to write as "variable=value" form
+# This script assumes the following variables have been defined and are pointing 
+# to an appropriate file (see master-build.sh): 
+# BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource
+# BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php
+# BUILD_ENV_FILE_PROP=${buildDirectory}/buildproperties.properties
+
+# Note we always append to file, assuming if doesn't exist yet and will be 
+# created, and for each build, it won't exist, so will be written fresh for 
+# each build. 
+
+# TODO: Could add some sanity checking of if variable name appropriate 
+# for various language (e.g. I forget all the rules, but bash variables 
+# can not start with numerial, PHP variables (or is it Ant) can't have hyphens
+# (or is it underscore :), etc. But may need to add some mangling, or warning? 
+# Similarly, not sure at the moment of what to 
+# write if value is null/empty. For now will leave empty string, but some might need blank?
+# Or literally nothing? Also, unsure of effects of full quoting or if always needed? 
+
+fn-write-property () 
+{
+    VAR_NAME=$1
+    if [[ -z "${VAR_NAME}" ]]
+    then
+        echo "VAR_NAME must be passed to this script, $0."
+        return 1
+     fi 
+
+     # bash scripts (export may be overkill ... but, just in case needed)
+     echo "export ${VAR_NAME}=\"${!VAR_NAME}\"" >> $BUILD_ENV_FILE
+     # PHP, suitable for direct "include"
+     echo "\$${VAR_NAME} = \"${!VAR_NAME}\";" >> $BUILD_ENV_FILE_PHP
+     # standard properties file
+     echo "${VAR_NAME} = \"${!VAR_NAME}\"" >> $BUILD_ENV_FILE_PROP
+
+}
+
+# USAGE: fn-write-property-init
+# Must be called (exactly) once before writing properties. 
+fn-write-property-init () 
+{
+
+     # nothing really required for bash shsource, but we'll put in some niceties
+     echo "#!/usr/bin/env bash" > $BUILD_ENV_FILE
+     echo "# properties written for $BUILD_ID" >> $BUILD_ENV_FILE
+     # PHP, suitable for direct "include": needs to start and end with <?php ... ?>
+     echo "<?php " > $BUILD_ENV_FILE_PHP
+     echo "// properties written for $BUILD_ID " >> $BUILD_ENV_FILE_PHP
+     # standard properties file: nothing special required
+     echo "! properties written for $BUILD_ID" > $BUILD_ENV_FILE_PROP
+
+}
+
+# USAGE: fn-write-property-close
+# Must be called (exactly) once when completely finished writing properties. 
+fn-write-property-close () 
+{
+
+     # nothing really required for bash shsource, but we'll put in some niceties
+     echo "# finished properties for $BUILD_ID" >> $BUILD_ENV_FILE
+     # PHP, suitable for direct "include": needs to start and end with <?php ... ?>
+     # Note: technically may not need closing ?> for an 'include' ? 
+     echo "// finished properties for $BUILD_ID " >> $BUILD_ENV_FILE_PHP
+     echo "?>"  >> $BUILD_ENV_FILE_PHP
+     # standard properties file: nothing special required
+     echo "! finshed properties for $BUILD_ID" >> $BUILD_ENV_FILE_PROP
+
+}
+
diff --git a/production/build_eclipse_org.env b/production/build_eclipse_org.shsource
index 3008f8fb6..3008f8fb6 100644
--- a/production/build_eclipse_org.env
+++ b/production/build_eclipse_org.shsource
diff --git a/production/gather-parts.sh b/production/gather-parts.sh
index a148242eb..cbeed5ec8 100644
--- a/production/gather-parts.sh
+++ b/production/gather-parts.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
@@ -53,4 +53,4 @@ fn-slice-repos "$BUILD_ID" "$aggDir" "$buildDirectory" "$launcherJar"
 #fn-gather-repo-zips "$BUILD_ID" "$aggDir" "$buildDirectory"
 
 #fn-gather-compile-logs "$BUILD_ID" "$aggDir" "$buildDirectory"
-#fn-gather-main-index "$BUILD_ID" "$aggDir" "$buildDirectory" "$STREAM" "$BUILD_TYPE" "$BUILD_DATE"
+#fn-gather-main-index "$BUILD_ID" "$aggDir" "$buildDirectory" "$STREAM" "$BUILD_TYPE" "$BUILD_PRETTY_DATE"
diff --git a/production/get-aggregator.sh b/production/get-aggregator.sh
index 738834849..4a62d6eae 100644
--- a/production/get-aggregator.sh
+++ b/production/get-aggregator.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
@@ -39,6 +39,13 @@ else
 	  $(fn-local-repo "$AGGREGATOR_REPO") "$BRANCH" 
 fi
 
+pushd "$aggDir"
+# save current hash tag value for documenting build (e.g. to reproduce, run tests, etc.)
+AGGR_HASH=$( git show-ref --hash --verify refs/remotes/origin/$BRANCH )
+checkForErrorExit $? "git show-ref --hash failed for refs/remotes/origin/$BRANCH. Not valid ref?"
+fn-write-property AGGR_HASH
+popd
+
 echo "signingDir: $signingDir"
 
 if [ -r "$signingDir" ]; then
diff --git a/production/install-parent.sh b/production/install-parent.sh
index 444216096..2a4140920 100644
--- a/production/install-parent.sh
+++ b/production/install-parent.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
diff --git a/production/master-build.sh b/production/master-build.sh
index 357a39348..625e22122 100644
--- a/production/master-build.sh
+++ b/production/master-build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # master script to drive Eclipse Platform builds.
-
+RAWDATE=$( date +%s )
 
 if [ $# -ne 1 ]; then
     echo USAGE: $0 env_file
@@ -35,50 +35,73 @@ mkdir -p "${logsDirectory}"
 checkForErrorExit $? "Could not create buildlogs directory"
 
 LOG=$buildDirectory/buildlogs/buildOutput.txt
-exec >>$LOG 2>&1
+#exec >>$LOG 2>&1
+
+BUILD_PRETTY_DATE=$( date --date='@'$RAWDATE )
+TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE )
+
+# These files have variable/value pairs for this build, suitable for use in 
+# shell scripts, PHP files, or as Ant (or Java) properties
+export BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource
+export BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php
+export BUILD_ENV_FILE_PROP=${buildDirectory}/buildproperties.properties
 
-BUILD_ENV_FILE=$logsDirectory/$BUILD_ID.env
 gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
 aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
 export LOCAL_REPO="${BUILD_ROOT}"/localMavenRepo
 
 export STREAMS_PATH="${aggDir}/streams"
 
+BUILD_TYPE_NAME="Integration"
+if [ "$BUILD_TYPE" = M ]; then
+      BUILD_TYPE_NAME="Maintenance"
+  elif [ "$BUILD_TYPE" = N ]; then
+      BUILD_TYPE_NAME="Nightly (HEAD)"
+  elif [ "$BUILD_TYPE" = S ]; then
+      BUILD_TYPE_NAME="Stable (Milestone)"
+fi
+
 # These variables, from original env file, are re-written to BUILD_ENV_FILE, 
 # with values for this build (some of them computed) partially for documentation, and 
 # partially so this build can be re-ran or re-started using it, instead of 
 # original env file, which would compute different values (in some cases).
-echo "export PATH=\"${PATH}\"" >$BUILD_ENV_FILE
-echo "export INITIAL_ENV_FILE=\"${INITIAL_ENV_FILE}\"" >>$BUILD_ENV_FILE
-echo "export BUILD_ROOT=\"${BUILD_ROOT}\""  >>$BUILD_ENV_FILE
-echo "export BRANCH=\"${BRANCH}\"" >>$BUILD_ENV_FILE
-echo "export STREAM=\"${STREAM}\"" >>$BUILD_ENV_FILE
-echo "export BUILD_TYPE=\"${BUILD_TYPE}\"" >>$BUILD_ENV_FILE
-echo "export TMP_DIR=\"${TMP_DIR}\"" >>$BUILD_ENV_FILE 
-echo "export JAVA_HOME=\"${JAVA_HOME}\"" >>$BUILD_ENV_FILE
-echo "export MAVEN_OPTS=\"${MAVEN_OPTS}\"" >>$BUILD_ENV_FILE
-echo "export MAVEN_PATH=\"${MAVEN_PATH}\"" >>$BUILD_ENV_FILE
-echo "export AGGREGATOR_REPO=\"${AGGREGATOR_REPO}\"" >>$BUILD_ENV_FILE
-echo "export BASEBUILDER_TAG=\"${BASEBUILDER_TAG}\"" >>$BUILD_ENV_FILE
-echo "export SIGNING_REPO=\"${SIGNING_REPO}\"" >>$BUILD_ENV_FILE
-echo "export SIGNING_BRANCH=\"${SIGNING_BRANCH}\"" >>$BUILD_ENV_FILE
-echo "export B_GIT_EMAIL=\"${B_GIT_EMAIL}\"" >>$BUILD_ENV_FILE
-echo "export B_GIT_NAME=\"${B_GIT_NAME}\"" >>$BUILD_ENV_FILE
-echo "export COMMITTER_ID=\"${COMMITTER_ID}\"" >>$BUILD_ENV_FILE
-echo "export COMPARATOR=\"${COMPARATOR}\"" >>$BUILD_ENV_FILE
-echo "export SIGNING=\"${SIGNING}\"" >>$BUILD_ENV_FILE
-echo "export UPDATE_BRANDING=\"${UPDATE_BRANDING}\"" >>$BUILD_ENV_FILE
-echo "export FORCE_LOCAL_REPO=\"${FORCE_LOCAL_REPO}\"" >>$BUILD_ENV_FILE
-echo "export MAVEN_BREE=\"${MAVEN_BREE}\"" >>$BUILD_ENV_FILE
-echo "export GIT_PUSH=\"${GIT_PUSH}\"" >>$BUILD_ENV_FILE
-echo "export LOCAL_REPO=\"${LOCAL_REPO}\"" >>$BUILD_ENV_FILE
-echo "export INITIAL_ENV_FILE=\"${INITIAL_ENV_FILE}\""  >>$BUILD_ENV_FILE
-echo "export SCRIPT_PATH=\"${SCRIPT_PATH}\""  >>$BUILD_ENV_FILE
-echo "export STREAMS_PATH=\"${STREAMS_PATH}\""  >>$BUILD_ENV_FILE
+# The function also writes into appropriate PHP files and Properties files.
+ # Init once, here at beginning, but don't close until much later since other functions
+ # may write variables at various points
+fn-write-property-init
+fn-write-property PATH
+fn-write-property INITIAL_ENV_FILE
+fn-write-property BUILD_ROOT
+fn-write-property BRANCH
+fn-write-property STREAM
+fn-write-property BUILD_TYPE
+fn-write-property TIMESTAMP
+fn-write-property TMP_DIR
+fn-write-property JAVA_HOME
+fn-write-property MAVEN_OPTS
+fn-write-property MAVEN_PATH
+fn-write-property AGGREGATOR_REPO
+fn-write-property BASEBUILDER_TAG
+fn-write-property SIGNING_REPO
+fn-write-property SIGNING_BRANCH
+fn-write-property B_GIT_EMAIL
+fn-write-property B_GIT_NAME
+fn-write-property COMMITTER_ID
+fn-write-property COMPARATOR
+fn-write-property SIGNING
+fn-write-property UPDATE_BRANDING
+fn-write-property FORCE_LOCAL_REPO
+fn-write-property MAVEN_BREE
+fn-write-property GIT_PUSH
+fn-write-property LOCAL_REPO
+fn-write-property INITIAL_ENV_FILE
+fn-write-property SCRIPT_PATH
+fn-write-property STREAMS_PATH
 # any value of interest/usefulness can be added to BUILD_ENV_FILE
-echo "export BUILD_ENV_FILE=\"${BUILD_ENV_FILE}\"" >>$BUILD_ENV_FILE
-echo "export BUILD_ID=\"${BUILD_ID}\"" >>$BUILD_ENV_FILE
-echo "export BUILD_DATE=\"$(date)\"" >>$BUILD_ENV_FILE
+fn-write-property BUILD_ENV_FILE
+fn-write-property BUILD_ID
+fn-write-property BUILD_PRETTY_DATE
+fn-write-property BUILD_TYPE_NAME
 
 # dump ALL environment variables in case its helpful in documenting or 
 # debugging build results or differences between runs, especially on different machines
@@ -138,3 +161,5 @@ checkForErrorExit $? "Error occurred during publish-eclipse"
 # if all ended well, put "promotion scripts" in known locations
 $SCRIPT_PATH/promote-build.sh CBI $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/promote-build-ouptut.txt
 checkForErrorExit $? "Error occurred during promote-build"
+
+fn-write-property-close
diff --git a/production/parse-logs.sh b/production/parse-logs.sh
index ce300058e..c48d567a5 100644
--- a/production/parse-logs.sh
+++ b/production/parse-logs.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
diff --git a/production/pom-version-updater.sh b/production/pom-version-updater.sh
index 5f599baf2..aebd2bcb7 100644
--- a/production/pom-version-updater.sh
+++ b/production/pom-version-updater.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
diff --git a/production/promote-build.sh b/production/promote-build.sh
index 5506b025c..38d05c886 100644
--- a/production/promote-build.sh
+++ b/production/promote-build.sh
@@ -20,24 +20,29 @@ if [[ -z "$BUILD_TECH" ]]
 case $BUILD_TECH in
 
         'PDE' )
-                echo "promote PDE build"
+                echo "Promote Build from PDE"
                 ;;
 
         'CBI' )
-                echo "promote CBI build"
+                 echo "Promote Build from CBI"
                 # always assume true, for now, until debugged
-                testbuildonly=true;
+                # testbuildonly=true;
+                
                 ;;
         *) echo "ERROR: Invalid argument to $(basename $0)";
            usage;
-           exit 1
+           exit 1;
             ;;
 esac
 
+if [[ -z ${SCRIPT_PATH} ]]
+then
+    SCRIPT_PATH=${PWD}
+fi
 
 source $SCRIPT_PATH/build-functions.sh
 
-source "$2"
+source "$2" 2>/dev/null
 
 
 # The 'workLocation' provides a handy central place to have the
@@ -52,7 +57,14 @@ promoteScriptLocationEclipse=$workLocation/queue
 # directory should normally exist -- best to create first, with committer's ID --
 # but in case not
 mkdir -p "${promoteScriptLocationEclipse}"
-env > env.txt
+#env > env.txt
+
+if [[ -z ${STREAM} || -z ${BUILD_ID} ]]
+then
+    echo "ERROR: This script requires STREAM and BUILD_ID"
+    exit 1
+fi
+
 scriptName=promote-${STREAM}-${BUILD_ID}.sh
 if [[ "${testbuildonly}" == "true" ]]
 then
@@ -64,7 +76,9 @@ ptimestamp=$( date +%Y%m%d%H%M )
 echo "#!/usr/bin/env bash" >  ${promoteScriptLocationEclipse}/${scriptName}
 echo "# promotion script created at $ptimestamp" >>  ${promoteScriptLocationEclipse}/${scriptName}
 # TODO: changed "syncDropLocation" to handle a third parameter (CBI or PDE)
-echo "$workLocation/syncDropLocation.sh $STREAM $BUILD_ID $BUILD_TECH" >> ${promoteScriptLocationEclipse}/${scriptName}
+# And now a fourth ... eBuilder HASHTAG,so won't always have to assume master, and 
+# so the tests can get their own copy.
+echo "$workLocation/syncDropLocation.sh $STREAM $BUILD_ID $BUILD_TECH $AGGR_HASH" >> ${promoteScriptLocationEclipse}/${scriptName}
 
 # we restrict "others" rights for a bit more security or safety from accidents
 chmod -v ug=rwx,o-rwx ${promoteScriptLocationEclipse}/${scriptName}
diff --git a/production/publish-eclipse.sh b/production/publish-eclipse.sh
index b02ddbcf2..b542359da 100644
--- a/production/publish-eclipse.sh
+++ b/production/publish-eclipse.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
diff --git a/production/run-maven-build.sh b/production/run-maven-build.sh
index 0d5a9bc63..d098f1c26 100644
--- a/production/run-maven-build.sh
+++ b/production/run-maven-build.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
diff --git a/production/tag-build-input.sh b/production/tag-build-input.sh
index b109e9785..9c6457fe4 100644
--- a/production/tag-build-input.sh
+++ b/production/tag-build-input.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
diff --git a/production/update-build-input.sh b/production/update-build-input.sh
index a74521196..78e68ef2d 100644
--- a/production/update-build-input.sh
+++ b/production/update-build-input.sh
@@ -16,9 +16,9 @@ pushd $( dirname $0 ) >/dev/null
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 popd >/dev/null
 
-. $SCRIPT_PATH/build-functions.sh
+source $SCRIPT_PATH/build-functions.sh
 
-. "$1"
+source "$1"
 
 
 cd $BUILD_ROOT
diff --git a/scripts/cbi_build.sh b/scripts/cbi_build.sh
index f8a312797..86a4e2862 100755
--- a/scripts/cbi_build.sh
+++ b/scripts/cbi_build.sh
@@ -8,7 +8,7 @@ if [[ ! -e "$BASE/setup.sh" ]]; then
 fi
 
 
-. "$BASE/setup.sh"
+source "$BASE/setup.sh"
 
 if [[ ! -e "${m2settings}" ]]; then
     echo "Copy $HOME/.m2/settings.xml or cbi_settings.tpl to ${m2settings}"