diff options
| author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-11-27 16:19:01 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-12-16 13:15:00 +0100 |
| commit | 1c5e7b741da45517e96afc2e2553274760d1a193 (patch) | |
| tree | 165e0e111088a0e8c3ab731c07f5ec31766b1c68 /bin/dotc | |
| parent | 0b73ed1ce8747ab8b69dffa48f4bc6b264f9e939 (diff) | |
| download | dotty-1c5e7b741da45517e96afc2e2553274760d1a193.tar.gz dotty-1c5e7b741da45517e96afc2e2553274760d1a193.tar.bz2 dotty-1c5e7b741da45517e96afc2e2553274760d1a193.zip | |
Modify runner script to include modified scalac on class path.
Diffstat (limited to 'bin/dotc')
| -rwxr-xr-x | bin/dotc | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -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 |