diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-08-06 18:45:03 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-08-06 18:45:19 -0700 |
| commit | a263a7e9f060b3017142cdae5f1270db9458d8d3 (patch) | |
| tree | 2a308eb6344a0cfcf702524387cbdf41a5cff152 /dev | |
| parent | 4201d2711cd20a2892c40eb11102f73c2f826b2e (diff) | |
| download | spark-a263a7e9f060b3017142cdae5f1270db9458d8d3.tar.gz spark-a263a7e9f060b3017142cdae5f1270db9458d8d3.tar.bz2 spark-a263a7e9f060b3017142cdae5f1270db9458d8d3.zip | |
HOTFIX: Support custom Java 7 location
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/create-release/create-release.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh index 42473629d4..1867cf4ec4 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 \ |