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

incremental tests, misc fixes

This commit is contained in:
Mark Harrah 2011-02-26 20:34:18 -05:00
parent a68e4c74f9
commit 83866ffb42
46 changed files with 35 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile/inc/Incremental.scala
View File

@ -11,7 +11,7 @@ import java.io.File
object Incremental
{
def println(s: String) = if(java.lang.Boolean.getBoolean("xsbt.inc.debug")) System.out.println(s) else ()
def println(s: => String) = if(java.lang.Boolean.getBoolean("xsbt.inc.debug")) System.out.println(s) else ()
def compile(sources: Set[File], entry: String => Option[File], previous: Analysis, current: ReadStamps, forEntry: File => Option[Analysis], doCompile: Set[File] => Analysis)(implicit equivS: Equiv[Stamp]): (Boolean, Analysis) =
{
val initialChanges = changedInitial(entry, sources, previous, current, forEntry)

2
main/Main.scala
View File

@ -220,7 +220,7 @@ object BuiltinCommands
val extracted = Project extract s
import extracted._
val result = session.currentEval().eval(arg, srcName = "<eval>", imports = autoImports(extracted))
log.info("ans: " + result.tpe + " = " + result.value.toString)
log.info("ans: " + result.tpe + " = " + result.value)
s
}
def sessionCommand = Command.make(SessionCommand, sessionBrief, SessionSettings.Help)(SessionSettings.command)

2
main/Project.scala
View File

@ -237,7 +237,7 @@ object SessionSettings
val project = Project.getProject(pref, structure).getOrElse(error("Invalid project reference " + pref))
val appendTo: File = BuildPaths.configurationSources(project.base).headOption.getOrElse(new File(project.base, "build.sbt"))
val baseAppend = settingStrings(settings).flatMap("" :: _ :: Nil)
val adjustedLines = if( hasTrailingBlank(IO.readLines(appendTo)) ) baseAppend else baseAppend
val adjustedLines = if(appendTo.isFile && hasTrailingBlank(IO.readLines(appendTo)) ) baseAppend else "" +: baseAppend
IO.writeLines(appendTo, adjustedLines, append = true)
}
def hasTrailingBlank(lines: Seq[String]) = lines.takeRight(1).exists(_.trim.isEmpty)

3
sbt/src/sbt-test/source-dependencies/abstract-type/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=abstract-type
project.version=1.0
project.scratch=true

2
sbt/src/sbt-test/source-dependencies/added/project/build.properties
View File

@ -1,2 +0,0 @@
project.name=test
project.version=1.0

3
sbt/src/sbt-test/source-dependencies/by-name/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=by-name
project.version=1.0
project.scratch=true

4
sbt/src/sbt-test/source-dependencies/compactify/build.sbt Normal file
View File

@ -0,0 +1,4 @@
TaskKey("output-empty") <<= ClassDirectory in Configurations.Compile map { outputDirectory =>
def classes = (outputDirectory ** "*.class").get
if(!classes.isEmpty) error("Classes existed:\n\t" + classes.mkString("\n\t"))
}

2
sbt/src/sbt-test/source-dependencies/compactify/project/build.properties
View File

@ -1,2 +0,0 @@
project.name=Compactify Test
project.version=1.0

7
sbt/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
View File

@ -1,7 +0,0 @@
import sbt._
class CompactifyTest(info: ProjectInfo) extends DefaultProject(info)
{
def classes = (outputDirectory ** "*.class").get
lazy val outputEmpty = task { if(!classes.isEmpty) error("Classes existed:\n\t" + classes.mkString("\n\t")) }
}

3
sbt/src/sbt-test/source-dependencies/default-params/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=default-params
project.version=1.0
project.scratch=true

4
sbt/src/sbt-test/source-dependencies/empty-a/project/build.properties
View File

@ -1,4 +0,0 @@
#Project properties
#Tue Jan 27 07:55:42 EST 2009
project.name=Empty Source Test
project.version=1.0

3
sbt/src/sbt-test/source-dependencies/erasure/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=erasure
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/false-error/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=no-false-error
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/implicit-params/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=implicit-params
project.version=1.0
project.scratch=true

8
sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt Normal file
View File

@ -0,0 +1,8 @@
Name :== "test"
TaskKey("check-same") <<= CompileTask in Configurations.Compile map { analysis =>
analysis.apis.internal foreach { case (_, api) =>
assert( xsbt.api.APIUtil.verifyTypeParameters(api) )
assert( xsbt.api.SameAPI(api, api) )
}
}

12
sbt/src/sbt-test/source-dependencies/inherited_type_params/project/P.scala
View File

@ -1,12 +0,0 @@
import sbt._
class P(info: ProjectInfo) extends DefaultProject(info)
{
override def name = "test"
lazy val checkSame = compile map { analysis =>
analysis.apis.internal foreach { case (_, api) =>
assert( xsbt.api.APIUtil.verifyTypeParameters(api) )
assert( xsbt.api.SameAPI(api, api) )
}
}
}

2
sbt/src/sbt-test/source-dependencies/inherited_type_params/project/build.properties
View File

@ -1,2 +0,0 @@
project.name=test
project.version=1.0

3
sbt/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=intermediate-error
project.version=1.0
project.scratch=true

2
sbt/src/sbt-test/source-dependencies/java-basic/project/build.properties
View File

@ -1,2 +0,0 @@
project.name=Basic Java Dependency Test
project.version=1.0

2
sbt/src/sbt-test/source-dependencies/java-basic/test
View File

@ -1,5 +1,5 @@
# Basic test for Java dependency tracking
> set xsbt.inc.debug true
> 'eval System.setProperty("xsbt.inc.debug", "true")'
# A is a basic Java file with no dependencies. Just a basic check for Java compilation
$ copy-file changes/A.java src/main/java/a/A.java

2
sbt/src/sbt-test/source-dependencies/java-static/project/build.properties
View File

@ -1,2 +0,0 @@
project.name=Java static test
project.version=9.5.3

3
sbt/src/sbt-test/source-dependencies/lazy-val/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=lazy-val
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/linearization/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=lazy-val
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/named/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=named
project.version=1.0
project.scratch=true

4
sbt/src/sbt-test/source-dependencies/new-cyclic/project/build.properties
View File

@ -1,4 +0,0 @@
#Project properties
#Mon Feb 09 21:05:16 EST 2009
project.name=Test
project.version=1.0

3
sbt/src/sbt-test/source-dependencies/parent-change/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=parent-member
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=parent-member-change
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/qualified-access/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=qualified-access
project.version=1.0
project.scratch=true

4
sbt/src/sbt-test/source-dependencies/remove-test-a/project/build.properties
View File

@ -1,4 +0,0 @@
#Project properties
#Fri Jan 23 22:29:49 EST 2009
project.name=Test Project A
project.version=1.0

4
sbt/src/sbt-test/source-dependencies/remove-test-b/project/build.properties
View File

@ -1,4 +0,0 @@
#Project properties
#Sat Jan 24 19:12:23 EST 2009
project.name=Remove Test B
project.version=1.0

3
sbt/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=repeated-parameters
project.version=1.0
project.scratch=true

19
sbt/src/sbt-test/source-dependencies/replace-test-a/project/Build.scala Normal file
View File

@ -0,0 +1,19 @@
import sbt._
import Keys._
import java.net.URLClassLoader
object B extends Build
{
lazy val projects = Seq(root)
lazy val root = Project("root", file(".")) settings( ss : _*)
def ss = Seq(
TaskKey("check-first") <<= checkTask("First"),
TaskKey("check-second") <<= checkTask("Second")
)
private def checkTask(className: String) =
FullClasspath in Configurations.Runtime map { runClasspath =>
val cp = runClasspath.map(_.data.toURI.toURL).toArray
Class.forName(className, false, new URLClassLoader(cp))
}
}

2
sbt/src/sbt-test/source-dependencies/replace-test-a/project/build.properties
View File

@ -1,2 +0,0 @@
project.name=Test
project.version=1.0

12
sbt/src/sbt-test/source-dependencies/replace-test-a/project/build/TestProject.scala
View File

@ -1,12 +0,0 @@
import sbt._
import java.net.URLClassLoader
class TestProject(info: ProjectInfo) extends DefaultProject(info)
{
lazy val checkFirst = checkTask("First")
lazy val checkSecond = checkTask("Second")
private def checkTask(className: String) =
fullClasspath(Configurations.Runtime) map { runClasspath =>
val cp = runClasspath.map(_.data.toURI.toURL).toArray
Class.forName(className, false, new URLClassLoader(cp))
}
}

3
sbt/src/sbt-test/source-dependencies/sealed/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=sealed
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/specialized/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=specialized
project.version=1.0
project.scratch=true

7
sbt/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
View File

@ -1,7 +0,0 @@
import sbt._
class SpecializeTest(info: ProjectInfo) extends DefaultProject(info)
{
// now on by default in 2.8
// override def compileOptions = super.compileOptions ++ Seq(CompileOption("-Yspecialize"))
}

3
sbt/src/sbt-test/source-dependencies/stability-change/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=stability
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/struct-usage/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=struct-usage
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/struct/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=struct
project.version=1.0
project.scratch=true

4
sbt/src/sbt-test/source-dependencies/transitive-a/project/build.properties
View File

@ -1,4 +0,0 @@
#Project properties
#Mon Jan 26 19:13:08 EST 2009
project.name=Transitive A
project.version=1.0

4
sbt/src/sbt-test/source-dependencies/transitive-b/project/build.properties
View File

@ -1,4 +0,0 @@
#Project properties
#Mon Jan 26 19:13:08 EST 2009
project.name=Transitive A
project.version=1.0

3
sbt/src/sbt-test/source-dependencies/type-parameter/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=type-parameter
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/typeref-return/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=typeref-return
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/var/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=var
project.version=1.0
project.scratch=true

3
sbt/src/sbt-test/source-dependencies/variance/project/build.properties
View File

@ -1,3 +0,0 @@
project.name=variance
project.version=1.0
project.scratch=true