From 1affe9fa90e88cd1dff82ce360de7eca49aa61a5 Mon Sep 17 00:00:00 2001 From: dmharrah Date: Mon, 28 Sep 2009 02:25:51 +0000 Subject: [PATCH] Fix extra test git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1060 d89573ee-9141-11dd-94d4-bdf5e562f29c --- src/main/scala/sbt/ManagedInterface.scala | 2 +- .../dependency-management/extra/changes/UseColor.scala | 5 +++++ .../extra/project/build/DefineColor.scala | 5 +++++ src/sbt-test/dependency-management/extra/test | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala index b7c890337..407070d99 100644 --- a/src/main/scala/sbt/ManagedInterface.scala +++ b/src/main/scala/sbt/ManagedInterface.scala @@ -304,7 +304,7 @@ object Resolver def defaultFileConfiguration = FileConfiguration(true, None) def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true) - def ivyStylePatterns = Patterns(Nil, Nil, false) + def ivyStylePatterns = defaultIvyPatterns//Patterns(Nil, mavenStyleBasePattern :: Nil, false) def defaultPatterns = mavenStylePatterns def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" diff --git a/src/sbt-test/dependency-management/extra/changes/UseColor.scala b/src/sbt-test/dependency-management/extra/changes/UseColor.scala index 8c8a7b7c1..79639ab5e 100644 --- a/src/sbt-test/dependency-management/extra/changes/UseColor.scala +++ b/src/sbt-test/dependency-management/extra/changes/UseColor.scala @@ -2,6 +2,11 @@ import sbt._ class UseColor(info: ProjectInfo) extends DefaultProject(info) { + def ivyCacheDirectory = outputPath / "ivy-cache" + override def updateOptions = CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList + + override def managedStyle = ManagedStyle.Ivy + val repo = Resolver.file("test-repo", ("repo" / "test").asFile) def color = FileUtilities.readString("color".asFile, log).right.getOrElse(error("No color specified")) override def libraryDependencies = Set( "org.scala-tools.sbt" % "test-ivy-extra" %"1.0" extra("e:color" -> color) diff --git a/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala b/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala index 94d17bfbb..658c6c063 100644 --- a/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala +++ b/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala @@ -2,5 +2,10 @@ import sbt._ class DefineColor(info: ProjectInfo) extends DefaultProject(info) { + def ivyCacheDirectory = outputPath / "ivy-cache" + override def updateOptions = CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList + + override def managedStyle = ManagedStyle.Ivy + val publishTo = Resolver.file("test-repo", ("repo" / "test").asFile) override def projectID = super.projectID extra("e:color" -> "red") } \ No newline at end of file diff --git a/src/sbt-test/dependency-management/extra/test b/src/sbt-test/dependency-management/extra/test index fe40c91b6..e79c35cd1 100644 --- a/src/sbt-test/dependency-management/extra/test +++ b/src/sbt-test/dependency-management/extra/test @@ -1,4 +1,4 @@ -> publish-local +> publish [success] $ delete project/build/