From 1309b2e3865e410e07b3d001e11f10c1413d0917 Mon Sep 17 00:00:00 2001
From: David Williams
Date: Wed, 5 Jun 2013 02:05:40 -0400
Subject: Bug 409817 - All API Tools reports are missing

work in test branch: david_williams/apitooling---
 .../eclipse/buildScripts/api-tools-builder.xml              | 13 +++++++++----
 production/build-functions.shsource                         |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
index 117703447..1d50f9f12 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/buildScripts/api-tools-builder.xml
@@ -33,7 +33,7 @@
         <property name="current_location"  value="${buildDirectory}/${buildLabel}/eclipse-SDK-${buildLabel}-win32.zip" />
 
 		<!-- we would have to fetch the baseline we wanted, or perhaps just link to its location -->
-        <property name="baseline" value="${reference}/${previousBaselineName}" />
+        <property name="baseline" value="${reference}/${previousBaselineFilename}" />
         
 		<!-- create properties for the filters -->
         <property name="exclude_list_location" value="${EBuilderDir}/eclipse/apiexclude/exclude_list.txt" />
@@ -111,8 +111,13 @@
         <!-- The name for the build - i.e. I20130603-2000 -->
         <fail unless="buildLabel" message="buildLabel must be provided."/>
         
-        <!-- The on-disk location of the previous Eclipse build - for example Eclipse 4.2.2 -->
-        <fail unless="previousBaselineName" message="previousBaselineName must be provided"/>
+        <fail unless="previousBaselineFilename" message="previousBaselineFilename must be provided"/>
+        
+        <!-- 
+          The ?on-disk? location of the previous Eclipse build - for example Eclipse 4.2.2 
+          If not defined, assume same as file name ... otherwise, assume can be used for "human readable name"?
+        -->
+        <property name="previousBaselineName" value="${previousBaselineFilename}"/>
         
         <fail unless="previousBaseURL" message="full URL of previous build must be provided" /> 
         
@@ -124,7 +129,7 @@
         <mkdir dir="${reference}"/>
         
         <get dest="${reference}" src="${previousBaseURL}"/>
-        <untar src="${reference}/${previousBaselineName}" dest="${reference}" compression="gzip" />
+        <untar src="${reference}/${previousBaselineFilename}" dest="${reference}" compression="gzip" />
         
         <property name="apitoolinginitialized" value="true"/>
 
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 3aa95b953..f4dfeddfc 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -980,7 +980,8 @@ fn-summarize-apitooling ()
         -DbuildId="$BUILD_ID" \
         -DbuildLabel="$BUILD_ID" \
         -DpreviousBaseURL="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.2-201302041200/eclipse-SDK-4.2.2-linux-gtk-x86_64.tar.gz" \
-        -DpreviousBaselineName="eclipse-SDK-4.2.2-linux-gtk-x86_64.tar.gz" \
+        -DpreviousBaselineName="Eclipse SDK 4.2.2" \
+        -DpreviousBaselineFilename="eclipse-SDK-4.2.2-linux-gtk-x86_64.tar.gz" \
         -Djava.io.tmpdir=$TMP_DIR \
         apiToolsReports
     popd
-- 
cgit v1.2.3