aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@linaro.org>2015-10-30 09:10:46 +0000
committerSteve Capper <steve.capper@linaro.org>2015-10-30 09:32:44 +0000
commitd680ec140e44ced01f9491d53de5ca428fef8129 (patch)
tree267a0f956fd5bde1ae94303f9ef34056a51bc09c
parent4c9974c243496ab7d233616fe113959c519a481d (diff)
PIG: Correct usage of ANT_OPTS in BigTop
ANT_OPTS is incorrectly overridden rather than appended to. This means we can't set our own ANT_OPTS (i.e. to test JVM settings). This patch switches the logic in do-component-build to append to ANT_OPTS. Signed-off-by: Steve Capper <steve.capper@linaro.org>
-rw-r--r--bigtop-packages/src/common/pig/do-component-build2
1 files changed, 1 insertions, 1 deletions
diff --git a/bigtop-packages/src/common/pig/do-component-build b/bigtop-packages/src/common/pig/do-component-build
index 5c210a38..4a55d54e 100644
--- a/bigtop-packages/src/common/pig/do-component-build
+++ b/bigtop-packages/src/common/pig/do-component-build
@@ -58,7 +58,7 @@ done
echo "forrest.maxmemory=256m" >> src/docs/forrest.properties
-export ANT_OPTS="-Xmx4096m"
+export ANT_OPTS="-Xmx4096m $ANT_OPTS"
ant $BUILD_OPTS clean published pigunit-jar smoketests-jar javadoc "$@"
for build_file in contrib/piggybank/java/build.xml ; do
ant $BUILD_OPTS -buildfile $build_file clean jar "$@"