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

more on #155

This commit is contained in:
Mark Harrah 2011-08-23 19:51:50 -04:00
parent 86c0ff1c09
commit 5f674dbea4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/ConvertResolver.scala
View File

@ -19,7 +19,7 @@ private object ConvertResolver
{ {
case repo: MavenRepository => case repo: MavenRepository =>
{ {
val pattern = Collections.singletonList(repo.root + Resolver.mavenStyleBasePattern) val pattern = Collections.singletonList(Resolver.resolvePattern(repo.root, Resolver.mavenStyleBasePattern))
final class PluginCapableResolver extends IBiblioResolver { final class PluginCapableResolver extends IBiblioResolver {
def setPatterns() { // done this way for access to protected methods. def setPatterns() { // done this way for access to protected methods.
setArtifactPatterns(pattern) setArtifactPatterns(pattern)

10
ivy/IvyInterface.scala
View File

@ -275,12 +275,14 @@ object Resolver
/** Resolves the ivy file and artifact patterns in `patterns` against the given base. */ /** Resolves the ivy file and artifact patterns in `patterns` against the given base. */
private def resolvePatterns(base: String, basePatterns: Patterns): Patterns = private def resolvePatterns(base: String, basePatterns: Patterns): Patterns =
{ {
val normBase = base.replace('\\', '/') def resolveAll(patterns: Seq[String]) = patterns.map(p => resolvePattern(base, p))
def resolve(pattern: String) = if(normBase.endsWith("/") || pattern.startsWith("/")) normBase +pattern else normBase + "/" + pattern
def resolveAll(patterns: Seq[String]) = patterns.map(resolve)
Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible) Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible)
} }
private[sbt] def resolvePattern(base: String, pattern: String): String =
{
val normBase = base.replace('\\', '/')
if(normBase.endsWith("/") || pattern.startsWith("/")) normBase + pattern else normBase + "/" + pattern
}
def defaultFileConfiguration = FileConfiguration(true, None) def defaultFileConfiguration = FileConfiguration(true, None)
def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true) def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true)
def ivyStylePatterns = defaultIvyPatterns//Patterns(Nil, Nil, false) def ivyStylePatterns = defaultIvyPatterns//Patterns(Nil, Nil, false)