Add spark-tools assembly to spark-class classpath.
This allows the JavaAPICompletenessChecker to be run with Spark 0.8+.
This commit is contained in:
parent
72a601ec31
commit
a37ff0f1db
|
@ -265,7 +265,7 @@ object SparkBuild extends Build {
|
|||
|
||||
def toolsSettings = sharedSettings ++ Seq(
|
||||
name := "spark-tools"
|
||||
)
|
||||
) ++ assemblySettings ++ extraAssemblySettings
|
||||
|
||||
def bagelSettings = sharedSettings ++ Seq(
|
||||
name := "spark-bagel"
|
||||
|
|
13
spark-class
13
spark-class
|
@ -110,8 +110,21 @@ if [ ! -f "$FWDIR/RELEASE" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
TOOLS_DIR="$FWDIR"/tools
|
||||
SPARK_TOOLS_JAR=""
|
||||
if [ -e "$TOOLS_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar ]; then
|
||||
# Use the JAR from the SBT build
|
||||
export SPARK_TOOLS_JAR=`ls "$TOOLS_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar`
|
||||
fi
|
||||
if [ -e "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar ]; then
|
||||
# Use the JAR from the Maven build
|
||||
# TODO: this also needs to become an assembly!
|
||||
export SPARK_TOOLS_JAR=`ls "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar`
|
||||
fi
|
||||
|
||||
# Compute classpath using external script
|
||||
CLASSPATH=`$FWDIR/bin/compute-classpath.sh`
|
||||
CLASSPATH="$SPARK_TOOLS_JAR:$CLASSPATH"
|
||||
export CLASSPATH
|
||||
|
||||
if [ "$SPARK_PRINT_LAUNCH_COMMAND" == "1" ]; then
|
||||
|
|
|
@ -65,10 +65,17 @@ if "%FOUND_JAR%"=="0" (
|
|||
)
|
||||
:skip_build_test
|
||||
|
||||
set TOOLS_DIR=%FWDIR%tools
|
||||
set SPARK_TOOLS_JAR=
|
||||
for %%d in ("%TOOLS_DIR%\target\scala-%SCALA_VERSION%\spark-tools*assembly*.jar") do (
|
||||
set SPARK_TOOLS_JAR=%%d
|
||||
)
|
||||
|
||||
rem Compute classpath using external script
|
||||
set DONT_PRINT_CLASSPATH=1
|
||||
call "%FWDIR%bin\compute-classpath.cmd"
|
||||
set DONT_PRINT_CLASSPATH=0
|
||||
set CLASSPATH=%SPARK_TOOLS_JAR%;%CLASSPATH%
|
||||
|
||||
rem Figure out where java is.
|
||||
set RUNNER=java
|
||||
|
|
Loading…
Reference in a new issue