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

Fix for issue 39, where sources were not relative in src package 

Fix for type inference issue in latest Scala 2.8.0-SNAPSHOT



git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@962 d89573ee-9141-11dd-94d4-bdf5e562f29c
This commit is contained in:
dmharrah 2009-08-22 17:07:33 +00:00
parent ddb1d4b84b
commit 89ccb9ec3f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/sbt/ProjectPaths.scala
View File

@ -156,8 +156,8 @@ trait MavenStyleScalaPaths extends BasicScalaPaths with BasicPackagePaths
testResourcesPath ::
Nil
def mainSourceRoots = mainJavaSourcePath +++ mainScalaSourcePath
def testSourceRoots = testJavaSourcePath +++ testScalaSourcePath
def mainSourceRoots = (mainJavaSourcePath##) +++ (mainScalaSourcePath##)
def testSourceRoots = (testJavaSourcePath##) +++ (testScalaSourcePath##)
}
trait BasicPackagePaths extends ScalaPaths with PackagePaths

17
src/main/scala/sbt/ScalaProject.scala
View File

@ -256,12 +256,17 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
val setup, cleanup = new ListBuffer[() => Option[String]]
val testListeners = new ListBuffer[TestReportListener]
options.foreach {
case TestFilter(include) => testFilters += include
case ExcludeTests(exclude) => excludeTestsSet ++= exclude
case TestListeners(listeners) => testListeners ++= listeners
case TestSetup(setupFunction) => setup += setupFunction
case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
for(option <- options)
{
option match
{
case TestFilter(include) => testFilters += include
case ExcludeTests(exclude) => excludeTestsSet ++= exclude
case TestListeners(listeners) => testListeners ++= listeners
case TestSetup(setupFunction) => setup += setupFunction
case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
}
() // 2.8.0-SNAPSHOT bug in type inference
}
if(excludeTestsSet.size > 0 && log.atLevel(Level.Debug))