You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/04/06 11:11:26 UTC
spark git commit: [SPARK-6673] spark-shell.cmd can't start in Windows
even when spark was built
Repository: spark
Updated Branches:
refs/heads/master 0b5d028a9 -> 49f38824a
[SPARK-6673] spark-shell.cmd can't start in Windows even when spark was built
added equivalent script to load-spark-env.sh
Author: Masayoshi TSUZUKI <ts...@oss.nttdata.co.jp>
Closes #5328 from tsudukim/feature/SPARK-6673 and squashes the following commits:
aaefb19 [Masayoshi TSUZUKI] removed dust.
be3405e [Masayoshi TSUZUKI] [SPARK-6673] spark-shell.cmd can't start in Windows even when spark was built
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/49f38824
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/49f38824
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/49f38824
Branch: refs/heads/master
Commit: 49f38824a4770fc9017e6cc9b1803c4543b0c081
Parents: 0b5d028
Author: Masayoshi TSUZUKI <ts...@oss.nttdata.co.jp>
Authored: Mon Apr 6 10:11:20 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Mon Apr 6 10:11:20 2015 +0100
----------------------------------------------------------------------
bin/load-spark-env.cmd | 59 +++++++++++++++++++++++++++++++++++++++++++++
bin/pyspark2.cmd | 3 +--
bin/run-example2.cmd | 3 +--
bin/spark-class2.cmd | 3 +--
4 files changed, 62 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/49f38824/bin/load-spark-env.cmd
----------------------------------------------------------------------
diff --git a/bin/load-spark-env.cmd b/bin/load-spark-env.cmd
new file mode 100644
index 0000000..36d932c
--- /dev/null
+++ b/bin/load-spark-env.cmd
@@ -0,0 +1,59 @@
+@echo off
+
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+rem This script loads spark-env.cmd if it exists, and ensures it is only loaded once.
+rem spark-env.cmd is loaded from SPARK_CONF_DIR if set, or within the current directory's
+rem conf/ subdirectory.
+
+if [%SPARK_ENV_LOADED%] == [] (
+ set SPARK_ENV_LOADED=1
+
+ if not [%SPARK_CONF_DIR%] == [] (
+ set user_conf_dir=%SPARK_CONF_DIR%
+ ) else (
+ set user_conf_dir=%~dp0..\..\conf
+ )
+
+ call :LoadSparkEnv
+)
+
+rem Setting SPARK_SCALA_VERSION if not already set.
+
+set ASSEMBLY_DIR2=%SPARK_HOME%/assembly/target/scala-2.11
+set ASSEMBLY_DIR1=%SPARK_HOME%/assembly/target/scala-2.10
+
+if [%SPARK_SCALA_VERSION%] == [] (
+
+ if exist %ASSEMBLY_DIR2% if exist %ASSEMBLY_DIR1% (
+ echo "Presence of build for both scala versions(SCALA 2.10 and SCALA 2.11) detected."
+ echo "Either clean one of them or, set SPARK_SCALA_VERSION=2.11 in spark-env.cmd."
+ exit 1
+ )
+ if exist %ASSEMBLY_DIR2% (
+ set SPARK_SCALA_VERSION=2.11
+ ) else (
+ set SPARK_SCALA_VERSION=2.10
+ )
+)
+exit /b 0
+
+:LoadSparkEnv
+if exist "%user_conf_dir%\spark-env.cmd" (
+ call "%user_conf_dir%\spark-env.cmd"
+)
http://git-wip-us.apache.org/repos/asf/spark/blob/49f38824/bin/pyspark2.cmd
----------------------------------------------------------------------
diff --git a/bin/pyspark2.cmd b/bin/pyspark2.cmd
index 4f5eb5e..09b4149 100644
--- a/bin/pyspark2.cmd
+++ b/bin/pyspark2.cmd
@@ -20,8 +20,7 @@ rem
rem Figure out where the Spark framework is installed
set SPARK_HOME=%~dp0..
-rem Load environment variables from conf\spark-env.cmd, if it exists
-if exist "%SPARK_HOME%\conf\spark-env.cmd" call "%SPARK_HOME%\conf\spark-env.cmd"
+call %SPARK_HOME%\bin\load-spark-env.cmd
rem Figure out which Python to use.
if "x%PYSPARK_DRIVER_PYTHON%"=="x" (
http://git-wip-us.apache.org/repos/asf/spark/blob/49f38824/bin/run-example2.cmd
----------------------------------------------------------------------
diff --git a/bin/run-example2.cmd b/bin/run-example2.cmd
index b49d0dc..c3e0221 100644
--- a/bin/run-example2.cmd
+++ b/bin/run-example2.cmd
@@ -25,8 +25,7 @@ set FWDIR=%~dp0..\
rem Export this as SPARK_HOME
set SPARK_HOME=%FWDIR%
-rem Load environment variables from conf\spark-env.cmd, if it exists
-if exist "%FWDIR%conf\spark-env.cmd" call "%FWDIR%conf\spark-env.cmd"
+call %SPARK_HOME%\bin\load-spark-env.cmd
rem Test that an argument was given
if not "x%1"=="x" goto arg_given
http://git-wip-us.apache.org/repos/asf/spark/blob/49f38824/bin/spark-class2.cmd
----------------------------------------------------------------------
diff --git a/bin/spark-class2.cmd b/bin/spark-class2.cmd
index 4ce727b..4b3401d 100644
--- a/bin/spark-class2.cmd
+++ b/bin/spark-class2.cmd
@@ -20,8 +20,7 @@ rem
rem Figure out where the Spark framework is installed
set SPARK_HOME=%~dp0..
-rem Load environment variables from conf\spark-env.cmd, if it exists
-if exist "%SPARK_HOME%\conf\spark-env.cmd" call "%SPARK_HOME%\conf\spark-env.cmd"
+call %SPARK_HOME%\bin\load-spark-env.cmd
rem Test that an argument was given
if "x%1"=="x" (
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org