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

Sync up with changes to `AnalysisContents`

This commit is contained in:
jvican 2017-07-15 10:08:08 +02:00
parent 32d8f47248
commit 2da90fee03
No known key found for this signature in database
GPG Key ID: 42DAFA0F112E8050
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/src/main/scala/sbt/Defaults.scala
View File

@ -74,7 +74,7 @@ import Scope.{ fillTaskAxis, GlobalScope, ThisScope }
import sjsonnew.{ IsoLList, JsonFormat, LList, LNil }, LList.:*:
import std.TaskExtra._
import testing.{ Framework, Runner, AnnotatedFingerprint, SubclassFingerprint }
import xsbti.compile.IncToolOptionsUtil
import xsbti.compile.{ IncToolOptionsUtil, AnalysisContents }
import xsbti.CrossValue
// incremental compiler
@ -1376,8 +1376,10 @@ object Defaults extends BuildCommon {
// TODO - expose bytecode manipulation phase.
val analysisResult: CompileResult = manipulateBytecode.value
if (analysisResult.hasModified) {
val store = MixedAnalyzingCompiler.staticCachedStore(setup.cacheFile, !enableBinaryCompileAnalysis)
store.set(analysisResult.analysis, analysisResult.setup)
val store =
MixedAnalyzingCompiler.staticCachedStore(setup.cacheFile, !useBinary)
val contents = AnalysisContents.create(analysisResult.analysis(), analysisResult.setup())
store.set(contents)
}
analysisResult.analysis
}
@ -1470,9 +1472,11 @@ object Defaults extends BuildCommon {
val setup = compileIncSetup.value
val useBinary: Boolean = enableBinaryCompileAnalysis.value
val store = MixedAnalyzingCompiler.staticCachedStore(setup.cacheFile, !useBinary)
store.get() match {
case Some((an, setup)) =>
new PreviousResult(Option(an).toOptional, Option(setup).toOptional)
store.get().toOption match {
case Some(contents) =>
val analysis = Option(contents.getAnalysis).toOptional
val setup = Option(contents.getMiniSetup).toOptional
new PreviousResult(analysis, setup)
case None => new PreviousResult(jnone[CompileAnalysis], jnone[MiniSetup])
}
}