From e73a49c467c7102de68b0605b5a63c52c57f8942 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 13 Apr 2011 19:01:22 -0400
Subject: [PATCH] Ivy home configurable instead of cache directory, work on
 artifact test

---
 ivy/Ivy.scala               | 10 +++++-----
 ivy/IvyConfigurations.scala |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ivy/Ivy.scala b/ivy/Ivy.scala
index 21ba28bff..22d52a6a6 100644
--- a/ivy/Ivy.scala
+++ b/ivy/Ivy.scala
@@ -63,8 +63,9 @@ final class IvySbt(val configuration: IvyConfiguration)
 		configuration match
 		{
 			case e: ExternalIvyConfiguration => is.load(e.file)
-			case i: InlineIvyConfiguration => 
-				IvySbt.configureCache(is, i.paths.cacheDirectory, i.localOnly)
+			case i: InlineIvyConfiguration =>
+				i.paths.ivyHome foreach settings.setDefaultIvyUserDir
+				IvySbt.configureCache(is, i.localOnly)
 				IvySbt.setResolvers(is, i.resolvers, i.otherResolvers, i.localOnly, configuration.log)
 				IvySbt.setModuleConfigurations(is, i.moduleConfigurations)
 		}
@@ -226,9 +227,9 @@ private object IvySbt
 			settings.addModuleConfiguration(attributes, settings.getMatcher(EXACT_OR_REGEXP), resolver.name, null, null, null)
 		}
 	}
-	private def configureCache(settings: IvySettings, dir: Option[File], localOnly: Boolean)
+	private def configureCache(settings: IvySettings, localOnly: Boolean)
 	{
-		val cacheDir = dir.getOrElse(settings.getDefaultRepositoryCacheBasedir())
+		val cacheDir = settings.getDefaultRepositoryCacheBasedir()
 		val manager = new DefaultRepositoryCacheManager("default-cache", settings, cacheDir) {
 			override def findModuleInCache(dd: DependencyDescriptor, revId: ModuleRevisionId, options: CacheMetadataOptions, r: String) =
 				super.findModuleInCache(dd,revId,options,null)
@@ -243,7 +244,6 @@ private object IvySbt
 		}
 		settings.addRepositoryCacheManager(manager)
 		settings.setDefaultRepositoryCacheManager(manager)
-		dir.foreach(dir => settings.setDefaultResolutionCacheBasedir(dir.getAbsolutePath))
 	}
 	def toIvyConfiguration(configuration: Configuration) =
 	{
diff --git a/ivy/IvyConfigurations.scala b/ivy/IvyConfigurations.scala
index 6903c44d8..cc8bbd46f 100644
--- a/ivy/IvyConfigurations.scala
+++ b/ivy/IvyConfigurations.scala
@@ -6,9 +6,9 @@ package sbt
 import java.io.File
 import scala.xml.{Node, NodeSeq}
 
-final class IvyPaths(val baseDirectory: File, val cacheDirectory: Option[File])
+final class IvyPaths(val baseDirectory: File, val ivyHome: Option[File])
 {
-	def withBase(newBaseDirectory: File) = new IvyPaths(newBaseDirectory, cacheDirectory)
+	def withBase(newBaseDirectory: File) = new IvyPaths(newBaseDirectory, ivyHome)
 }
 sealed trait IvyConfiguration
 {