fix bin/dotc

liufengyun · liufengyun · commit 1711ff153537 · 2017-02-10T13:57:50.000+01:00
diff --git a/bin/common b/bin/common
@@ -8,7 +8,7 @@ function getLastStringOnLineWith {
 }
 
 # Configuration
-SCALA_VERSION=$(getLastStringOnLineWith "scalaVersion in")
+SCALA_VERSION=$(getLastStringOnLineWith "val scalacVersion")
 SCALA_BINARY_VERSION=2.11
 SCALA_COMPILER_VERSION=$(getLastStringOnLineWith "scala-compiler")
 SBT_VERSION=$(grep "sbt.version=" "$DOTTY_ROOT/project/build.properties" | sed 's/sbt.version=//')
diff --git a/project/Build.scala b/project/Build.scala
@@ -11,7 +11,7 @@ import sbt.Package.ManifestAttributes
 
 object DottyBuild extends Build {
 
-  val scalacVersion = "2.11.5"
+  val scalacVersion = "2.11.5" // Do not rename, this is grepped in bin/common.
 
   val dottyOrganization = "ch.epfl.lamp"
   val dottyVersion = {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function getLastStringOnLineWith {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`# Configuration`
`11`		`-SCALA_VERSION=$(getLastStringOnLineWith "scalaVersion in")`
	`11`	`+SCALA_VERSION=$(getLastStringOnLineWith "val scalacVersion")`
`12`	`12`	`SCALA_BINARY_VERSION=2.11`
`13`	`13`	`SCALA_COMPILER_VERSION=$(getLastStringOnLineWith "scala-compiler")`
`14`	`14`	`SBT_VERSION=$(grep "sbt.version=" "$DOTTY_ROOT/project/build.properties" \| sed 's/sbt.version=//')`