From 1c5e7b741da45517e96afc2e2553274760d1a193 Mon Sep 17 00:00:00 2001
From: Dmitry Petrashko <dmitry.petrashko@gmail.com>
Date: Thu, 27 Nov 2014 16:19:01 +0100
Subject: Modify runner script to include modified scalac on class path.

---
 bin/dotc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/bin/dotc b/bin/dotc
index 72ac3141a..5a3c25afa 100755
--- a/bin/dotc
+++ b/bin/dotc
@@ -4,8 +4,9 @@
 
 
 # Configuration
-SCALA_VERSION=2.11.1
+SCALA_VERSION=2.11.4
 SCALA_BINARY_VERSION=2.11
+SCALA_COMPILER_VERSION=2.11.5-20141127-151222-084cc06425
 DOTTY_VERSION=0.1
 bootcp=true
 default_java_opts="-Xmx768m -Xms768m"
@@ -62,12 +63,18 @@ if [ "$SCALA_REFLECT_JAR" == "" ]
 then  
   SCALA_REFLECT_JAR=$HOME/.ivy2/cache/org.scala-lang/scala-reflect/jars/scala-reflect-$SCALA_VERSION.jar
 fi
+if [ "$SCALA_COMPILER_JAR" == "" ]
+then
+  SCALA_COMPILER_JAR=$HOME/.ivy2/cache/me.d-d/scala-compiler/jars/scala-compiler-$SCALA_COMPILER_VERSION.jar
+fi
 
-if [ ! -f "$SCALA_LIBRARY_JAR" -o ! -f "$SCALA_REFLECT_JAR" ]
+if [ ! -f "$SCALA_LIBRARY_JAR" -o ! -f "$SCALA_REFLECT_JAR"  -o ! -f "$SCALA_COMPILER_JAR" ]
 then
   echo To use this script please set 
   echo SCALA_LIBRARY_JAR to point to scala-library-$SCALA_VERSION.jar "(currently $SCALA_LIBRARY_JAR)"
   echo SCALA_REFLECT_JAR to point to scala-reflect-$SCALA_VERSION.jar "(currently $SCALA_REFLECT_JAR)"
+  echo SCALA_COMPILER_JAR to point to scala-compiler-$SCALA_VERSION.jar with bcode patches "(currently $SCALA_COMPILER_JAR)"
+
 fi
 
 ifdebug () {
@@ -156,7 +163,7 @@ trap onExit INT
 # to java to suppress "." from materializing.
 classpathArgs () {
   if [[ -n $bootcp ]]; then
-echo "-Xbootclasspath/a:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$MAIN_JAR -classpath $MAIN_JAR"
+echo "-Xbootclasspath/a:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$MAIN_JAR -classpath $MAIN_JAR"
   else
 echo "-classpath $SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$MAIN_JAR"
   fi
-- 
cgit v1.2.3