Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-01-21 00:35:53 -0500
committerDavid Williams2013-01-21 00:38:23 -0500
commitbbaa9b21e2dd014c796c6fc2c1ed1894a8d7c696 (patch)
treec47d2bcaeae009b7b18fc657d7235a14f17b52d7
parent3f999880970c7d0fdfa3e7c5d6faebcb3580c12e (diff)
downloadeclipse.platform.releng.aggregator-bbaa9b21e2dd014c796c6fc2c1ed1894a8d7c696.tar.gz
eclipse.platform.releng.aggregator-bbaa9b21e2dd014c796c6fc2c1ed1894a8d7c696.tar.xz
eclipse.platform.releng.aggregator-bbaa9b21e2dd014c796c6fc2c1ed1894a8d7c696.zip
Bug 398605 - localMavenRepo is stored under gitCache
-rw-r--r--scripts/install-parent.sh8
-rw-r--r--scripts/master-build.sh6
-rw-r--r--scripts/pom-version-updater.sh3
-rw-r--r--scripts/run-maven-build.sh9
4 files changed, 12 insertions, 14 deletions
diff --git a/scripts/install-parent.sh b/scripts/install-parent.sh
index c5ddf0a6..e7c32b99 100644
--- a/scripts/install-parent.sh
+++ b/scripts/install-parent.sh
@@ -27,17 +27,15 @@ cd $BUILD_ROOT
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
signingDir=$( fn-git-dir "$gitCache" "$SIGNING_REPO" )
-localRepo=$gitCache/localMavenRepo
-
if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
fi
if $SIGNING; then
- fn-maven-signer-install "$signingDir" "$localRepo"
+ fn-maven-signer-install "$signingDir" "$LOCAL_REPO"
fi
-fn-maven-parent-install "$aggDir" "$localRepo"
-fn-maven-cbi-install "$aggDir" "$localRepo"
+fn-maven-parent-install "$aggDir" "$LOCAL_REPO"
+fn-maven-cbi-install "$aggDir" "$LOCAL_REPO"
diff --git a/scripts/master-build.sh b/scripts/master-build.sh
index aaa9af33..e7ad19c1 100644
--- a/scripts/master-build.sh
+++ b/scripts/master-build.sh
@@ -39,7 +39,7 @@ exec >>$LOG 2>&1
BUILD_ENV_FILE=$logsDirectory/$BUILD_ID.env
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-localRepo=$gitCache/localMavenRepo
+export LOCAL_REPO="${BUILD_ROOT}"/localMavenRepo
# Just in case it doesn't exist yet
mkdir -p ${TMP_DIR}
@@ -71,8 +71,10 @@ 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
# any value of interest/usefulness can be added to BUILD_ENV_FILE
-echo "export BUILD_ENV_FILE=\"${1}\"" >>$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
diff --git a/scripts/pom-version-updater.sh b/scripts/pom-version-updater.sh
index daf737d1..bd7a71ac 100644
--- a/scripts/pom-version-updater.sh
+++ b/scripts/pom-version-updater.sh
@@ -26,13 +26,12 @@ cd $BUILD_ROOT
# derived values
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-localRepo=$gitCache/localMavenRepo
buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
fi
-fn-pom-version-updater "$aggDir" "$localRepo"
+fn-pom-version-updater "$aggDir" "$LOCAL_REPO"
fn-pom-version-report "$BUILD_ID" "$aggDir" "$buildDirectory"
diff --git a/scripts/run-maven-build.sh b/scripts/run-maven-build.sh
index e8bd78e1..66303f44 100644
--- a/scripts/run-maven-build.sh
+++ b/scripts/run-maven-build.sh
@@ -27,7 +27,6 @@ cd $BUILD_ROOT
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
signingDir=$( fn-git-dir "$gitCache" "$SIGNING_REPO" )
-localRepo=$gitCache/localMavenRepo
if [ -z "$BUILD_ID" ]; then
@@ -35,11 +34,11 @@ if [ -z "$BUILD_ID" ]; then
fi
if $SIGNING; then
- fn-maven-signer-install "$signingDir" "$localRepo"
+ fn-maven-signer-install "$signingDir" "$LOCAL_REPO"
fi
-fn-maven-parent-install "$aggDir" "$localRepo"
+fn-maven-parent-install "$aggDir" "$LOCAL_REPO"
-fn-maven-cbi-install "$aggDir" "$localRepo"
+fn-maven-cbi-install "$aggDir" "$LOCAL_REPO"
-fn-maven-build-aggregator "$BUILD_ID" "$aggDir" "$localRepo" $COMPARATOR $SIGNING $UPDATE_BRANDING $MAVEN_BREE
+fn-maven-build-aggregator "$BUILD_ID" "$aggDir" "$LOCAL_REPO" $COMPARATOR $SIGNING $UPDATE_BRANDING $MAVEN_BREE

Back to the top