luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scalaVersion in GlobalScope, delegates test

This commit is contained in:
Mark Harrah 2011-03-28 22:28:54 -04:00
parent 496cd05de8
commit 4821f16eb3
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/Defaults.scala
View File

@ -123,7 +123,7 @@ object Defaults
javacOptions in GlobalScope :== Nil,
scalacOptions in GlobalScope :== Nil,
scalaInstance <<= scalaInstanceSetting,
scalaVersion <<= appConfiguration( _.provider.scalaProvider.version),
scalaVersion in GlobalScope <<= appConfiguration( _.provider.scalaProvider.version),
target <<= (target, scalaInstance, crossPaths)( (t,si,cross) => if(cross) t / ("scala-" + si.actualVersion) else t )
)
@ -497,13 +497,12 @@ object Classpaths
projectID <<= (organization,moduleID,version,artifacts){ (org,module,version,as) => ModuleID(org, module, version).cross(true).artifacts(as : _*) },
resolvers in GlobalScope :== Nil,
projectDescriptors <<= depMap,
retrievePattern :== "[type]/[organisation]/[module]/[artifact](-[revision])(-[classifier]).[ext]",
retrievePattern in GlobalScope :== "[type]/[organisation]/[module]/[artifact](-[revision])(-[classifier]).[ext]",
updateConfiguration <<= (retrieveConfiguration, ivyLoggingLevel)((conf,level) => new UpdateConfiguration(conf, false, level) ),
retrieveConfiguration <<= (managedDirectory, retrievePattern, retrieveManaged) { (libm, pattern, enabled) => if(enabled) Some(new RetrieveConfiguration(libm, pattern)) else None },
ivyConfiguration <<= (fullResolvers, ivyPaths, otherResolvers, moduleConfigurations, offline, appConfiguration) map { (rs, paths, other, moduleConfs, off, app) =>
// todo: pass logger from streams directly to IvyActions
ivyConfiguration <<= (fullResolvers, ivyPaths, otherResolvers, moduleConfigurations, offline, appConfiguration, streams) map { (rs, paths, other, moduleConfs, off, app, s) =>
val lock = app.provider.scalaProvider.launcher.globalLock
new InlineIvyConfiguration(paths, rs, other, moduleConfs, off, Some(lock), ConsoleLogger())
new InlineIvyConfiguration(paths, rs, other, moduleConfs, off, Some(lock), s.log)
},
moduleSettings <<= (projectID, allDependencies, ivyXML, thisProject, defaultConfiguration, ivyScala, ivyValidate) map {
(pid, deps, ivyXML, project, defaultConf, ivyS, validate) => new InlineConfiguration(pid, deps, ivyXML, project.configurations, defaultConf, ivyS, validate)

18
sbt/src/sbt-test/project/delegates/project/Build.scala Normal file
View File

@ -0,0 +1,18 @@
import sbt._
import complete.DefaultParsers._
import Keys._
object B extends Build
{
val check = InputKey[Unit]("check-max-errors")
lazy val projects = Seq(root, sub)
lazy val root = Project("root", file("."))
lazy val sub = Project("sub", file(".")) delegates(root) settings(check <<= checkTask)
lazy val checkTask = InputTask(_ => Space ~> NatBasic) { result =>
(result, maxErrors) map { (i, max) =>
if(i != max) error("Expected max-errors to be " + i + ", but it was " + max)
}
}
}

5
sbt/src/sbt-test/project/delegates/test Normal file
View File

@ -0,0 +1,5 @@
> sub/check-max-errors 100
> set maxErrors := 17
> sub/check-max-errors 17
> set maxErrors in LocalProject("sub") := 13
> sub/check-max-errors 13