Skip to content

Commit 844bcbd

Browse files
committed
Remove hardcoded scala version
Fixup from the last PR, review: @DarkDimius
1 parent af93e88 commit 844bcbd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

bin/common

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ function build_all {
9494
printf "done\n"
9595

9696
printf "Building dotty..."
97-
MAIN_JAR=$(build_jar package target/scala-2.11)
97+
MAIN_JAR=$(build_jar package "target/scala-$SCALA_BINARY_VERSION")
9898
printf "done\n"
9999

100100
printf "Building tests..."
101-
TEST_JAR=$(build_jar test:package target/scala-2.11 '/dotty.*-tests\.jar/p')
101+
TEST_JAR=$(build_jar test:package "target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p')
102102
printf "done\n"
103103

104104
update_packages
@@ -115,7 +115,7 @@ else
115115
MAIN_JAR="${JARS[1]}"
116116
TEST_JAR="${JARS[2]}"
117117
else
118-
echo "Corrupted .packages file"
118+
echo "Failed to parse .packages file"
119119
build_all
120120
fi
121121
fi
@@ -134,5 +134,5 @@ function check_jar {
134134
}
135135

136136
check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)'
137-
check_jar "dotty" $MAIN_JAR "src" 'MAIN_JAR=$(build_jar package target/scala-2.11)'
138-
check_jar "dotty-tests" $TEST_JAR "test" 'TEST_JAR=$(build_jar test:package target/scala-2.11 /dotty.*-tests\.jar/p)'
137+
check_jar "dotty" $MAIN_JAR "src" 'MAIN_JAR=$(build_jar package target/scala-$SCALA_BINARY_VERSION)'
138+
check_jar "dotty-tests" $TEST_JAR "test" 'TEST_JAR=$(build_jar test:package target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)'

bin/dotr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DOTTY_ROOT="$( cd "$DOTTY_ROOT" >& /dev/null && pwd )/.." # absolute
1212
source $DOTTY_ROOT/bin/common
1313

1414
# CLASS_PATH is derived from the DOTTY_ROOT and SCALA_LIBRARY_JAR
15-
CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-2.11/classes/:.:$SCALA_LIBRARY_JAR"
15+
CLASS_PATH="-Xbootclasspath/a:.:$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/classes/:.:$SCALA_LIBRARY_JAR"
1616

1717
function runMain {
1818
local jbin=$(which "java")

0 commit comments

Comments
 (0)