diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-06-22 14:30:55 +0200 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-06-22 14:31:10 +0200 |
| commit | 844bcbdfd1d120e6a64ee21d2e609462fce15fb3 (patch) | |
| tree | f4c698fc570b9a86749f93d7f5ae19a6c20a0bea /bin | |
| parent | af93e8821f7885819e04f3dfd6ab798e600d68cf (diff) | |
| download | dotty-844bcbdfd1d120e6a64ee21d2e609462fce15fb3.tar.gz dotty-844bcbdfd1d120e6a64ee21d2e609462fce15fb3.tar.bz2 dotty-844bcbdfd1d120e6a64ee21d2e609462fce15fb3.zip | |
Remove hardcoded scala version
Fixup from the last PR, review: @DarkDimius
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/common | 10 | ||||
| -rwxr-xr-x | bin/dotr | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/common b/bin/common index 150e79016..dfca4ab43 100755 --- a/bin/common +++ b/bin/common @@ -94,11 +94,11 @@ function build_all { printf "done\n" printf "Building dotty..." - MAIN_JAR=$(build_jar package target/scala-2.11) + MAIN_JAR=$(build_jar package "target/scala-$SCALA_BINARY_VERSION") printf "done\n" printf "Building tests..." - TEST_JAR=$(build_jar test:package target/scala-2.11 '/dotty.*-tests\.jar/p') + TEST_JAR=$(build_jar test:package "target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p') printf "done\n" update_packages @@ -115,7 +115,7 @@ else MAIN_JAR="${JARS[1]}" TEST_JAR="${JARS[2]}" else - echo "Corrupted .packages file" + echo "Failed to parse .packages file" build_all fi fi @@ -134,5 +134,5 @@ function check_jar { } check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)' -check_jar "dotty" $MAIN_JAR "src" 'MAIN_JAR=$(build_jar package target/scala-2.11)' -check_jar "dotty-tests" $TEST_JAR "test" 'TEST_JAR=$(build_jar test:package target/scala-2.11 /dotty.*-tests\.jar/p)' +check_jar "dotty" $MAIN_JAR "src" 'MAIN_JAR=$(build_jar package target/scala-$SCALA_BINARY_VERSION)' +check_jar "dotty-tests" $TEST_JAR "test" 'TEST_JAR=$(build_jar test:package target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)' @@ -12,7 +12,7 @@ DOTTY_ROOT="$( cd "$DOTTY_ROOT" >& /dev/null && pwd )/.." # absolute source $DOTTY_ROOT/bin/common # CLASS_PATH is derived from the DOTTY_ROOT and SCALA_LIBRARY_JAR -CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-2.11/classes/:.:$SCALA_LIBRARY_JAR" +CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/classes/:.:$SCALA_LIBRARY_JAR" function runMain { local jbin=$(which "java") |