Multiple fixes for bin/dotc and bin/dotr
#1324
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,3 +38,6 @@ scala-scala | |
| # Ignore output files but keep the directory | ||
| out/ | ||
| !out/.keep | ||
|
|
||
| # Ignore build-file | ||
| .packages | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Finds in dotty build file a line containing PATTERN | ||
| # returns last "" escaped string in this line | ||
| function getLastStringOnLineWith { | ||
| PATTERN="$1" | ||
| grep "$PATTERN" "$DOTTY_ROOT/project/Build.scala"|sed -n 's/.*\"\(.*\)\".*/\1/'p | ||
| } | ||
|
|
||
| # Configuration | ||
| SCALA_VERSION=$(getLastStringOnLineWith "scalaVersion in") | ||
| SCALA_BINARY_VERSION=2.11 | ||
| SCALA_COMPILER_VERSION=$(getLastStringOnLineWith "scala-compiler") | ||
| JLINE_VERSION=$(getLastStringOnLineWith "jline") | ||
| SBT_VERSION=$(grep "sbt.version=" "$DOTTY_ROOT/project/build.properties" | sed 's/sbt.version=//') | ||
| bootcp=true | ||
| bootstrapped=false | ||
| default_java_opts="-Xmx768m -Xms768m" | ||
| programName=$(basename "$0") | ||
| # uncomment next line to enable debug output | ||
| #debug=true | ||
|
|
||
| declare -a java_args scala_args residual_args | ||
| unset verbose quiet cygwin toolcp colors saved_stty CDPATH | ||
|
|
||
| function find_jar { | ||
| # Usage: | ||
| # find_jar path/to/location file.jar | ||
| local artifact="$1/$2" | ||
|
|
||
| if [ ! -f "$artifact" ]; then | ||
| artifact=$(find "$HOME/.coursier/cache" -iname "$2") | ||
| fi | ||
|
|
||
| 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'] | ||
| # | ||
| # Last arg is optional | ||
| cd $DOTTY_ROOT >& /dev/null | ||
| local build_output=$(sbt "$1") | ||
| local jar=$(echo $build_output | sed -n 's/.*Packaging //g; s/ \.\.\..*//g; /^\/.*/p') | ||
|
|
||
|
|
||
| local sedjar="$3" | ||
| if [ "$sedjar" == "" ]; then | ||
| sedjar="/.*\.jar/p" | ||
| fi | ||
|
|
||
| if [ "$jar" == "" ]; then | ||
| # Didn't build a jar - could've run sbt by oneself, get latest jar in target: | ||
| jar="$DOTTY_ROOT/$2/$(ls -1t "$2" | sed -n "$sedjar" | awk 'NR==1')" | ||
| fi | ||
|
|
||
| cd - >& /dev/null | ||
|
|
||
| echo $jar | ||
| } | ||
|
|
||
| function update_packages { | ||
| echo "$INTERFACES_JAR" > $DOTTY_ROOT/.packages | ||
| echo "$MAIN_JAR" >> $DOTTY_ROOT/.packages | ||
| echo "$TEST_JAR" >> $DOTTY_ROOT/.packages | ||
| } | ||
|
|
||
| function build_all { | ||
| echo "The script is going to build the required jar files" | ||
|
|
||
| printf "Building dotty-interfaces..." | ||
| INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target) | ||
| printf "done\n" | ||
|
|
||
| printf "Building dotty..." | ||
| MAIN_JAR=$(build_jar package target/scala-2.11) | ||
|
|
||
| printf "done\n" | ||
|
|
||
| printf "Building tests..." | ||
| TEST_JAR=$(build_jar test:package target/scala-2.11 '/dotty.*-tests\.jar/p') | ||
| printf "done\n" | ||
|
|
||
| update_packages | ||
| } | ||
|
|
||
| # Check if .packages file does not exist - if so assume old build and rebuild all | ||
| if [ ! -f "$DOTTY_ROOT/.packages" ]; then | ||
| build_all | ||
| else | ||
| IFS=$'\r\n' GLOBIGNORE='*' command eval 'JARS=($(cat $DOTTY_ROOT/.packages))' | ||
|
|
||
| if [ "${#JARS[@]}" == "3" ]; then | ||
| INTERFACES_JAR="${JARS[0]}" | ||
| MAIN_JAR="${JARS[1]}" | ||
| TEST_JAR="${JARS[2]}" | ||
| else | ||
| echo "Corrupted .packages file" | ||
|
There was a problem hiding this comment. Instead of |
||
| build_all | ||
| fi | ||
| fi | ||
|
|
||
| ################# After this point, jar variables will be set ################# | ||
| function check_jar { | ||
| # Usage: | ||
| # check_jar "name" "path/to/package.jar" "sources/dir" 'lambda to exec on failure' | ||
| local new_files="$(find "$3" \( -iname "*.scala" -o -iname "*.java" \) -newer "$2")" | ||
| if [ ! -z "$new_files" ]; then | ||
| printf "New files detected in $1, rebuilding..." | ||
| eval "$4" | ||
| printf "done\n" | ||
| update_packages | ||
| fi | ||
| } | ||
|
|
||
| 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)' | ||
|
There was a problem hiding this comment. 2.11 -> SCALA_BINARY_VERSION. Same on next line. |
||
| check_jar "dotty-tests" $TEST_JAR "test" 'TEST_JAR=$(build_jar test:package target/scala-2.11 /dotty.*-tests\.jar/p)' | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we get it from
sbtconfig?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes