File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -94,11 +94,11 @@ function build_all {
94
94
printf " done\n"
95
95
96
96
printf " Building dotty..."
97
- MAIN_JAR=$( build_jar package target/scala-2.11 )
97
+ MAIN_JAR=$( build_jar package " target/scala-$SCALA_BINARY_VERSION " )
98
98
printf " done\n"
99
99
100
100
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' )
102
102
printf " done\n"
103
103
104
104
update_packages
115
115
MAIN_JAR=" ${JARS[1]} "
116
116
TEST_JAR=" ${JARS[2]} "
117
117
else
118
- echo " Corrupted .packages file"
118
+ echo " Failed to parse .packages file"
119
119
build_all
120
120
fi
121
121
fi
@@ -134,5 +134,5 @@ function check_jar {
134
134
}
135
135
136
136
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)'
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ DOTTY_ROOT="$( cd "$DOTTY_ROOT" >& /dev/null && pwd )/.." # absolute
12
12
source $DOTTY_ROOT /bin/common
13
13
14
14
# 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 "
16
16
17
17
function runMain {
18
18
local jbin=$( which " java" )
You can’t perform that action at this time.
0 commit comments