Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-06-30 16:44:26 +0000
committerDavid Williams2015-06-30 16:44:26 +0000
commit0db067c0f3db235736ba14e880ffbcfc270a87f7 (patch)
treeee8ebd63371c6bf6b28b1f5ee58686abeadb6c0d /production/build_eclipse_org.shsource
parent71ada210c5ad4f10232b14870cf9687289f2fa12 (diff)
downloadeclipse.platform.releng.aggregator-0db067c0f3db235736ba14e880ffbcfc270a87f7.tar.gz
eclipse.platform.releng.aggregator-0db067c0f3db235736ba14e880ffbcfc270a87f7.tar.xz
eclipse.platform.releng.aggregator-0db067c0f3db235736ba14e880ffbcfc270a87f7.zip
[releng] misc. synch up with BETA_JAVA9 branch
Diffstat (limited to 'production/build_eclipse_org.shsource')
-rw-r--r--production/build_eclipse_org.shsource13
1 files changed, 7 insertions, 6 deletions
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index 17a2069f0..538a42536 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -27,11 +27,11 @@ export PATCH_BUILD=${PATCH_BUILD:-""}
# which is default behavior
if [[ -n ${PATCH_BUILD} ]]
then
-export ALT_POM_FILE="-f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/pom.xml"
-echo " DEBUG: ALT_POM_FILE: $ALT_POM_FILE"
+ export ALT_POM_FILE="-f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/pom.xml"
+ echo " DEBUG: ALT_POM_FILE: $ALT_POM_FILE"
else
-export ALT_POM_FILE=""
-echo " DEBUG: ALT_POM_FILE: None. Using normal default."
+ export ALT_POM_FILE=""
+ echo " DEBUG: ALT_POM_FILE: None. Using normal default."
fi
@@ -58,6 +58,7 @@ export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=fal
# remember, MaxPermSize is specific to "Oracle VMs". It has to be removed (or over ridden)
# for other VMs or the VM might fail to start due to unrecognized -XX option.
# Normally should not use -Declipse.p2.mirrors=false, especially on a regular basis.
+# doubling Mx in light of Tycho (maven archiver) bug
export MAVEN_OPTS=${MAVEN_OPTS:--Xms2048m -Xmx8192m -Djava.io.tmpdir=${TMP_DIR} -Dtycho.localArtifacts=ignore ${MIRROR_SETTING}}
export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.1.1/bin}
@@ -84,9 +85,9 @@ MAVEN_BREE=-Pbree-libs
#
if [[ $BUILD_TYPE =~ [IMXYP] ]]
then
-SIGNING=${SIGNING:-true}
+ SIGNING=${SIGNING:-true}
else
-SIGNING=${SIGNING:-false}
+ SIGNING=${SIGNING:-false}
fi
# custom, environment specific setting, required to generate java doc correctly for Java 8 additions,

Back to the top