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

Merge branch 'master' of github.com:harrah/xsbt

This commit is contained in:
Mark Harrah 2010-05-16 20:54:55 -04:00
parent 86b393ab1a cfa5dbd1e5
commit 5e99d5fdd9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbt/scripted/project/build.properties
View File

@ -1,7 +1,7 @@
project.name=scripted project.name=scripted
project.organization=org.scala-tools.sbt project.organization=org.scala-tools.sbt
project.version=0.7.2-SNAPSHOT project.version=0.7.4
sbt.version=0.7.1 sbt.version=0.7.4
def.scala.version=2.7.7 def.scala.version=2.7.7
build.scala.versions=2.7.7 build.scala.versions=2.7.7
project.initialize=false project.initialize=false

2
sbt/scripted/src/main/scala/Scripted.scala
View File

@ -49,7 +49,7 @@ trait Scripted extends Project with MultiTaskProject
def scriptedTest(test: ScriptedTest) = def scriptedTest(test: ScriptedTest) =
task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask) task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask)
val testTasks = tests.map(scriptedTest) val testTasks = tests.map(scriptedTest)
Empty named("scripted-test-complete") dependsOn(testTasks : _*) task {None} named("scripted-test-complete") dependsOn(testTasks : _*)
} }
private def unwrapOption[T](s: T): Option[T] = if(s == null) None else Some(s) private def unwrapOption[T](s: T): Option[T] = if(s == null) None else Some(s)

4
sbt/scripted/src/main/scala/ScriptedTests.scala
View File

@ -13,7 +13,7 @@ import xsbt.test.{CommentHandler, FileCommands, ScriptRunner, TestScriptParser}
final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) extends NotNull final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) extends NotNull
{ {
@deprecated def this(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value) = @deprecated def this(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value) =
this(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level)) = this(resourceBaseDirectory, bufferLog, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level))
private val testResources = new Resources(resourceBaseDirectory) private val testResources = new Resources(resourceBaseDirectory)
@ -87,7 +87,7 @@ object CompatibilityLevel extends Enumeration
object FillProperties object FillProperties
{ {
def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value): Unit = def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value): Unit =
apply(projectDirectory, sbtVersion, defScalaVersion, defaultVersions(level)) apply(projectDirectory, sbtVersion, defScalaVersion, CompatibilityLevel.defaultVersions(level))
def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String): Unit = def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String): Unit =
{ {
import xsbt.Paths._ import xsbt.Paths._