diff --git a/install/project/build.properties b/install/project/build.properties index b2811cd24..7dbce4c87 100644 --- a/install/project/build.properties +++ b/install/project/build.properties @@ -2,6 +2,6 @@ #Thu Jun 25 14:31:30 EDT 2009 project.organization=org.scala-tools.sbt project.name=extract -sbt.version=0.4.7-p13 +sbt.version=0.5 project.version=0.1 scala.version=2.7.5 diff --git a/install/project/build/InstallProject.scala b/install/project/build/InstallProject.scala index b31acfd53..68b99f605 100644 --- a/install/project/build/InstallProject.scala +++ b/install/project/build/InstallProject.scala @@ -27,6 +27,8 @@ protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtra protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info) { override def publishLocalAction = publishAction + override def deliverAction = publishAction + override def deliverLocalAction = publishAction override def publishAction = task {None} override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil) private lazy val plugin = pluginProject diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala index f5020d411..ccce8f088 100644 --- a/src/main/scala/sbt/BasicProjectTypes.scala +++ b/src/main/scala/sbt/BasicProjectTypes.scala @@ -223,9 +223,9 @@ trait PublishConfiguration extends NotNull } object ManagedStyle extends Enumeration { - val Maven, Ivy = Value + val Maven, Ivy, Auto = Value } -import ManagedStyle.{Ivy, Maven, Value => ManagedType} +import ManagedStyle.{Auto, Ivy, Maven, Value => ManagedType} trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject with BasicDependencyPaths { import BasicManagedProject._ @@ -267,13 +267,14 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations)) def useMavenConfigurations = true // TBD: set to true and deprecate def useDefaultConfigurations = useMavenConfigurations - def managedStyle: ManagedType = Maven + def managedStyle: ManagedType = Auto protected implicit final val defaultPatterns: RepositoryHelpers.Patterns = { managedStyle match { case Maven => Resolver.mavenStylePatterns case Ivy => Resolver.ivyStylePatterns + case Auto => Resolver.defaultPatterns } } /** The options provided to the 'update' action. This is by default the options in 'baseUpdateOptions'. @@ -555,6 +556,7 @@ trait ReflectiveArtifacts extends ManagedProject { case Maven =>reflective ++ List(Artifact(artifactID, "pom", "pom")) case Ivy => reflective + case Auto => Set.empty } } def reflectiveArtifacts: Set[Artifact] = Set(Reflective.reflectiveMappings[Artifact](this).values.toList: _*)