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

Switch to using the interned serialization format.

This commit is contained in:
Benjy 2013-10-23 10:41:13 -04:00
parent 0b033337df
commit c66eefcec9
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compile/integration/src/main/scala/sbt/compiler/AggressiveCompile.scala
View File

@ -180,7 +180,8 @@ class AggressiveCompile(cacheFile: File)
private[this] def explicitBootClasspath(options: Seq[String]): Seq[File] = private[this] def explicitBootClasspath(options: Seq[String]): Seq[File] =
options.dropWhile(_ != CompilerArguments.BootClasspathOption).drop(1).take(1).headOption.toList.flatMap(IO.parseClasspath) options.dropWhile(_ != CompilerArguments.BootClasspathOption).drop(1).take(1).headOption.toList.flatMap(IO.parseClasspath)
import AnalysisFormats._ val formats = new sbt.inc.InternedAnalysisFormats()
import formats._
val store = AggressiveCompile.staticCache(cacheFile, AnalysisStore.sync(AnalysisStore.cached(FileBasedStore(cacheFile)))) val store = AggressiveCompile.staticCache(cacheFile, AnalysisStore.sync(AnalysisStore.cached(FileBasedStore(cacheFile))))
} }
object AggressiveCompile object AggressiveCompile

3
compile/integration/src/main/scala/sbt/compiler/IncrementalCompiler.scala
View File

@ -42,7 +42,8 @@ object IC extends IncrementalCompiler[Analysis, AnalyzingCompiler]
def readCacheUncaught(file: File): (Analysis, CompileSetup) = def readCacheUncaught(file: File): (Analysis, CompileSetup) =
{ {
import sbinary.DefaultProtocol.{immutableMapFormat, immutableSetFormat, StringFormat, tuple2Format} import sbinary.DefaultProtocol.{immutableMapFormat, immutableSetFormat, StringFormat, tuple2Format}
import sbt.inc.AnalysisFormats._ val formats = new sbt.inc.InternedAnalysisFormats()
import formats._
sbt.IO.gzipFileIn(file)( in => sbinary.Operations.read[(Analysis, CompileSetup)](in) ) sbt.IO.gzipFileIn(file)( in => sbinary.Operations.read[(Analysis, CompileSetup)](in) )
} }
} }

3
main/actions/src/main/scala/sbt/Sync.scala
View File

@ -71,7 +71,8 @@ object Sync
import sbinary._ import sbinary._
import Operations.{read, write} import Operations.{read, write}
import DefaultProtocol.{FileFormat => _, _} import DefaultProtocol.{FileFormat => _, _}
import inc.AnalysisFormats._ val formats = new sbt.inc.InternedAnalysisFormats()
import formats._
def writeInfo[F <: FileInfo](file: File, relation: Relation[File, File], info: Map[File, F])(implicit infoFormat: Format[F]): Unit = def writeInfo[F <: FileInfo](file: File, relation: Relation[File, File], info: Map[File, F])(implicit infoFormat: Format[F]): Unit =
IO.gzipFileOut(file) { out => IO.gzipFileOut(file) { out =>