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

make a few settings easier to override globally

This commit is contained in:
Mark Harrah 2011-05-23 08:14:39 -04:00
parent 6ae6a4b9ad
commit 17f243bf9c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/Defaults.scala
View File

@ -60,6 +60,7 @@ object Defaults extends BuildCommon
credentials :== Nil,
scalaHome :== None,
javaHome :== None,
version :== "0.1",
outputStrategy :== None,
fork :== false,
javaOptions :== Nil,
@ -85,7 +86,6 @@ object Defaults extends BuildCommon
))
def projectCore: Seq[Setting[_]] = Seq(
name <<= thisProject(_.id),
version :== "0.1",
runnerSetting
)
def paths = Seq(
@ -543,9 +543,9 @@ object Classpaths
val baseSettings: Seq[Setting[_]] = Seq(
unmanagedBase <<= baseDirectory / "lib",
normalizedName <<= name(StringUtilities.normalize),
organization <<= normalizedName.identity,
organization <<= organization or normalizedName.identity,
classpathFilter in GlobalScope :== "*.jar",
externalResolvers <<= resolvers map Resolver.withDefaultResolvers,
externalResolvers <<= externalResolvers or (resolvers map Resolver.withDefaultResolvers),
fullResolvers <<= (projectResolver,externalResolvers,sbtPlugin,sbtResolver) map { (pr,rs,isPlugin,sr) =>
val base = pr +: rs
if(isPlugin) sr +: base else base
@ -580,9 +580,7 @@ object Classpaths
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, checksums, appConfiguration, streams) map { (rs, paths, other, moduleConfs, off, check, app, s) =>
new InlineIvyConfiguration(paths, rs, other, moduleConfs, off, Some(lock(app)), check, s.log)
},
ivyConfiguration <<= ivyConfiguration or mkIvyConfiguration,
ivyConfigurations <<= (autoCompilerPlugins, internalConfigurationMap, thisProject) { (auto, internalMap, project) =>
(project.configurations ++ project.configurations.map(internalMap) ++ (if(auto) CompilerPlugin :: Nil else Nil)).distinct
},
@ -606,7 +604,7 @@ object Classpaths
update <<= (ivyModule, updateConfiguration, cacheDirectory, scalaInstance, streams) map { (module, config, cacheDirectory, si, s) =>
cachedUpdate(cacheDirectory / "update", module, config, Some(si), s.log)
},
transitiveClassifiers :== Seq("sources", "javadoc"),
transitiveClassifiers in GlobalScope :== Seq("sources", "javadoc"),
updateClassifiers <<= (ivySbt, projectID, update, transitiveClassifiers, updateConfiguration, ivyScala, streams) map { (is, pid, up, classifiers, c, ivyScala, s) =>
IvyActions.transitive(is, pid, up, classifiers, c, ivyScala, s.log)
},
@ -709,6 +707,10 @@ object Classpaths
(thisProjectRef, thisProject, configuration, settings) flatMap internalDependencies0
def unmanagedDependencies: Initialize[Task[Classpath]] =
(thisProjectRef, thisProject, configuration, settings) flatMap unmanagedDependencies0
def mkIvyConfiguration: Initialize[Task[IvyConfiguration]] =
(fullResolvers, ivyPaths, otherResolvers, moduleConfigurations, offline, checksums, appConfiguration, streams) map { (rs, paths, other, moduleConfs, off, check, app, s) =>
new InlineIvyConfiguration(paths, rs, other, moduleConfs, off, Some(lock(app)), check, s.log)
}
import java.util.LinkedHashSet
import collection.JavaConversions.asScalaSet