better location for global settings in the precedence chain

This commit is contained in:
Mark Harrah 2011-07-18 17:14:22 -04:00
parent bcc3e12abc
commit b3bcd82a21
1 changed files with 1 additions and 2 deletions

View File

@ -172,11 +172,10 @@ object Load
val ref = ProjectRef(uri, id)
val defineConfig = for(c <- project.configurations) yield ( (configuration in (ref, ConfigKey(c.name))) :== c)
val loader = build.unit.definitions.loader
val injected = injectSettings.project ++ injectSettings.projectLoaded(loader)
val settings =
(thisProject :== project) +:
(thisProjectRef :== ref) +:
(injected ++ defineConfig ++ project.settings ++ pluginThisProject ++ configurations(srcs, eval, build.imports)(loader))
(defineConfig ++ project.settings ++ injectSettings.projectLoaded(loader) ++ pluginThisProject ++ configurations(srcs, eval, build.imports)(loader) ++ injectSettings.project)
// map This to thisScope, Select(p) to mapRef(uri, rootProject, p)
transformSettings(projectScope(ref), uri, rootProject, settings)