diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-12 14:12:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-12 14:12:50 -0400 |
commit | edb87b008ebed7a4b9d34bb04a4436b5d106a9e3 (patch) | |
tree | 399e7bda6ce27d916c531b94f010eba297b39179 /stage1 | |
parent | 796a9f55e9400fb517ab918ad980a6eeeae58b85 (diff) | |
parent | 2c139c896ae4561bb584aa00e3ec1c88e0c8395b (diff) | |
download | cbt-edb87b008ebed7a4b9d34bb04a4436b5d106a9e3.tar.gz cbt-edb87b008ebed7a4b9d34bb04a4436b5d106a9e3.tar.bz2 cbt-edb87b008ebed7a4b9d34bb04a4436b5d106a9e3.zip |
Merge pull request #424 from cvogt/fix-change-propagation
fix change propagation
Diffstat (limited to 'stage1')
-rw-r--r-- | stage1/Stage1Lib.scala | 6 |
1 files changed, 5 insertions, 1 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 |