diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-26 17:40:22 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-26 17:40:22 -0700 |
| commit | 03906f7f0a8c93b09e3b47ccaad5b5f72c29302b (patch) | |
| tree | 910d0f963e0592119bf5f2ab1afb838604be9040 | |
| parent | e49bc8ca8c411aa693f85c1ef3d23ea42d488c4d (diff) | |
| download | spark-03906f7f0a8c93b09e3b47ccaad5b5f72c29302b.tar.gz spark-03906f7f0a8c93b09e3b47ccaad5b5f72c29302b.tar.bz2 spark-03906f7f0a8c93b09e3b47ccaad5b5f72c29302b.zip | |
Fixes to compute-classpath on Windows
| -rw-r--r-- | bin/compute-classpath.cmd | 4 | ||||
| -rw-r--r-- | run2.cmd | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/compute-classpath.cmd b/bin/compute-classpath.cmd index 1dff8fea22..6e7efbd334 100644 --- a/bin/compute-classpath.cmd +++ b/bin/compute-classpath.cmd @@ -6,7 +6,7 @@ rem script and the ExecutorRunner in standalone cluster mode. set SCALA_VERSION=2.9.3 rem Figure out where the Spark framework is installed -set FWDIR=%~dp0\.. +set FWDIR=%~dp0..\ 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" @@ -45,7 +45,7 @@ rem Add Scala standard library set CLASSPATH=%CLASSPATH%;%SCALA_HOME%\lib\scala-library.jar;%SCALA_HOME%\lib\scala-compiler.jar;%SCALA_HOME%\lib\jline.jar rem A bit of a hack to allow calling this script within run2.cmd without seeing output -if "x%DONT_PRINT_CLASSPATH%"=="x1" goto exit +if "%DONT_PRINT_CLASSPATH%"=="1" goto exit echo %CLASSPATH% @@ -48,6 +48,7 @@ set REPL_DIR=%FWDIR%repl rem Compute classpath using external script set DONT_PRINT_CLASSPATH=1 call "%FWDIR%bin\compute-classpath.cmd" +set DONT_PRINT_CLASSPATH=0 rem Figure out the JAR file that our examples were packaged into. rem First search in the build path from SBT: |