diff options
| author | Andrew Or <andrewor14@gmail.com> | 2014-08-26 22:52:16 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-08-26 22:52:16 -0700 |
| commit | 7557c4cfef2398d124b00472e2696f0559a36ef7 (patch) | |
| tree | c780f689efe09f3bc60077a62c9a43688c854279 /bin/compute-classpath.cmd | |
| parent | bf719056b71d55e1194554661dfa194ed03d364d (diff) | |
| download | spark-7557c4cfef2398d124b00472e2696f0559a36ef7.tar.gz spark-7557c4cfef2398d124b00472e2696f0559a36ef7.tar.bz2 spark-7557c4cfef2398d124b00472e2696f0559a36ef7.zip | |
[SPARK-3167] Handle special driver configs in Windows
This is an effort to bring the Windows scripts up to speed after recent splashing changes in #1845.
Author: Andrew Or <andrewor14@gmail.com>
Closes #2129 from andrewor14/windows-config and squashes the following commits:
881a8f0 [Andrew Or] Add reference to Windows taskkill
92e6047 [Andrew Or] Update a few comments (minor)
22b1acd [Andrew Or] Fix style again (minor)
afcffea [Andrew Or] Fix style (minor)
72004c2 [Andrew Or] Actually respect --driver-java-options
803218b [Andrew Or] Actually respect SPARK_*_CLASSPATH
eeb34a0 [Andrew Or] Update outdated comment (minor)
35caecc [Andrew Or] In Windows, actually kill Java processes on exit
f97daa2 [Andrew Or] Fix Windows spark shell stdin issue
83ebe60 [Andrew Or] Parse special driver configs in Windows (broken)
Diffstat (limited to 'bin/compute-classpath.cmd')
| -rw-r--r-- | bin/compute-classpath.cmd | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/compute-classpath.cmd b/bin/compute-classpath.cmd index 58710cd1bd..5ad52452a5 100644 --- a/bin/compute-classpath.cmd +++ b/bin/compute-classpath.cmd @@ -36,7 +36,8 @@ 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"
rem Build up classpath
-set CLASSPATH=%FWDIR%conf
+set CLASSPATH=%SPARK_CLASSPATH%;%SPARK_SUBMIT_CLASSPATH%;%FWDIR%conf
+
if exist "%FWDIR%RELEASE" (
for %%d in ("%FWDIR%lib\spark-assembly*.jar") do (
set ASSEMBLY_JAR=%%d
|