Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-01-27 16:30:05 -0500
committerDavid Williams2013-01-27 16:30:05 -0500
commitf909b0c7bf6d5a4715fc10abb2f869e602757124 (patch)
tree61ed5b6145ec41733ad201a946dc9943a348a54a /scripts
parent8f2e74478c7a6d264fb33bfe0c56752550b9d8da (diff)
downloadeclipse.platform.releng.aggregator-f909b0c7bf6d5a4715fc10abb2f869e602757124.tar.gz
eclipse.platform.releng.aggregator-f909b0c7bf6d5a4715fc10abb2f869e602757124.tar.xz
eclipse.platform.releng.aggregator-f909b0c7bf6d5a4715fc10abb2f869e602757124.zip
Bug 399180 - [CBI] restructure aggregator and output directories
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-functions.sh11
-rw-r--r--scripts/gather-parts.sh2
-rw-r--r--scripts/master-build.sh2
-rw-r--r--scripts/parse-logs.sh2
-rw-r--r--scripts/pom-version-updater.sh2
-rw-r--r--scripts/publish-eclipse.sh2
6 files changed, 14 insertions, 7 deletions
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index 8120870f..67841f8c 100755
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -227,7 +227,14 @@ fn-build-dir ()
ROOT="$1"; shift
BRANCH="$1"; shift
BUILD_ID="$1"; shift
- echo $ROOT/$BRANCH/dirs/$BUILD_ID
+ STREAM="$1"; shift
+ eclipseStreamMajor=${STREAM:0:1}
+ dropDirSegment=siteDir/eclipse/downloads/dropscbibased
+ if [[ $eclipseStreamMajor > 3 ]]
+ then
+ dropDirSegment=siteDir/eclipse/downloads/drops4cbibased
+ fi
+ echo $ROOT/$BRANCH/$dropDirSegment/$BUILD_ID
}
# USAGE: fn-basebuilder-dir ROOT BRANCH BASEBUILDER_TAG
@@ -239,7 +246,7 @@ fn-basebuilder-dir ()
ROOT="$1"; shift
BRANCH="$1"; shift
BASEBUILDER_TAG="$1"; shift
- echo $ROOT/$BRANCH/org.eclipse.releng.basebuilder_$BASEBUILDER_TAG
+ echo $ROOT/org.eclipse.releng.basebuilder_$BASEBUILDER_TAG
}
diff --git a/scripts/gather-parts.sh b/scripts/gather-parts.sh
index 79488a16..a3206b66 100644
--- a/scripts/gather-parts.sh
+++ b/scripts/gather-parts.sh
@@ -33,7 +33,7 @@ if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
fi
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM")
basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"
diff --git a/scripts/master-build.sh b/scripts/master-build.sh
index 08ed0b20..afe378a7 100644
--- a/scripts/master-build.sh
+++ b/scripts/master-build.sh
@@ -28,7 +28,7 @@ cd $BUILD_ROOT
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
logsDirectory="${buildDirectory}/buildlogs"
mkdir -p "${logsDirectory}"
checkForErrorExit $? "Could not create buildlogs directory"
diff --git a/scripts/parse-logs.sh b/scripts/parse-logs.sh
index 1c2fb714..69bdc49b 100644
--- a/scripts/parse-logs.sh
+++ b/scripts/parse-logs.sh
@@ -33,7 +33,7 @@ if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
fi
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "${STREAM}" )
basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"
diff --git a/scripts/pom-version-updater.sh b/scripts/pom-version-updater.sh
index bd7a71ac..8a4ab0ec 100644
--- a/scripts/pom-version-updater.sh
+++ b/scripts/pom-version-updater.sh
@@ -26,7 +26,7 @@ cd $BUILD_ROOT
# derived values
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
diff --git a/scripts/publish-eclipse.sh b/scripts/publish-eclipse.sh
index cd946b4f..97085e9f 100644
--- a/scripts/publish-eclipse.sh
+++ b/scripts/publish-eclipse.sh
@@ -33,7 +33,7 @@ if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
fi
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"

Back to the top