Releng: HIPP: portable location for map file
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index 7244f13..b3a3756 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -30,6 +30,9 @@
# EXPORT:
FETCH_CACHE_LOCATION=${HOME}/gitCache
+# EXPORT:
+MAP_FILE_PATH=${BASEDIR}/releng/map/otdt.map
+
# Base dir for finding previous platform build:
DROPS4=/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4
diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh
index 603cdf6..fa619d8 100644
--- a/releng/build-scripts/build/otdt_prerequisites.sh
+++ b/releng/build-scripts/build/otdt_prerequisites.sh
@@ -30,6 +30,9 @@
# EXPORT:
FETCH_CACHE_LOCATION=/shared/tools/objectteams/gitCache
+# EXPORT:
+MAP_FILE_PATH=/shared/tools/objectteams/releng/map/otdt.map
+
# 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-hipp.sh b/releng/build-scripts/build/otdt_runtests-hipp.sh
index 7ebe7fb..e94c8e3 100755
--- a/releng/build-scripts/build/otdt_runtests-hipp.sh
+++ b/releng/build-scripts/build/otdt_runtests-hipp.sh
@@ -150,7 +150,8 @@
-Ddo.run.tests=${DO_RUN} \
-Ddo.build.all=${DO_BUILD} \
-Dtest.tmpDir=${TEST_TMPDIR} \
- -DfetchCacheLocation=${FETCH_CACHE_LOCATION}"
+ -DfetchCacheLocation=${FETCH_CACHE_LOCATION}
+ -Dmap.file.path=${MAP_FILE_PATH}"
ANT_OPTS="-Xmx1024m"
export ANT_OPTS
diff --git a/releng/build-scripts/build/otdt_runtests.sh b/releng/build-scripts/build/otdt_runtests.sh
index c3fbe8c..f1471f8 100755
--- a/releng/build-scripts/build/otdt_runtests.sh
+++ b/releng/build-scripts/build/otdt_runtests.sh
@@ -156,7 +156,8 @@
-Ddo.run.tests=${DO_RUN} \
-Ddo.build.all=${DO_BUILD} \
-Dtest.tmpDir=${TEST_TMPDIR} \
- -DfetchCacheLocation=${FETCH_CACHE_LOCATION}"
+ -DfetchCacheLocation=${FETCH_CACHE_LOCATION}
+ -Dmap.file.path=${MAP_FILE_PATH}"
ANT_OPTS="-Xmx1024m"
export ANT_OPTS
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 1e3ba2d..0464751 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -15,9 +15,6 @@
# this one is used by eclipse junit tests:
vmargs=-Xmx768m -XX:-UseGCOverheadLimit
-# the map file is expected to be checked out into this location prior to calling the main script:
-map.file.path=/shared/tools/objectteams/releng/map/otdt.map
-
# Version dependent names:
# ------------- insert current versions here ---------------
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 4955c9b..1d873d7 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -31,6 +31,9 @@
test.tmpDir = ${test.tmpDir}
git working area
fetchCacheLocation = ${fetchCacheLocation}
+path to map file (with substitutions):
+ map.file.path = ${map.file.path}
+
------------------------------------------------------------------------------
</echo>
</target>