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

Fix issue 42 (projects should search parents for ivysettings.xml) 

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@988 d89573ee-9141-11dd-94d4-bdf5e562f29c
This commit is contained in:
dmharrah 2009-09-09 03:10:31 +00:00
parent 3cea48116f
commit cf6181690c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/scala/sbt/ManageDependencies.scala
View File

@ -49,7 +49,7 @@ object ManageDependencies
val DefaultMavenFilename = "pom.xml"
private def defaultIvyFile(project: Path) = project / DefaultIvyFilename
private def defaultIvyConfiguration(project: Path) = project / DefaultIvyConfigFilename
private def defaultIvyConfiguration(project: File) = new File(project, DefaultIvyConfigFilename)
private def defaultPOM(project: Path) = project / DefaultMavenFilename
/** Configures Ivy using the provided configuration 'config' and calls 'doWithIvy'. This method takes care of setting up and cleaning up Ivy.*/
@ -129,10 +129,19 @@ object ManageDependencies
def autodetectConfiguration()
{
log.debug("Autodetecting configuration.")
val defaultIvyConfigFile = defaultIvyConfiguration(paths.projectDirectory).asFile
if(defaultIvyConfigFile.canRead)
settings.load(defaultIvyConfigFile)
else
def autodetect(dir: File): Boolean =
(dir != null) &&
{
val defaultIvyConfigFile = defaultIvyConfiguration(dir)
if(defaultIvyConfigFile.canRead)
{
settings.load(defaultIvyConfigFile)
true
}
else
autodetect(dir.getParentFile)
}
if(!autodetect(paths.projectDirectory.asFile))
configureDefaults(defaultResolvers)
}
/** Called to determine dependencies when the dependency manager is SbtManager and no inline dependencies (Scala or XML) are defined