diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-12 13:22:01 -0400 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-12 13:22:01 -0400 |
| commit | 2c139c896ae4561bb584aa00e3ec1c88e0c8395b (patch) | |
| tree | 11cb9d66ced7cf806951e88b0cd48ee1f516d5c0 | |
| parent | 12f26b9187eaebb42400bef5cf85f7355b19bb61 (diff) | |
| download | cbt-2c139c896ae4561bb584aa00e3ec1c88e0c8395b.tar.gz cbt-2c139c896ae4561bb584aa00e3ec1c88e0c8395b.tar.bz2 cbt-2c139c896ae4561bb584aa00e3ec1c88e0c8395b.zip | |
fix change propagation
| -rw-r--r-- | stage1/Stage1Lib.scala | 6 | ||||
| -rw-r--r-- | stage2/plugins/Dotty.scala | 6 | ||||
| -rw-r--r-- | stage2/plugins/Frege.scala | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index f701c72..f5bcb63 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -220,12 +220,16 @@ class Stage1Lib( logger: Logger ) extends BaseLib{ val classpath = d.classpath val cp = classpath.string + def lastModified = ( + cbtLastModified +: d.lastModified +: sourceFiles.map(_.lastModified) + ).max + if( sourceFiles.isEmpty ){ None }else{ val start = System.currentTimeMillis val lastCompiled = statusFile.lastModified - if( d.lastModified > lastCompiled || sourceFiles.exists(_.lastModified > lastCompiled) ){ + if( lastModified > lastCompiled ){ def Resolver(urls: URL*) = MavenResolver(cbtLastModified, mavenCache, urls: _*) val zinc = Resolver(mavenCentral).bindOne(MavenDependency("com.typesafe.zinc","zinc", zincVersion)) val zincDeps = zinc.transitiveDependencies diff --git a/stage2/plugins/Dotty.scala b/stage2/plugins/Dotty.scala index 01ffa27..0bbaf44 100644 --- a/stage2/plugins/Dotty.scala +++ b/stage2/plugins/Dotty.scala @@ -130,12 +130,16 @@ class DottyLib( val classpath = d.classpath val cp = classpath.string + def lastModified = ( + cbtLastModified +: d.lastModified +: sourceFiles.map(_.lastModified) + ).max + if( sourceFiles.isEmpty ){ None }else{ val start = System.currentTimeMillis val lastCompiled = statusFile.lastModified - if( d.lastModified > lastCompiled || sourceFiles.exists(_.lastModified > lastCompiled) ){ + if( lastModified > lastCompiled ){ val _class = "dotty.tools.dotc.Main" val dualArgs = diff --git a/stage2/plugins/Frege.scala b/stage2/plugins/Frege.scala index 3fcd56b..da5e54f 100644 --- a/stage2/plugins/Frege.scala +++ b/stage2/plugins/Frege.scala @@ -66,12 +66,16 @@ class FregeLib( val classpath = d.classpath val cp = classpath.string + def lastModified = ( + cbtLastModified +: d.lastModified +: sourceFiles.map(_.lastModified) + ).max + if( sourceFiles.isEmpty ){ None } else { val start = System.currentTimeMillis val lastCompiled = statusFile.lastModified - if( d.lastModified > lastCompiled || sourceFiles.exists(_.lastModified > lastCompiled) ){ + if( lastModified > lastCompiled ){ val _class = "frege.compiler.Main" val fp = (fregeDependency.classpath.strings ++ fregeDependencies.map(_.classpath.string)) |