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

update comment

This commit is contained in:
Mark Harrah 2010-06-07 10:51:22 -04:00
parent 5e4fe71560
commit 393580f1cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launch/ConfigurationParser.scala
View File

@ -35,7 +35,7 @@ class ConfigurationParser extends NotNull
val (properties, m6) = processSection(m5, "app-properties", getAppProperties) val (properties, m6) = processSection(m5, "app-properties", getAppProperties)
val (cacheDir, m7) = processSection(m6, "ivy", getIvy) val (cacheDir, m7) = processSection(m6, "ivy", getIvy)
check(m7, "section") check(m7, "section")
val classifiers = Classifiers("" :: scalaClassifiers, "" :: appClassifiers) val classifiers = Classifiers("" :: scalaClassifiers, "" :: appClassifiers) // the added "" ensures that the main jars are retrieved
new LaunchConfiguration(scalaVersion, IvyOptions(cacheDir, classifiers, repositories), app, boot, logging, properties) new LaunchConfiguration(scalaVersion, IvyOptions(cacheDir, classifiers, repositories), app, boot, logging, properties)
} }
def getScala(m: LabelMap) = def getScala(m: LabelMap) =
@ -43,7 +43,7 @@ class ConfigurationParser extends NotNull
val (scalaVersion, m1) = getVersion(m, "Scala version", "scala.version") val (scalaVersion, m1) = getVersion(m, "Scala version", "scala.version")
val (scalaClassifiers, m2) = ids(m1, "classifiers", Nil) val (scalaClassifiers, m2) = ids(m1, "classifiers", Nil)
check(m2, "label") check(m2, "label")
(scalaVersion, scalaClassifiers) // the added "" ensures that the main jars are retrieved (scalaVersion, scalaClassifiers)
} }
def getVersion(m: LabelMap, label: String, defaultName: String): (Version, LabelMap) = process(m, "version", processVersion(label, defaultName)) def getVersion(m: LabelMap, label: String, defaultName: String): (Version, LabelMap) = process(m, "version", processVersion(label, defaultName))
def processVersion(label: String, defaultName: String)(value: Option[String]): Version = def processVersion(label: String, defaultName: String)(value: Option[String]): Version =