Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
a37ff0f1
Commit
a37ff0f1
authored
11 years ago
by
Josh Rosen
Browse files
Options
Downloads
Patches
Plain Diff
Add spark-tools assembly to spark-class classpath.
This allows the JavaAPICompletenessChecker to be run with Spark 0.8+.
parent
72a601ec
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
project/SparkBuild.scala
+1
-1
1 addition, 1 deletion
project/SparkBuild.scala
spark-class
+13
-0
13 additions, 0 deletions
spark-class
spark-class2.cmd
+7
-0
7 additions, 0 deletions
spark-class2.cmd
with
21 additions
and
1 deletion
project/SparkBuild.scala
+
1
−
1
View file @
a37ff0f1
...
@@ -265,7 +265,7 @@ object SparkBuild extends Build {
...
@@ -265,7 +265,7 @@ object SparkBuild extends Build {
def
toolsSettings
=
sharedSettings
++
Seq
(
def
toolsSettings
=
sharedSettings
++
Seq
(
name
:=
"spark-tools"
name
:=
"spark-tools"
)
)
++
assemblySettings
++
extraAssemblySettings
def
bagelSettings
=
sharedSettings
++
Seq
(
def
bagelSettings
=
sharedSettings
++
Seq
(
name
:=
"spark-bagel"
name
:=
"spark-bagel"
...
...
This diff is collapsed.
Click to expand it.
spark-class
+
13
−
0
View file @
a37ff0f1
...
@@ -110,8 +110,21 @@ if [ ! -f "$FWDIR/RELEASE" ]; then
...
@@ -110,8 +110,21 @@ if [ ! -f "$FWDIR/RELEASE" ]; then
fi
fi
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
# Compute classpath using external script
CLASSPATH
=
`
$FWDIR
/bin/compute-classpath.sh
`
CLASSPATH
=
`
$FWDIR
/bin/compute-classpath.sh
`
CLASSPATH
=
"
$SPARK_TOOLS_JAR
:
$CLASSPATH
"
export
CLASSPATH
export
CLASSPATH
if
[
"
$SPARK_PRINT_LAUNCH_COMMAND
"
==
"1"
]
;
then
if
[
"
$SPARK_PRINT_LAUNCH_COMMAND
"
==
"1"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
spark-class2.cmd
+
7
−
0
View file @
a37ff0f1
...
@@ -65,10 +65,17 @@ if "%FOUND_JAR%"=="0" (
...
@@ -65,10 +65,17 @@ if "%FOUND_JAR%"=="0" (
)
)
:skip
_build_test
: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
rem Compute classpath using external script
set
DONT_PRINT_CLASSPATH
=
1
set
DONT_PRINT_CLASSPATH
=
1
call
"
%FWDIR%
bin\compute-classpath.cmd"
call
"
%FWDIR%
bin\compute-classpath.cmd"
set
DONT_PRINT_CLASSPATH
=
0
set
DONT_PRINT_CLASSPATH
=
0
set
CLASSPATH
=
%SPARK_TOOLS_JAR%
;
%CLASSPATH%
rem Figure out where java is.
rem Figure out where java is.
set
RUNNER
=
java
set
RUNNER
=
java
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment