diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-12 17:51:39 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-12 17:51:39 -0500 |
| commit | d13f028ae0e9e25c36971f8045f1d19cb3e94002 (patch) | |
| tree | ec43fc8cea42b62861e494dda5f94318292881fe | |
| parent | 97ddcbccb427354ddf0fe5cd7758994e74d710f1 (diff) | |
| download | cbt-d13f028ae0e9e25c36971f8045f1d19cb3e94002.tar.gz cbt-d13f028ae0e9e25c36971f8045f1d19cb3e94002.tar.bz2 cbt-d13f028ae0e9e25c36971f8045f1d19cb3e94002.zip | |
minor simplification renames
| -rw-r--r-- | stage1/resolver.scala | 4 | ||||
| -rw-r--r-- | stage2/BasicBuild.scala | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/stage1/resolver.scala b/stage1/resolver.scala index 30f03e2..e86f1b3 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -35,8 +35,8 @@ abstract class Dependency{ def canBeCached = false def cacheDependencyClassLoader = true - private object cacheClassLoaderBasicBuild extends Cache[URLClassLoader] - def classLoader: URLClassLoader = cacheClassLoaderBasicBuild{ + private object classLoaderCache extends Cache[URLClassLoader] + def classLoader: URLClassLoader = classLoaderCache{ val transitiveClassPath = transitiveDependencies.map{ case d if d.canBeCached => Left(d) case d => Right(d) diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index e82eeb4..37602b2 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -134,9 +134,8 @@ class Build(val context: Context) extends Dependency with TriggerLoop{ sourcesChanged || transitiveDependencies.map(_.updated).fold(false)(_ || _) } - private object cacheCompileBasicBuild extends Cache[File] - def compile: File = cacheCompileBasicBuild{ - //println(transitiveDependencies.filter(_.updated).mkString("\n")) + private object compileCache extends Cache[File] + def compile: File = compileCache{ lib.compile( updated, sourceFiles, compileTarget, dependencyClasspath, scalacOptions, |