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

clean up scalaOrg changes

This commit is contained in:
Mark Harrah 2012-04-12 17:31:24 -04:00
parent 2aad26a5ba
commit 2a84a80d5b
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launch/BootConfiguration.scala
View File

@ -6,11 +6,12 @@
import java.io.File import java.io.File
// <boot.directory> // <boot.directory>
// scala-<scala.version>/ [baseDirectoryName] // [<scala-org>.]scala-<scala.version>/ [baseDirectoryName]
// lib/ [ScalaDirectoryName] // lib/ [ScalaDirectoryName]
// <app.name>-<app.version>/ [appDirectoryName] // <app.name>-<app.version>/ [appDirectoryName]
// //
// see also ProjectProperties for the set of constants that apply to the build.properties file in a project // see also ProjectProperties for the set of constants that apply to the build.properties file in a project
// The scala organization is used as a prefix in baseDirectoryName when a non-standard organization is used.
private object BootConfiguration private object BootConfiguration
{ {
// these are the Scala module identifiers to resolve/retrieve // these are the Scala module identifiers to resolve/retrieve
@ -53,11 +54,11 @@ private object BootConfiguration
val DefaultIvyConfiguration = "default" val DefaultIvyConfiguration = "default"
/** The name of the directory within the boot directory to retrieve scala to. */
val ScalaDirectoryName = "lib" val ScalaDirectoryName = "lib"
/** The Ivy pattern to use for retrieving the scala compiler and library. It is relative to the directory /** The Ivy pattern to use for retrieving the scala compiler and library. It is relative to the directory
* containing all jars for the requested version of scala. * containing all jars for the requested version of scala. */
*/
val scalaRetrievePattern = ScalaDirectoryName + "/[artifact](-[classifier]).[ext]" val scalaRetrievePattern = ScalaDirectoryName + "/[artifact](-[classifier]).[ext]"
def artifactType(classifier: String) = def artifactType(classifier: String) =

1
launch/Update.scala
View File

@ -37,7 +37,6 @@ final class UpdateConfiguration(val bootDirectory: File, val ivyHome: Option[Fil
val scalaVersion: Option[String], val repositories: List[xsbti.Repository], val checksums: List[String]) { val scalaVersion: Option[String], val repositories: List[xsbti.Repository], val checksums: List[String]) {
def getScalaVersion = scalaVersion match { case Some(sv) => sv; case None => "" } def getScalaVersion = scalaVersion match { case Some(sv) => sv; case None => "" }
} }
final class UpdateResult(val success: Boolean, val scalaVersion: Option[String]) final class UpdateResult(val success: Boolean, val scalaVersion: Option[String])