diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-06-22 15:03:25 +0200 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-06-22 15:03:25 +0200 |
| commit | a12f671401488e2d898634c547d681e26ffe7e1a (patch) | |
| tree | 873b874710b7374f4b87303daedb578c92bc1710 /bin | |
| parent | fd059a38477d0a267262a4555f7896f0f256f10e (diff) | |
| download | dotty-a12f671401488e2d898634c547d681e26ffe7e1a.tar.gz dotty-a12f671401488e2d898634c547d681e26ffe7e1a.tar.bz2 dotty-a12f671401488e2d898634c547d681e26ffe7e1a.zip | |
Fix #1328: move search of jar deps to after building
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/common | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/bin/common b/bin/common index aad672e40..9b8b7a4da 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 |