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

Allow URL to be specified for configuration location. No caching is done.

This commit is contained in:
Mark Harrah 2009-11-05 08:28:09 -05:00
parent 99c6891ae2
commit 1454b24e7e
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
launch/Configuration.scala
View File

@ -2,7 +2,7 @@ package xsbt.boot
import Pre._
import java.io.{File, FileInputStream, InputStreamReader}
import java.net.{URI, URL}
import java.net.{MalformedURLException, URI, URL}
object Configuration
{
@ -10,7 +10,7 @@ object Configuration
def find(args: List[String], baseDirectory: File): (URL, List[String]) =
args match
{
case head :: tail if head.startsWith("@")=> (configurationFromFile(head.substring(1), baseDirectory), tail)
case head :: tail if head.startsWith("@")=> (directConfiguration(head.substring(1), baseDirectory), tail)
case _ =>
val propertyConfigured = System.getProperty("sbt.boot.properties")
val url = if(propertyConfigured == null) configurationOnClasspath else configurationFromFile(propertyConfigured, baseDirectory)
@ -21,6 +21,11 @@ object Configuration
resourcePaths.elements.map(getClass.getResource).find(_ ne null) getOrElse
( multiPartError("Could not finder sbt launch configuration. Searched classpath for:", resourcePaths))
}
def directConfiguration(path: String, baseDirectory: File): URL =
{
try { new URL(path) }
catch { case _: MalformedURLException => configurationFromFile(path, baseDirectory) }
}
def configurationFromFile(path: String, baseDirectory: File): URL =
{
def resolve(against: URI): Option[URL] =
@ -40,8 +45,9 @@ object Configuration
val JarBasePath = "/sbt/"
def userConfigurationPath = "/" + ConfigurationName
def defaultConfigurationPath = JarBasePath + ConfigurationName
def resourcePaths = List(userConfigurationPath, defaultConfigurationPath)
def resolveAgainst(baseDirectory: File) = List(baseDirectory toURI, new File(System.getProperty("user.home")) toURI, classLocation(getClass).toURI)
def resourcePaths: List[String] = List(userConfigurationPath, defaultConfigurationPath)
def resolveAgainst(baseDirectory: File): List[URI] = List(baseDirectory toURI, new File(System.getProperty("user.home")) toURI,
toDirectory(classLocation(getClass).toURI))
def classLocation(cl: Class[_]): URL =
{
@ -49,4 +55,12 @@ object Configuration
if(codeSource == null) error("No class location for " + cl)
else codeSource.getLocation
}
def toDirectory(uri: URI): URI =
try
{
val file = new File(uri)
val newFile = if(file.isFile) file.getParentFile else file
newFile.toURI
}
catch { case _: Exception => uri }
}