diff options
Diffstat (limited to 'bin/common')
| -rwxr-xr-x | bin/common | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/bin/common b/bin/common index 8f4677330..0d7dc6150 100755 --- a/bin/common +++ b/bin/common @@ -74,6 +74,7 @@ function build_jar { function update_packages { echo "$INTERFACES_JAR" > $DOTTY_ROOT/.packages echo "$MAIN_JAR" >> $DOTTY_ROOT/.packages + echo "$DOTTY_LIB_JAR" >> $DOTTY_ROOT/.packages echo "$TEST_JAR" >> $DOTTY_ROOT/.packages } @@ -84,10 +85,14 @@ function build_all { INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target) printf "done\n" - printf "Building dotty..." + printf "Building dotty-compiler..." MAIN_JAR=$(build_jar package "target/scala-$SCALA_BINARY_VERSION") printf "done\n" + printf "Building dotty library..." + DOTTY_LIB_JAR=$(build_jar dotty-library/package "library/target/scala-$SCALA_BINARY_VERSION") + printf "done\n" + printf "Building tests..." TEST_JAR=$(build_jar test:package "target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p') printf "done\n" @@ -101,10 +106,11 @@ if [ ! -f "$DOTTY_ROOT/.packages" ]; then else IFS=$'\r\n' GLOBIGNORE='*' command eval 'JARS=($(cat $DOTTY_ROOT/.packages))' - if [ "${#JARS[@]}" == "3" ]; then + if [ "${#JARS[@]}" == "4" ]; then INTERFACES_JAR="${JARS[0]}" MAIN_JAR="${JARS[1]}" - TEST_JAR="${JARS[2]}" + DOTTY_LIB_JAR="${JARS[2]}" + TEST_JAR="${JARS[3]}" else echo "Failed to parse .packages file" build_all @@ -126,6 +132,7 @@ 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-$SCALA_BINARY_VERSION)' +check_jar "dotty-library" $DOTTY_LIB_JAR "library" 'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/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)' # Autodetecting the scala-library location, in case it wasn't provided by an environment variable |