Skip to content

Commit dc08ddc

Browse files
committed
Modify runner script to include modified scalac on class path.
1 parent c1be21d commit dc08ddc

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

bin/dotc

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55

66
# Configuration
7-
SCALA_VERSION=2.11.1
7+
SCALA_VERSION=2.11.4
88
SCALA_BINARY_VERSION=2.11
9+
SCALA_COMPILER_VERSION=2.11.5-20141127-151222-084cc06425
910
DOTTY_VERSION=0.1
1011
bootcp=true
1112
default_java_opts="-Xmx768m -Xms768m"
@@ -62,12 +63,18 @@ if [ "$SCALA_REFLECT_JAR" == "" ]
6263
then
6364
SCALA_REFLECT_JAR=$HOME/.ivy2/cache/org.scala-lang/scala-reflect/jars/scala-reflect-$SCALA_VERSION.jar
6465
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
6570

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" ]
6772
then
6873
echo To use this script please set
6974
echo SCALA_LIBRARY_JAR to point to scala-library-$SCALA_VERSION.jar "(currently $SCALA_LIBRARY_JAR)"
7075
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+
7178
fi
7279

7380
ifdebug () {
@@ -156,7 +163,7 @@ trap onExit INT
156163
# to java to suppress "." from materializing.
157164
classpathArgs () {
158165
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"
160167
else
161168
echo "-classpath $SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$MAIN_JAR"
162169
fi

0 commit comments

Comments
 (0)