spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pwend...@apache.org
Subject git commit: HOTFIX: Support custom Java 7 location
Date Thu, 07 Aug 2014 01:45:53 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.1 40284a9a3 -> 53fa0486a


HOTFIX: Support custom Java 7 location


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/53fa0486
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/53fa0486
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/53fa0486

Branch: refs/heads/branch-1.1
Commit: 53fa0486af202b76dfea08d541c5d874731f81fb
Parents: 40284a9
Author: Patrick Wendell <pwendell@gmail.com>
Authored: Wed Aug 6 18:45:03 2014 -0700
Committer: Patrick Wendell <pwendell@gmail.com>
Committed: Wed Aug 6 18:45:36 2014 -0700

----------------------------------------------------------------------
 dev/create-release/create-release.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/53fa0486/dev/create-release/create-release.sh
----------------------------------------------------------------------
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh
index 4247362..1867cf4 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -35,6 +35,12 @@ RELEASE_VERSION=${RELEASE_VERSION:-1.0.0}
 RC_NAME=${RC_NAME:-rc2}
 USER_NAME=${USER_NAME:-pwendell}
 
+if [ -z "$JAVA_HOME" ]; then
+  echo "Error: JAVA_HOME is not set, cannot proceed."
+  exit -1
+fi
+JAVA_7_HOME=${JAVA_7_HOME:-$JAVA_HOME}
+
 set -e
 
 GIT_TAG=v$RELEASE_VERSION-$RC_NAME
@@ -130,7 +136,8 @@ scp spark-* \
 cd spark
 sbt/sbt clean
 cd docs
-PRODUCTION=1 jekyll build
+# Compile docs with Java 7 to use nicer format
+JAVA_HOME=$JAVA_7_HOME PRODUCTION=1 jekyll build
 echo "Copying release documentation"
 rc_docs_folder=${rc_folder}-docs
 ssh $USER_NAME@people.apache.org \


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message