From 844bcbdfd1d120e6a64ee21d2e609462fce15fb3 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 22 Jun 2016 14:30:55 +0200 Subject: [PATCH 1/3] Remove hardcoded scala version Fixup from the last PR, review: @DarkDimius --- bin/common | 10 +++++----- bin/dotr | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/common b/bin/common index 150e79016099..dfca4ab4350b 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)' diff --git a/bin/dotr b/bin/dotr index a3870ac7ab17..b11712fe9642 100755 --- a/bin/dotr +++ b/bin/dotr @@ -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") From fd059a38477d0a267262a4555f7896f0f256f10e Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 22 Jun 2016 14:56:46 +0200 Subject: [PATCH 2/3] Fix #1327: redirect stderr from find_jar --- bin/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/common b/bin/common index dfca4ab4350b..aad672e40930 100755 --- a/bin/common +++ b/bin/common @@ -29,7 +29,7 @@ function find_jar { local artifact="$1/$2" if [ ! -f "$artifact" ]; then - artifact=$(find "$HOME/.coursier/cache" -iname "$2") + artifact=$(find "$HOME/.coursier/cache" -iname "$2" 2> /dev/null) fi echo "$artifact" From a12f671401488e2d898634c547d681e26ffe7e1a Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 22 Jun 2016 15:03:25 +0200 Subject: [PATCH 3/3] Fix #1328: move search of jar deps to after building --- bin/common | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/bin/common b/bin/common index aad672e40930..9b8b7a4da3e6 100755 --- a/bin/common +++ b/bin/common @@ -35,27 +35,6 @@ function find_jar { echo "$artifact" } -# Autodetecting the scala-library location, in case it wasn't provided by an environment variable -if [ "$SCALA_LIBRARY_JAR" == "" ]; then - SCALA_LIBRARY_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-lang/scala-library/jars" "scala-library-$SCALA_VERSION.jar") -fi - -if [ "$SCALA_REFLECT_JAR" == "" ]; then - SCALA_REFLECT_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-lang/scala-reflect/jars" "scala-reflect-$SCALA_VERSION.jar") -fi - -if [ "$SCALA_COMPILER_JAR" == "" ]; then - SCALA_COMPILER_JAR=$(find_jar "$HOME/.ivy2/cache/me.d-d/scala-compiler/jars" "scala-compiler-$SCALA_COMPILER_VERSION.jar") -fi - -if [ "$JLINE_JAR" == "" ]; then - JLINE_JAR=$(find_jar "$HOME/.ivy2/cache/jline/jline/jars" "jline-$JLINE_VERSION.jar") -fi - -if [ "$SBT_INTERFACE_JAR" == "" ]; then - SBT_INTERFACE_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-sbt/interface/jars" "interface-$SBT_VERSION.jar") -fi - function build_jar { # Usage: # build_jar package path/to/jar/dir ['/some/sed/command'] @@ -136,3 +115,24 @@ 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-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 +if [ "$SCALA_LIBRARY_JAR" == "" ]; then + SCALA_LIBRARY_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-lang/scala-library/jars" "scala-library-$SCALA_VERSION.jar") +fi + +if [ "$SCALA_REFLECT_JAR" == "" ]; then + SCALA_REFLECT_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-lang/scala-reflect/jars" "scala-reflect-$SCALA_VERSION.jar") +fi + +if [ "$SCALA_COMPILER_JAR" == "" ]; then + SCALA_COMPILER_JAR=$(find_jar "$HOME/.ivy2/cache/me.d-d/scala-compiler/jars" "scala-compiler-$SCALA_COMPILER_VERSION.jar") +fi + +if [ "$JLINE_JAR" == "" ]; then + JLINE_JAR=$(find_jar "$HOME/.ivy2/cache/jline/jline/jars" "jline-$JLINE_VERSION.jar") +fi + +if [ "$SBT_INTERFACE_JAR" == "" ]; then + SBT_INTERFACE_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-sbt/interface/jars" "interface-$SBT_VERSION.jar") +fi