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

#1550. Fixes scripted/join that broke with #1546 

Name hashing is now turned on by default, so I’m changing the value for
inc.Relations.empty, so inc.Analysis.empty functions as expected when
it’s joined with name hashing analyses.
This commit is contained in:
Eugene Yokota 2014-08-22 19:12:27 -04:00
parent 6fa61e972f
commit 112052241c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile/inc/src/main/scala/sbt/inc/IncOptions.scala
View File

@ -217,7 +217,7 @@ final class IncOptions(
object IncOptions extends Serializable { object IncOptions extends Serializable {
private val recompileOnMacroDefDefault: Boolean = true private val recompileOnMacroDefDefault: Boolean = true
private val nameHashingDefault: Boolean = true private[sbt] val nameHashingDefault: Boolean = true
private val antStyleDefault: Boolean = false private val antStyleDefault: Boolean = false
val Default = IncOptions( val Default = IncOptions(
// 1. recompile changed sources // 1. recompile changed sources

2
compile/inc/src/main/scala/sbt/inc/Relations.scala
View File

@ -227,7 +227,7 @@ object Relations {
def emptySource: Source = es def emptySource: Source = es
private[inc] lazy val emptySourceDependencies: SourceDependencies = new SourceDependencies(e, estr) private[inc] lazy val emptySourceDependencies: SourceDependencies = new SourceDependencies(e, estr)
def empty: Relations = empty(nameHashing = false) def empty: Relations = empty(nameHashing = IncOptions.nameHashingDefault)
private[inc] def empty(nameHashing: Boolean): Relations = private[inc] def empty(nameHashing: Boolean): Relations =
if (nameHashing) if (nameHashing)
new MRelationsNameHashing(e, e, emptySourceDependencies, emptySourceDependencies, estr, estr) new MRelationsNameHashing(e, e, emptySourceDependencies, emptySourceDependencies, estr, estr)