diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-09-03 14:20:10 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-09-03 14:20:10 +0000 |
| commit | 3bbfd70e39bd55dc15db5098dda248cc1a7fc7c8 (patch) | |
| tree | 664fdd7c441cac6f778638ca611ead6fd1d15471 /project | |
| parent | b3256eda6631fc0db5bb9440a6b77e2186053b3f (diff) | |
| download | scala-3bbfd70e39bd55dc15db5098dda248cc1a7fc7c8.tar.gz scala-3bbfd70e39bd55dc15db5098dda248cc1a7fc7c8.tar.bz2 scala-3bbfd70e39bd55dc15db5098dda248cc1a7fc7c8.zip | |
update sbt build files to include scalacheck.jar.
Diffstat (limited to 'project')
| -rw-r--r-- | project/build/BasicLayer.scala | 11 | ||||
| -rw-r--r-- | project/build/ScalaBuildProject.scala | 1 | ||||
| -rw-r--r-- | project/build/ScalaSBTBuilder.scala | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/project/build/BasicLayer.scala b/project/build/BasicLayer.scala index b8f66c12eb..b315f8e0ef 100644 --- a/project/build/BasicLayer.scala +++ b/project/build/BasicLayer.scala @@ -184,6 +184,17 @@ abstract class BasicLayer(val info:ProjectInfo,val versionNumber:String, previou ///// TOOLS CONFIGURATION //////// /** + * Configuration of scalacheck + */ + lazy val scalacheckConfig = new CompilationStep("scalacheck", pathLayout, log) with Packaging { + def label = "["+layer.name+"] scalacheck" + def options: Seq[String] = Seq() + def dependencies = libraryConfig::compilerConfig::actorsConfig::Nil + + lazy val packagingConfig = new PackagingConfiguration(libsDestination / scalacheckJarName,List(outputDirectory ##)) + } + + /** * Configuration of scalap tool */ lazy val scalapConfig = new CompilationStep("scalap", pathLayout,log) with Packaging{ diff --git a/project/build/ScalaBuildProject.scala b/project/build/ScalaBuildProject.scala index e31b3a8d4a..175f164fe8 100644 --- a/project/build/ScalaBuildProject.scala +++ b/project/build/ScalaBuildProject.scala @@ -24,6 +24,7 @@ object ScalaBuildProject { // Some path definitions related strings val compilerJarName = "scala-compiler.jar" val libraryJarName = "scala-library.jar" + val scalacheckJarName = "scalacheck.jar" val scalapJarName = "scalap.jar" val dbcJarName = "scala-dbc.jar" val swingJarName = "scala-swing.jar" diff --git a/project/build/ScalaSBTBuilder.scala b/project/build/ScalaSBTBuilder.scala index fe05e41f14..1d04c69052 100644 --- a/project/build/ScalaSBTBuilder.scala +++ b/project/build/ScalaSBTBuilder.scala @@ -183,7 +183,7 @@ class ScalaSBTBuilder(val info: ProjectInfo) extends Project with ReflectivePro } - override lazy val toolsWS = new WrapperStep(scalapConfig::partestConfig::Nil) + override lazy val toolsWS = new WrapperStep(scalacheckConfig::scalapConfig::partestConfig::Nil) // An additional task for building only the library of quick // Used for compiling msil @@ -244,7 +244,7 @@ class ScalaSBTBuilder(val info: ProjectInfo) extends Project with ReflectivePro } - override lazy val toolsWS= new WrapperStep(scalapConfig::partestConfig::Nil) + override lazy val toolsWS= new WrapperStep(scalacheckConfig::scalapConfig::partestConfig::Nil) } |