Permalink
Browse files

Revert "Get rid of local Scala."

We're not ready for this, since the scala version is not reproducible
as it depends on the day it was built.

This reverts commit dc6101a.
  • Loading branch information...
namin committed Mar 13, 2012
1 parent 0383398 commit ca5ea6b97b228467c8b5bae6c202789a09cb193d
Showing with 19 additions and 4 deletions.
  1. +19 −4 build.sbt
View
@@ -4,7 +4,22 @@ organization := "scala"
version := "0.1"
-scalaVersion := "2.10.0-M2-0020-geab3b7e4d7-2012-03-06"
+//--- Local Scala
+
+scalaHome <<= baseDirectory { f =>
+ val props = new java.util.Properties()
+ IO.load(props, f / "local.properties")
+ val x = props.getProperty("scala.virtualized.home")
+ if (x == null)
+ sys.error("Did you forget to set scala.virtualized.home property in local.properties file?")
+ else Some(file(x))
+}
+
+scalacOptions in Test <+= scalaHome map (_.map(f => "-Xplugin:"+f+"/misc/scala-devel/plugins/continuations.jar").get)
+
+//--- End of Local Scala
+
+scalaVersion := "2.10.0-virtualized-SNAPSHOT"
//--- Paths
@@ -29,7 +44,7 @@ resolvers ++= Seq(
libraryDependencies += "org.scalatest" % "scalatest_2.10.0-virtualized-SNAPSHOT" % "1.6.1-SNAPSHOT" % "test"
-libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.10.0-M2-0020-geab3b7e4d7-2012-03-06"
+libraryDependencies += "org.scala-lang" % "scala-compiler" % "2.10.0-virtualized-SNAPSHOT"
//--- End of Dependencies
@@ -47,8 +62,8 @@ publishArtifact in (Compile, packageDoc) := false
//Uncomment the following two lines if you are not using local Scala
-autoCompilerPlugins := true
+//autoCompilerPlugins := true
-addCompilerPlugin("org.scala-lang.plugins" % "continuations" % "2.10.0-M2-0020-geab3b7e4d7-2012-03-06")
+//addCompilerPlugin("org.scala-lang.plugins" % "continuations" % "2.10.0-virtualized-SNAPSHOT")
scalacOptions in Test += "-P:continuations:enable"

0 comments on commit ca5ea6b

Please sign in to comment.