diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2011-12-05 15:52:10 -0500 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2011-12-05 15:52:10 -0500 |
| commit | 47fb0d381022bda800b7f8ee234224aa20020e4a (patch) | |
| tree | dc34f3c6ac712adcf829cb7ab8399975fdae4ed4 /project/Build.scala | |
| parent | 01fffafac5f8184fc6abc4268a2b2d1a2503d5ca (diff) | |
| download | scala-47fb0d381022bda800b7f8ee234224aa20020e4a.tar.gz scala-47fb0d381022bda800b7f8ee234224aa20020e4a.tar.bz2 scala-47fb0d381022bda800b7f8ee234224aa20020e4a.zip | |
Adding SHA resolve to the SBT build so that we don't need the push/pull binary libs script anymore. Only pull is implemented.
Diffstat (limited to 'project/Build.scala')
| -rw-r--r-- | project/Build.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/Build.scala b/project/Build.scala index dd75b92734..6ffdffa005 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -141,7 +141,7 @@ object ScalaBuild extends Build with Layers { //commands += Release.setStarrHome ) // Note: Root project is determined by lowest-alphabetical project that has baseDirectory as file("."). we use aaa_ to 'win'. - lazy val aaa_root = Project("scala", file(".")) settings(projectSettings: _*) + lazy val aaa_root = Project("scala", file(".")) settings(projectSettings: _*) settings(ShaResolve.settings: _*) // External dependencies used for various projects lazy val externalDeps: Setting[_] = libraryDependencies <<= (sbtVersion)(v => @@ -206,7 +206,7 @@ object ScalaBuild extends Build with Layers { // Need a report on this... // TODO - Resolve STARR from a repo.. - lazy val STARR = scalaInstance <<= appConfiguration map { app => + lazy val STARR = scalaInstance <<= (appConfiguration, ShaResolve.pullBinaryLibs in ThisBuild) map { (app, _) => val launcher = app.provider.scalaProvider.launcher val library = file("lib/scala-library.jar") val compiler = file("lib/scala-compiler.jar") |