File tree Expand file tree Collapse file tree 1 file changed +10
-3
lines changed Expand file tree Collapse file tree 1 file changed +10
-3
lines changed Original file line number Diff line number Diff line change 4
4
5
5
6
6
# Configuration
7
- SCALA_VERSION=2.11.1
7
+ SCALA_VERSION=2.11.4
8
8
SCALA_BINARY_VERSION=2.11
9
+ SCALA_COMPILER_VERSION=2.11.5-20141127-151222-084cc06425
9
10
DOTTY_VERSION=0.1
10
11
bootcp=true
11
12
default_java_opts=" -Xmx768m -Xms768m"
@@ -62,12 +63,18 @@ if [ "$SCALA_REFLECT_JAR" == "" ]
62
63
then
63
64
SCALA_REFLECT_JAR=$HOME /.ivy2/cache/org.scala-lang/scala-reflect/jars/scala-reflect-$SCALA_VERSION .jar
64
65
fi
66
+ if [ " $SCALA_COMPILER_JAR " == " " ]
67
+ then
68
+ SCALA_COMPILER_JAR=$HOME /.ivy2/cache/me.d-d/scala-compiler/jars/scala-compiler-$SCALA_COMPILER_VERSION .jar
69
+ fi
65
70
66
- if [ ! -f " $SCALA_LIBRARY_JAR " -o ! -f " $SCALA_REFLECT_JAR " ]
71
+ if [ ! -f " $SCALA_LIBRARY_JAR " -o ! -f " $SCALA_REFLECT_JAR " -o ! -f " $SCALA_COMPILER_JAR " ]
67
72
then
68
73
echo To use this script please set
69
74
echo SCALA_LIBRARY_JAR to point to scala-library-$SCALA_VERSION .jar " (currently $SCALA_LIBRARY_JAR )"
70
75
echo SCALA_REFLECT_JAR to point to scala-reflect-$SCALA_VERSION .jar " (currently $SCALA_REFLECT_JAR )"
76
+ echo SCALA_COMPILER_JAR to point to scala-compiler-$SCALA_VERSION .jar with bcode patches " (currently $SCALA_COMPILER_JAR )"
77
+
71
78
fi
72
79
73
80
ifdebug () {
@@ -156,7 +163,7 @@ trap onExit INT
156
163
# to java to suppress "." from materializing.
157
164
classpathArgs () {
158
165
if [[ -n $bootcp ]]; then
159
- echo " -Xbootclasspath/a:$SCALA_LIBRARY_JAR :$SCALA_REFLECT_JAR :$MAIN_JAR -classpath $MAIN_JAR "
166
+ echo " -Xbootclasspath/a:$SCALA_LIBRARY_JAR :$SCALA_REFLECT_JAR :$SCALA_COMPILER_JAR : $ MAIN_JAR -classpath $MAIN_JAR "
160
167
else
161
168
echo " -classpath $SCALA_LIBRARY_JAR :$SCALA_REFLECT_JAR :$MAIN_JAR "
162
169
fi
You can’t perform that action at this time.
0 commit comments