Repository: bigtop Updated Branches: refs/heads/master 76ed7e210 -> 0a75607d7
BIGTOP-2005. Remove SCALA_HOME requirement Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0a75607d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0a75607d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0a75607d Branch: refs/heads/master Commit: 0a75607d7796a12d743acf32ddcc1a43533e9df6 Parents: 76ed7e2 Author: RJ Nowling <[email protected]> Authored: Thu Sep 3 12:20:44 2015 -0500 Committer: RJ Nowling <[email protected]> Committed: Thu Sep 3 12:20:44 2015 -0500 ---------------------------------------------------------------------- bigtop-packages/src/common/kafka/do-component-build | 5 ----- bigtop-packages/src/common/spark/do-component-build | 5 ----- bigtop-packages/src/common/spark/install_spark.sh | 5 ----- bigtop_toolchain/README.md | 1 - bigtop_toolchain/files/jenkins.sh.centos | 1 - bigtop_toolchain/files/jenkins.sh.debian | 1 - bigtop_toolchain/files/jenkins.sh.fedora | 1 - bigtop_toolchain/files/jenkins.sh.opensuse | 1 - packages.gradle | 1 - 9 files changed, 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/bigtop-packages/src/common/kafka/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/kafka/do-component-build b/bigtop-packages/src/common/kafka/do-component-build index 03348b6..eb8d8b3 100644 --- a/bigtop-packages/src/common/kafka/do-component-build +++ b/bigtop-packages/src/common/kafka/do-component-build @@ -18,11 +18,6 @@ set -ex . `dirname ${0}`/bigtop.bom -if [ "x$SCALA_HOME" = "x" ]; then - echo "SCALA_HOME has to be set before the build can run" - exit 2 -fi - BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${HOME} \ -Drepo.maven.org=$IVY_MIRROR_PROP \ -Dreactor.repo=file://${HOME}/.m2/repository \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/bigtop-packages/src/common/spark/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark/do-component-build b/bigtop-packages/src/common/spark/do-component-build index deecbe2..3d705a5 100644 --- a/bigtop-packages/src/common/spark/do-component-build +++ b/bigtop-packages/src/common/spark/do-component-build @@ -18,11 +18,6 @@ set -ex . `dirname $0`/bigtop.bom -if [ "x$SCALA_HOME" = "x" ]; then - echo "SCALA_HOME has to be set before the build can run" - exit 2 -fi - BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${HOME} \ -Drepo.maven.org=$IVY_MIRROR_PROP \ -Dreactor.repo=file://${HOME}/.m2/repository \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/bigtop-packages/src/common/spark/install_spark.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark/install_spark.sh b/bigtop-packages/src/common/spark/install_spark.sh index 78d13b3..85078ae 100644 --- a/bigtop-packages/src/common/spark/install_spark.sh +++ b/bigtop-packages/src/common/spark/install_spark.sh @@ -102,10 +102,6 @@ for var in PREFIX BUILD_DIR SOURCE_DIR; do fi done -if [ -z "${SCALA_HOME}" ]; then - echo Missing env. var SCALA_HOME - usage -fi if [ -f "$SOURCE_DIR/bigtop.bom" ]; then . $SOURCE_DIR/bigtop.bom fi @@ -117,7 +113,6 @@ INSTALLED_LIB_DIR=${INSTALLED_LIB_DIR:-/usr/lib/spark} EXAMPLES_DIR=${EXAMPLES_DIR:-$DOC_DIR/examples} BIN_DIR=${BIN_DIR:-/usr/bin} CONF_DIR=${CONF_DIR:-/etc/spark/conf.dist} -SCALA_HOME=${SCALA_HOME:-/usr/share/scala} PYSPARK_PYTHON=${PYSPARK_PYTHON:-python} install -d -m 0755 $PREFIX/$LIB_DIR http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/bigtop_toolchain/README.md ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/README.md b/bigtop_toolchain/README.md index bef3dc5..8277984 100644 --- a/bigtop_toolchain/README.md +++ b/bigtop_toolchain/README.md @@ -60,7 +60,6 @@ building BigTop: MAVEN_HOME=/usr/local/maven JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk.x86_64 ANT_HOME=/usr/local/ant -SCALA_HOME=/usr/share/java GRADLE_HOME=/usr/local/gradle PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$GRADLE_HOME/bin:$PATH ``` http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/bigtop_toolchain/files/jenkins.sh.centos ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.centos b/bigtop_toolchain/files/jenkins.sh.centos index c168876..badb18c 100644 --- a/bigtop_toolchain/files/jenkins.sh.centos +++ b/bigtop_toolchain/files/jenkins.sh.centos @@ -16,7 +16,6 @@ export MAVEN_HOME=/usr/local/maven export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk.x86_64 export ANT_HOME=/usr/local/ant -export SCALA_HOME=/usr/share/java export GRADLE_HOME=/usr/local/gradle export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$GRADLE_HOME/bin:$PATH http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/bigtop_toolchain/files/jenkins.sh.debian ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.debian b/bigtop_toolchain/files/jenkins.sh.debian index ccb31d7..65217fe 100644 --- a/bigtop_toolchain/files/jenkins.sh.debian +++ b/bigtop_toolchain/files/jenkins.sh.debian @@ -16,7 +16,6 @@ export MAVEN_HOME=/usr/local/maven export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64 export ANT_HOME=/usr/local/ant -export SCALA_HOME=/usr/share/java export GRADLE_HOME=/usr/local/gradle export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$GRADLE_HOME/bin:$PATH http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/bigtop_toolchain/files/jenkins.sh.fedora ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.fedora b/bigtop_toolchain/files/jenkins.sh.fedora index 2dc8e14..6de7981 100644 --- a/bigtop_toolchain/files/jenkins.sh.fedora +++ b/bigtop_toolchain/files/jenkins.sh.fedora @@ -16,7 +16,6 @@ export MAVEN_HOME=/usr/local/maven export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk export ANT_HOME=/usr/local/ant -export SCALA_HOME=/usr/share/java export GRADLE_HOME=/usr/local/gradle export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$GRADLE_HOME/bin:$PATH http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/bigtop_toolchain/files/jenkins.sh.opensuse ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/files/jenkins.sh.opensuse b/bigtop_toolchain/files/jenkins.sh.opensuse index b716d90..508cf5d 100644 --- a/bigtop_toolchain/files/jenkins.sh.opensuse +++ b/bigtop_toolchain/files/jenkins.sh.opensuse @@ -16,7 +16,6 @@ export MAVEN_HOME=/usr/local/maven export JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk export ANT_HOME=/usr/local/ant -export SCALA_HOME=/usr/share/java export GRADLE_HOME=/usr/local/gradle export PATH=$MAVEN_HOME/bin:$ANT_HOME/bin:$FORREST_HOME/bin:$GRADLE_HOME/bin:$PATH http://git-wip-us.apache.org/repos/asf/bigtop/blob/0a75607d/packages.gradle ---------------------------------------------------------------------- diff --git a/packages.gradle b/packages.gradle index 7014455..74b84d9 100644 --- a/packages.gradle +++ b/packages.gradle @@ -274,7 +274,6 @@ def genTasks = { target, variable -> --preserve-envvar MAVEN3_HOME \ --preserve-envvar MAVEN_OPTS \ --preserve-envvar JAVA_HOME \ ---preserve-envvar SCALA_HOME \ --set-envvar=${variable}_BASE_VERSION=$BASE_VERSION \ --set-envvar=${variable}_VERSION=$PKG_VERSION \ --set-envvar=${variable}_RELEASE=$BIGTOP_BUILD_STAMP \
