diff options
| author | Stephan Herrmann | 2016-10-31 23:29:19 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2016-11-22 18:17:29 +0000 |
| commit | 37a24bc0dfde9acf024d9b8229f4d93eb83e35aa (patch) | |
| tree | 8adcb947d7e9c49136b714548da3a37a09cc88ae | |
| parent | 391ea9e008b8e2fc2425536122d5e2f8d647c4c3 (diff) | |
| download | org.eclipse.objectteams-37a24bc0dfde9acf024d9b8229f4d93eb83e35aa.tar.gz org.eclipse.objectteams-37a24bc0dfde9acf024d9b8229f4d93eb83e35aa.tar.xz org.eclipse.objectteams-37a24bc0dfde9acf024d9b8229f4d93eb83e35aa.zip | |
Releng: HIPP: set gitCache location only from prereqs
5 files changed, 8 insertions, 3 deletions
diff --git a/releng/build-scripts/build/build.xml b/releng/build-scripts/build/build.xml index a5e3f2f6e..99b822f82 100644 --- a/releng/build-scripts/build/build.xml +++ b/releng/build-scripts/build/build.xml @@ -25,6 +25,8 @@ configs: what to build baseos, basews, basearch: what platform we're on + fetchCacheLocation + --> <loadproperties srcfile="${OTScriptDir}/buildVersions.properties" /> <loadproperties srcfile="${builder}/build.properties" /> @@ -45,6 +47,7 @@ <!--set the compiler and compiler arguments--> <!--the default compiler is set to the one used by eclipse rel. eng. --> + <property name="fetchCacheLocation" value="${fetchCacheLocation}" /> <loadproperties srcfile="${OTScriptDir}/compiler.${component.short}.properties" /> <echo message="javacSource=${javacSource}" /> diff --git a/releng/build-scripts/build/compiler.OT-Compiler.properties b/releng/build-scripts/build/compiler.OT-Compiler.properties index 1158ef8bd..5b0a8b2f4 100644 --- a/releng/build-scripts/build/compiler.OT-Compiler.properties +++ b/releng/build-scripts/build/compiler.OT-Compiler.properties @@ -7,5 +7,4 @@ javacSource=1.6 javacTarget=1.6 javacDebugInfo=true javacFailOnError=true -fetchCacheLocation=/shared/tools/objectteams/gitCache diff --git a/releng/build-scripts/build/compiler.OTDT-Build.properties b/releng/build-scripts/build/compiler.OTDT-Build.properties index 0235c1d78..ae579e778 100644 --- a/releng/build-scripts/build/compiler.OTDT-Build.properties +++ b/releng/build-scripts/build/compiler.OTDT-Build.properties @@ -7,5 +7,4 @@ javacSource=1.6 javacTarget=1.6 javacDebugInfo=true javacFailOnError=true -fetchCacheLocation=/shared/tools/objectteams/gitCache diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh index 31b44cb74..54f17735f 100644 --- a/releng/build-scripts/build/otdt_prerequisites.sh +++ b/releng/build-scripts/build/otdt_prerequisites.sh @@ -27,6 +27,9 @@ TEST_TMPDIR="/tmp/objectteams" # EXPORT: directory for metadata from previous builds: METADATA="${BASEDIR}/metadata" +# EXPORT: +FETCH_CACHE_LOCATION=/shared/tools/objectteams/gitCache + # EXPORT: mail address to receive notification about build result (currently only build failures): OT_RECIPIENT="nobody@nowhere.net" diff --git a/releng/build-scripts/build/otdt_runtests.sh b/releng/build-scripts/build/otdt_runtests.sh index 0f25c4b09..c3fbe8c5f 100755 --- a/releng/build-scripts/build/otdt_runtests.sh +++ b/releng/build-scripts/build/otdt_runtests.sh @@ -155,7 +155,8 @@ ANT_OPTIONS="${ANT_PROFILE} \ -Dpublished.updates=${PUBLISHED_UPDATES} \ -Ddo.run.tests=${DO_RUN} \ -Ddo.build.all=${DO_BUILD} \ - -Dtest.tmpDir=${TEST_TMPDIR}" + -Dtest.tmpDir=${TEST_TMPDIR} \ + -DfetchCacheLocation=${FETCH_CACHE_LOCATION}" ANT_OPTS="-Xmx1024m" export ANT_OPTS |