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

convenience method on ScalaInstance to get both library and compiler jars

This commit is contained in:
Mark Harrah 2010-02-14 20:23:56 -05:00
parent bd7460f2ee
commit 9f524cbf83
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compile/ScalaInstance.scala
View File

@ -10,6 +10,7 @@ package xsbt
final class ScalaInstance(val version: String, val loader: ClassLoader, val libraryJar: File, val compilerJar: File) extends NotNull
{
require(version.indexOf(' ') < 0, "Version cannot contain spaces (was '" + version + "')")
def jars = libraryJar :: compilerJar :: Nil
/** Gets the version of Scala in the compiler.properties file from the loader. This version may be different than that given by 'version'*/
lazy val actualVersion = ScalaInstance.actualVersion(loader)(" version " + version)
override def toString = "Scala instance{version label " + version + ", actual version " + actualVersion + ", library jar: " + libraryJar + ", compiler jar: " + compilerJar + "}"

2
launch/src/main/resources/sbt/sbt.boot.properties
View File

@ -34,6 +34,6 @@
project.version: quick=set(1.0), new=prompt(Version)[1.0], fill=prompt(Version)[1.0]
def.scala.version: quick=set(2.7.7), new=set(2.7.7), fill=set(2.7.7)
build.scala.versions: quick=set(2.7.7), new=prompt(Scala version)[2.7.7], fill=prompt(Scala version)[2.7.7]
sbt.version: quick=set(0.6.13), new=prompt(sbt version)[0.6.13], fill=prompt(sbt version)[0.6.13]
sbt.version: quick=set(0.7.0), new=prompt(sbt version)[0.7.0], fill=prompt(sbt version)[0.7.0]
project.scratch: quick=set(true)
project.initialize: quick=set(true), new=set(true)