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

* Fix installer build 

* Revert managedStyle back to Auto



git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@814 d89573ee-9141-11dd-94d4-bdf5e562f29c
This commit is contained in:
dmharrah 2009-06-26 02:09:31 +00:00
parent 7f92cc5f4c
commit 2f4ba50850
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/project/build.properties
View File

@ -2,6 +2,6 @@
#Thu Jun 25 14:31:30 EDT 2009 #Thu Jun 25 14:31:30 EDT 2009
project.organization=org.scala-tools.sbt project.organization=org.scala-tools.sbt
project.name=extract project.name=extract
sbt.version=0.4.7-p13 sbt.version=0.5
project.version=0.1 project.version=0.1
scala.version=2.7.5 scala.version=2.7.5

2
install/project/build/InstallProject.scala
View File

@ -27,6 +27,8 @@ protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtra
protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info) protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info)
{ {
override def publishLocalAction = publishAction override def publishLocalAction = publishAction
override def deliverAction = publishAction
override def deliverLocalAction = publishAction
override def publishAction = task {None} override def publishAction = task {None}
override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil) override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil)
private lazy val plugin = pluginProject private lazy val plugin = pluginProject

8
src/main/scala/sbt/BasicProjectTypes.scala
View File

@ -223,9 +223,9 @@ trait PublishConfiguration extends NotNull
} }
object ManagedStyle extends Enumeration 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 trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject with BasicDependencyPaths
{ {
import BasicManagedProject._ import BasicManagedProject._
@ -267,13 +267,14 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations)) def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations))
def useMavenConfigurations = true // TBD: set to true and deprecate def useMavenConfigurations = true // TBD: set to true and deprecate
def useDefaultConfigurations = useMavenConfigurations def useDefaultConfigurations = useMavenConfigurations
def managedStyle: ManagedType = Maven def managedStyle: ManagedType = Auto
protected implicit final val defaultPatterns: RepositoryHelpers.Patterns = protected implicit final val defaultPatterns: RepositoryHelpers.Patterns =
{ {
managedStyle match managedStyle match
{ {
case Maven => Resolver.mavenStylePatterns case Maven => Resolver.mavenStylePatterns
case Ivy => Resolver.ivyStylePatterns case Ivy => Resolver.ivyStylePatterns
case Auto => Resolver.defaultPatterns
} }
} }
/** The options provided to the 'update' action. This is by default the options in 'baseUpdateOptions'. /** 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 Maven =>reflective ++ List(Artifact(artifactID, "pom", "pom"))
case Ivy => reflective case Ivy => reflective
case Auto => Set.empty
} }
} }
def reflectiveArtifacts: Set[Artifact] = Set(Reflective.reflectiveMappings[Artifact](this).values.toList: _*) def reflectiveArtifacts: Set[Artifact] = Set(Reflective.reflectiveMappings[Artifact](this).values.toList: _*)