Bug 395158 - [CBI] Gather up the compiler output

A little restructuring so that I can use the standard calls in
helper.xml

3 files changed, 56 insertions, 5 deletions

diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index b34545621..aa2507056 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -159,7 +159,7 @@ fn-build-dir () {
 	ROOT="$1"; shift
 	BRANCH="$1"; shift
 	BUILD_ID="$1"; shift
-	echo $ROOT/$BRANCH/dirs/$BUILD_ID
+	echo $ROOT/$BRANCH/dirs/$BUILD_ID/$BUILD_ID
 }
 
 # USAGE: fn-basebuilder-dir ROOT BRANCH BASEBUILDER_TAG
@@ -590,7 +590,10 @@ fn-parse-compile-logs () {
 	java -jar "$BASEBUILDER_LAUNCHER" \
 	-application org.eclipse.ant.core.antRunner \
 	-buildfile "$ANT_SCRIPT" \
-	-DbuildDirectory="$BUILD_DIR"
+	-DbuildDirectory=$( dirname "$BUILD_DIR" ) \
+	-DbuildId="$BUILD_ID" \
+	-DbuildLabel="$BUILD_ID" \
+	verifyCompile
 	popd
 }
 
diff --git a/scripts/master-build.sh b/scripts/master-build.sh
index 66c1fb815..74f0a4647 100644
--- a/scripts/master-build.sh
+++ b/scripts/master-build.sh
@@ -61,7 +61,7 @@ popd
 
 
 /bin/bash $SCRIPT_PATH/run-maven-build.sh $BUILD_ENV_FILE
-/bin/bash $SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE
-/bin/bash $SCRIPT_PATH/parse-logs.sh $BUILD_ENV_FILE
-
+#/bin/bash $SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE
+#/bin/bash $SCRIPT_PATH/parse-logs.sh $BUILD_ENV_FILE
+/bin/bash $SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE
 
diff --git a/scripts/publish-eclipse.sh b/scripts/publish-eclipse.sh
new file mode 100644
index 000000000..6122b4f67
--- /dev/null
+++ b/scripts/publish-eclipse.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+
+if [ $# -ne 1 ]; then
+	echo USAGE: $0 env_file
+	exit 1
+fi
+
+if [ ! -r "$1" ]; then
+	echo "$1" cannot be read
+	echo USAGE: $0 env_file
+	exit 1
+fi
+
+pushd $( dirname $0 ) >/dev/null
+SCRIPT_PATH=$(pwd)
+popd >/dev/null
+
+. $SCRIPT_PATH/build-functions.sh
+
+. "$1"
+
+
+cd $BUILD_ROOT
+
+# derived values
+gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
+aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
+repositories=$( echo $SCRIPT_PATH/repositories.txt )
+
+
+if [ -z "$BUILD_ID" ]; then
+	BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
+fi
+
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
+
+fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"
+
+launcherJar=$( fn-basebuilder-launcher "$basebuilderDir" )
+
+fn-gather-compile-logs "$BUILD_ID" "$aggDir" "$buildDirectory"
+fn-parse-compile-logs "$BUILD_ID" \
+"$aggDir"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml \
+"$buildDirectory" "$launcherJar"
+
+