diff options
author | Sravan Kumar Lakkimsetti | 2017-01-18 09:05:18 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2017-01-18 09:06:38 +0000 |
commit | 3c2117cf08fe2b8d245dcf7b125580d8fed49b29 (patch) | |
tree | 476e49e2b2541f424d08552feefb88fb163815d3 /production/build-functions.shsource | |
parent | 33020bfb5f35568e694220cc14950f7da8a9b92c (diff) | |
download | eclipse.platform.releng.aggregator-3c2117cf08fe2b8d245dcf7b125580d8fed49b29.tar.gz eclipse.platform.releng.aggregator-3c2117cf08fe2b8d245dcf7b125580d8fed49b29.tar.xz eclipse.platform.releng.aggregator-3c2117cf08fe2b8d245dcf7b125580d8fed49b29.zip |
Bug 510612 - Use separate temp directory for Maven
operations defined by MAVEN_TMP_DIR
Change-Id: I537312eaa52ddb539f86cbece94659b21a9afee7
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'production/build-functions.shsource')
-rwxr-xr-x | production/build-functions.shsource | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource index 3dfbf9d34..18c1dd34f 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -372,6 +372,9 @@ fn-maven-build-aggregator () MARGS="$MARGS ${MAVEN_BREE}" + export MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}} + mkdir -p ${MAVEN_TMP_DIR} + # Here we count on $BUILD_TYPE being exported. TODO: make parameter later? if [[ -n "$BUILD_TYPE" && "$BUILD_TYPE" == "N" ]] then @@ -425,7 +428,7 @@ fn-maven-build-aggregator () clean verify \ -DskipTests=true \ -Dmaven.repo.local=$LOCAL_REPO $CBI_JDT_REPO_URL_ARG $CBI_JDT_VERSION_ARG \ - -Dtycho.debug.artifactcomparator \ + -Dtycho.debug.artifactcomparator -Djava.io.tmpdir=${MAVEN_TMP_DIR}\ -Dcbi.jarsigner.continueOnFail=true -Djgit.dirtyWorkingTree=error \ -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE" ${FORCEQUALIFIERARG} ${CODE_WARNINGS} ${JAVA_DOC_TOOL} rc=$? @@ -599,15 +602,22 @@ fn-pom-version-updater () echo "DEBUG: DEBUG: $DEBUG" echo "DEBUG: QUIET: $QUIET" echo "DEBUG: MARGS: $MARGS" + + export MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}} + mkdir -p ${MAVEN_TMP_DIR} + # fail fast if not set up correctly rc=$(fn-check-dir-exists TMP_DIR) checkForErrorExit "$rc" "$rc" + rc=$(fn-check-dir-exists MAVEN_TMP_DIR) + checkForErrorExit "$rc" "$rc" + report=${TMP_DIR}/pom_${BUILD_ID}.txt pushd "$REPO_DIR" mvn ${MAVEN_SETTINGS} $MARGS ${ALT_POM_FILE} \ org.eclipse.tycho:tycho-versions-plugin:0.26.0:update-pom \ - -Dmaven.repo.local=$LOCAL_REPO \ + -Dmaven.repo.local=$LOCAL_REPO -Djava.io.tmpdir=${MAVEN_TMP_DIR}\ -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE" RC=$? if [[ $RC != 0 ]] |