From 6efe299e10458135690cb9b1062efda1d5f0a283 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Thu, 26 May 2011 08:21:26 -0400 Subject: [PATCH] migrate another test --- .../publish-local/changes/RetrieveTest.scala | 24 ++++++++++++++++++ .../project/MultiPublishTest.scala | 21 ++++++++++++++++ .../publish-local/project/build.properties | 3 --- .../project/build/MultiPublishTest.scala | 25 ------------------- .../project/changes/RetrieveTest.scala | 15 ----------- .../dependency-management/publish-local/test | 22 ++++++---------- 6 files changed, 52 insertions(+), 58 deletions(-) create mode 100644 sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala create mode 100644 sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala delete mode 100644 sbt/src/sbt-test/dependency-management/publish-local/project/build.properties delete mode 100644 sbt/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala delete mode 100644 sbt/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala diff --git a/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala new file mode 100644 index 000000000..d45785e4d --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/publish-local/changes/RetrieveTest.scala @@ -0,0 +1,24 @@ + import sbt._ + import Keys._ + +object MultiPublishTest extends Build +{ + override lazy val settings = super.settings ++ Seq( + organization := "A", + version := "1.0", + ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy" / "cache")) ), + externalResolvers <<= baseDirectory { base => Resolver.file("local", base / "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil } + } + + lazy val projects = Seq(root) + lazy val root = Project("root", file(".")) settings( + name := "Retrieve Test", + libraryDependencies := if("mavenStyle".asFile.exists) mavenStyleDependencies else ivyStyleDependencies + ) + + def ivyStyleDependencies = parentDep("A") :: subDep("A") :: subDep("B") ::parentDep("D") :: Nil + def mavenStyleDependencies = parentDep("B") :: parentDep("C") :: subDep("C") :: subDep("D") :: Nil + + def parentDep(org: String) = org %% "publish-test" % "1.0" + def subDep(org: String) = org %% "sub-project" % "1.0" +} diff --git a/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala new file mode 100644 index 000000000..d9a61d1e0 --- /dev/null +++ b/sbt/src/sbt-test/dependency-management/publish-local/project/MultiPublishTest.scala @@ -0,0 +1,21 @@ + import sbt._ + import Keys._ + +object MultiPublishTest extends Build +{ + override lazy val settings = super.settings ++ Seq( + organization := "A", + version := "1.0", + ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy" / "cache")) ), + externalResolvers <<= baseDirectory { base => Resolver.file("local", base / "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil } + ) + + lazy val projects = Seq(root) + lazy val root = Project("root", file(".")) settings( mavenStyle, name = "Publish Test" ) + + lazy val sub = Project("sub", file("sub")) settings( mavenStyle, name = "Sub Project" ) + + lazy val mavenStyle = publishMavenStyle <<= baseDirectory { base => (base / "mavenStyle") exists } + + override def deliverProjectDependencies = if(managedStyle == sub.managedStyle) super.deliverProjectDependencies else Nil +} \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/publish-local/project/build.properties b/sbt/src/sbt-test/dependency-management/publish-local/project/build.properties deleted file mode 100644 index f3dadda06..000000000 --- a/sbt/src/sbt-test/dependency-management/publish-local/project/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -project.name=Publish Test -project.organization=test -project.version=1.0 \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala deleted file mode 100644 index 4a60bc061..000000000 --- a/sbt/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala +++ /dev/null @@ -1,25 +0,0 @@ -import sbt._ - -class MultiPublishTest(info: ProjectInfo) extends ParentProject(info) -{ - override def managedStyle = - if(path("mavenStyle").exists) - ManagedStyle.Maven - else - ManagedStyle.Auto - - override def deliverProjectDependencies = if(managedStyle == sub.managedStyle) super.deliverProjectDependencies else Nil - - override def ivyCacheDirectory = Some("ivy" / "cache") - override def ivyRepositories = Resolver.file("local", "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil - - lazy val sub = project("sub", "Sub Project", new SubProject(_)) - class SubProject(info: ProjectInfo) extends DefaultProject(info) - { - override def managedStyle = - if(path("mavenStyle").exists) - ManagedStyle.Maven - else - ManagedStyle.Auto - } -} \ No newline at end of file diff --git a/sbt/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala b/sbt/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala deleted file mode 100644 index d0bec6cc8..000000000 --- a/sbt/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala +++ /dev/null @@ -1,15 +0,0 @@ -import sbt._ - -class Retrieve(info: ProjectInfo) extends ParentProject(info) -{ - override def ivyCacheDirectory = Some(outputPath / "ivy" / "cache") - override def ivyRepositories = Resolver.file("local", "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil - - override def libraryDependencies = Set() ++( if("mavenStyle".asFile.exists) mavenStyleDependencies else autoStyleDependencies ) - - def autoStyleDependencies = parentDep("A") :: subDep("A") :: subDep("B") ::parentDep("D") :: Nil - def mavenStyleDependencies = parentDep("B") :: parentDep("C") :: subDep("C") :: subDep("D") :: Nil - - def parentDep(org: String) = org %% "publish-test" % "1.0" - def subDep(org: String) = org %% "sub-project" % "1.0" -} diff --git a/sbt/src/sbt-test/dependency-management/publish-local/test b/sbt/src/sbt-test/dependency-management/publish-local/test index 943920c4a..f08ff8f0a 100644 --- a/sbt/src/sbt-test/dependency-management/publish-local/test +++ b/sbt/src/sbt-test/dependency-management/publish-local/test @@ -1,34 +1,26 @@ -> set project.organization A -> reload > publish-local -> set project.organization B $ touch mavenStyle -> reload +> set organization in ThisBuild := "B" > publish-local -> set project.organization C $ touch sub/mavenStyle -> reload +> set organization in ThisBuild := "C" > publish-local -> set project.organization D $ delete mavenStyle -> reload +> set organization := "D" > publish-local - -> set project.name Retrieve Test +> set name := "Retrieve Test" > clean -$ delete project/build/ -$ copy-file project/changes/RetrieveTest.scala project/build/RetrieveTest.scala +$ delete project/MultiPublishTest.scala +$ copy-file changes/RetrieveTest.scala project/RetrieveTest.scala > reload -> clean-lib ->debug > update $ touch mavenStyle > reload -> clean-lib +> clean > update \ No newline at end of file