Rewrite Build.scala for readability #968
Conversation
| val dottyJars = Seq("dotty.jar", | ||
| (packageBin in Compile).value.getAbsolutePath) ++ | ||
| getJarPaths(partestDeps.value, ivyPaths.value.ivyHome) ++ | ||
| Seq("dotty.jar") |
There was a problem hiding this comment.
Looks like you have "dotty.jar" twice in dottyJars
hubertp
force-pushed
the
feature/project-cleanups
branch
from
b08c3d9 to
8d48ef2
Compare
|
@smarter I must have pushed the outdated stuff. Thanks for comments. Corrected now. |
|
/rebuild |
|
I will take it offliine. I seem to be getting compilation errors with scala stdlib (scala-scala?). Sorry for the fuss. I'm rewriting large parts of test-suite so that we can reduce the amount of output in a more convenient way. |
No idea where your compilation errors come from. |
hubertp
force-pushed
the
feature/project-cleanups
branch
from
8d48ef2 to
9fe459a
Compare
|
My fork wasn't in sync, rebase helped. |
|
LGTM. |
| "org.scala-lang" % "scala-reflect" % scalaVersion.value, | ||
| "org.scala-lang" % "scala-library" % scalaVersion.value % "test"), | ||
| partestDeps := | ||
| Seq("me.d-d" % "scala-compiler" % scalaCompilerVersion, |
There was a problem hiding this comment.
bin/dotc script currenlty detect versions of dependencies by looking for the line containing scala-compiler and looking for the last string constant on this line.
Either scalaCompilerVersion needs to be inlined here, or bin/dotc script needs to be changed.
|
@DarkDimius thanks. |
| @@ -20,7 +20,7 @@ function getLastStringOnLineWith { | |||
| # Configuration | |||
| SCALA_VERSION=$(getLastStringOnLineWith "scalaVersion in") | |||
| SCALA_BINARY_VERSION=2.11 | |||
| SCALA_COMPILER_VERSION=$(getLastStringOnLineWith "scala-compiler") | |||
| SCALA_COMPILER_VERSION=$(getLastStringOnLineWith "scalaCompilerVersion") | |||
There was a problem hiding this comment.
This now returns two lines:
$ grep "scalaCompilerVersion" "project/Build.scala"|sed -n 's/.*\"\(.*\)\".*/\1/'p
2.11.5-20151022-113908-7fb0e653fd
scala-compilerYou can avoid this by doing getLastStringOnLineWith "def scalaCompilerVersion", optionally, you could also change the definition of getLastStringOnLineWith so that it only returns one line:
grep "$PATTERN" "$DOTTY_ROOT/project/Build.scala"|sed -n 's/.*\"\(.*\)\".*/\1/'p|head -n1
|
Delta got too large to merge with confidence now. |
No description provided.