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

includes sbt, Scala version extra attributes in repository/cache patterns

This commit is contained in:
Mark Harrah 2011-07-23 23:07:54 -04:00
parent e81d7087ed
commit 5903fb88a2
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ivy/Ivy.scala
View File

@ -4,6 +4,7 @@
package sbt package sbt
import Artifact.{defaultExtension, defaultType} import Artifact.{defaultExtension, defaultType}
import Resolver.PluginPattern
import java.io.File import java.io.File
import java.util.concurrent.Callable import java.util.concurrent.Callable
@ -257,6 +258,9 @@ private object IvySbt
override def findModuleInCache(dd: DependencyDescriptor, revId: ModuleRevisionId, options: CacheMetadataOptions, r: String) = override def findModuleInCache(dd: DependencyDescriptor, revId: ModuleRevisionId, options: CacheMetadataOptions, r: String) =
super.findModuleInCache(dd,revId,options,null) super.findModuleInCache(dd,revId,options,null)
} }
manager.setArtifactPattern(PluginPattern + manager.getArtifactPattern)
manager.setDataFilePattern(PluginPattern + manager.getDataFilePattern)
manager.setIvyPattern(PluginPattern + manager.getIvyPattern)
manager.setUseOrigin(true) manager.setUseOrigin(true)
if(localOnly) if(localOnly)
manager.setDefaultTTL(java.lang.Long.MAX_VALUE); manager.setDefaultTTL(java.lang.Long.MAX_VALUE);

6
ivy/IvyInterface.scala
View File

@ -275,8 +275,10 @@ object Resolver
def ivyStylePatterns = defaultIvyPatterns//Patterns(Nil, Nil, false) def ivyStylePatterns = defaultIvyPatterns//Patterns(Nil, Nil, false)
def defaultPatterns = mavenStylePatterns def defaultPatterns = mavenStylePatterns
def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" def mavenStyleBasePattern = "[organisation]/[module](_[scalaVersion])(_[sbtVersion])/[revision]/[artifact]-[revision](-[classifier]).[ext]"
def localBasePattern = "[organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]" def localBasePattern = "[organisation]/[module]/" + PluginPattern + "[revision]/[type]s/[artifact](-[classifier]).[ext]"
def defaultRetrievePattern = "[type]s/[organisation]/[module]/" + PluginPattern + "[artifact](-[revision])(-[classifier]).[ext]"
final val PluginPattern = "(scala_[scalaVersion]/)(sbt_[sbtVersion]/)"
def mavenLocal = MavenRepository("Maven2 Local", (new File(Path.userHome, ".m2/repository/")).toURI.toURL.toExternalForm) def mavenLocal = MavenRepository("Maven2 Local", (new File(Path.userHome, ".m2/repository/")).toURI.toURL.toExternalForm)
def defaultLocal = defaultUserFileRepository("local") def defaultLocal = defaultUserFileRepository("local")

2
main/Defaults.scala
View File

@ -627,7 +627,7 @@ object Classpaths
projectID <<= pluginProjectID, projectID <<= pluginProjectID,
resolvers in GlobalScope :== Nil, resolvers in GlobalScope :== Nil,
projectDescriptors <<= depMap, projectDescriptors <<= depMap,
retrievePattern in GlobalScope :== "[type]s/[organisation]/[module]/[artifact](-[revision])(-[classifier]).[ext]", retrievePattern in GlobalScope :== Resolver.defaultRetrievePattern,
updateConfiguration <<= (retrieveConfiguration, ivyLoggingLevel)((conf,level) => new UpdateConfiguration(conf, false, level) ), updateConfiguration <<= (retrieveConfiguration, ivyLoggingLevel)((conf,level) => new UpdateConfiguration(conf, false, level) ),
retrieveConfiguration <<= (managedDirectory, retrievePattern, retrieveManaged) { (libm, pattern, enabled) => if(enabled) Some(new RetrieveConfiguration(libm, pattern)) else None }, retrieveConfiguration <<= (managedDirectory, retrievePattern, retrieveManaged) { (libm, pattern, enabled) => if(enabled) Some(new RetrieveConfiguration(libm, pattern)) else None },
ivyConfiguration <<= mkIvyConfiguration, ivyConfiguration <<= mkIvyConfiguration,