Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6E68411F70 for ; Thu, 7 Aug 2014 01:45:54 +0000 (UTC) Received: (qmail 97217 invoked by uid 500); 7 Aug 2014 01:45:53 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 97180 invoked by uid 500); 7 Aug 2014 01:45:53 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 97171 invoked by uid 99); 7 Aug 2014 01:45:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Aug 2014 01:45:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3A4909C1923; Thu, 7 Aug 2014 01:45:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pwendell@apache.org To: commits@spark.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: HOTFIX: Support custom Java 7 location Date: Thu, 7 Aug 2014 01:45:53 +0000 (UTC) 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 Authored: Wed Aug 6 18:45:03 2014 -0700 Committer: Patrick Wendell 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