Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-01-27 16:28:58 +0000
committerDavid Williams2013-01-27 16:28:58 +0000
commit6248bddeaba399368c7f821d6b97a991c5f0dfb0 (patch)
tree0195735131eb7ea3e044f6340b554b5ccee91670 /scripts
parent1de7a5622c316dd9182f238cc1aafa8ab5483fca (diff)
downloadeclipse.platform.releng.aggregator-6248bddeaba399368c7f821d6b97a991c5f0dfb0.tar.gz
eclipse.platform.releng.aggregator-6248bddeaba399368c7f821d6b97a991c5f0dfb0.tar.xz
eclipse.platform.releng.aggregator-6248bddeaba399368c7f821d6b97a991c5f0dfb0.zip
Bug 399180 - [CBI] restructure aggregator and output directories
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build_eclipse_org.env17
-rw-r--r--scripts/master-build.sh3
2 files changed, 14 insertions, 6 deletions
diff --git a/scripts/build_eclipse_org.env b/scripts/build_eclipse_org.env
index fb8e8afd..09f450fa 100644
--- a/scripts/build_eclipse_org.env
+++ b/scripts/build_eclipse_org.env
@@ -1,22 +1,33 @@
# default definitions for this branch
-# note, we "override" this, for now, for Eclipse Platform cronjob builds
-export BUILD_ROOT=${BUILD_ROOT:-/shared/eclipse/builds}
export BRANCH=${BRANCH:-master}
export STREAM=${STREAM:-4.3.0}
export BUILD_TYPE=${BUILD_TYPE:-N}
+BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
+eclipseStreamMajor=${STREAM:0:1}
+
+export BUILD_ROOT=${BUILD_ROOT:-${BUILD_HOME}/${eclipseStreamMajor}${BUILD_TYPE}}
+
# Any invocation of Java, Ant, Maven, etc., should use this as default TMP direcotory,
# instead of the default /tmp by using
# -Djava.io.tmpdir=${TMP_DIR}
export TMP_DIR=${TMP_DIR:-${BUILD_ROOT}/tmp}
+# Just in case it doesn't exist yet (it must exist first, or Java will fail)
+mkdir -p ${TMP_DIR}
# these could be machine specific
export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
+# required for when ant is used. Unclear how maven's "antrun" finds its version of Ant,
+# built in? Or system path?
+# But, without the ANT_OPTS, we do get messages about "to get repeatable builds, to ignore sysclasspath"
+export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.8.4}
+export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"}
+#
# 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.
-export MAVEN_OPTS=${MAVEN_OPTS:--Xmx2048m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}}
+export MAVEN_OPTS=${MAVEN_OPTS:--Xmx2048m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR} -Dtycho.localArtifacts=ignore}
export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.0.4/bin}
export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH
diff --git a/scripts/master-build.sh b/scripts/master-build.sh
index ba7bcc88..08ed0b20 100644
--- a/scripts/master-build.sh
+++ b/scripts/master-build.sh
@@ -41,9 +41,6 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
export LOCAL_REPO="${BUILD_ROOT}"/localMavenRepo
-# Just in case it doesn't exist yet
-mkdir -p ${TMP_DIR}
-
# These variables, from original env file, are re-written to BUILD_ENV_FILE,
# with values for this build (some of them computed) partially for documentation, and
# partially so this build can be re-ran or re-started using it, instead of

Back to the top