diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-10 10:45:51 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-10 10:45:51 -0400 |
| commit | bc137ff53e95b29016a51e271e2a2371e7150946 (patch) | |
| tree | bfd13d6f3e71e5f5679effe7725004a746b71e24 /project/Versions.scala | |
| parent | b84cbda870b81f51af7928002073a67ac89558e1 (diff) | |
| download | scala-bc137ff53e95b29016a51e271e2a2371e7150946.tar.gz scala-bc137ff53e95b29016a51e271e2a2371e7150946.tar.bz2 scala-bc137ff53e95b29016a51e271e2a2371e7150946.zip | |
Don't regenerate properties file if skip is true (i.e. locker/quick is locked)
Diffstat (limited to 'project/Versions.scala')
| -rw-r--r-- | project/Versions.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/project/Versions.scala b/project/Versions.scala index 5f1fe0cacc..b588ec55ac 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -46,7 +46,7 @@ object Versions { /** This generates a properties file, if it does not already exist, with the maximum lastmodified timestamp * of any source file. */ - def generateVersionPropertiesFile(name: String)(dir: File, versions: VersionInfo, s: TaskStreams): Seq[File] = { + def generateVersionPropertiesFile(name: String)(dir: File, versions: VersionInfo, skip: Boolean, s: TaskStreams): Seq[File] = { // TODO - We can probably clean this up by moving caching bits elsewhere perhaps.... val target = dir / name // TODO - Regenerate on triggers, like recompilation or something... @@ -56,7 +56,7 @@ object Versions { try props.load(in) finally in.close() versions.canonical == (props getProperty "version.number") } - if (!target.exists || !hasSameVersion) { + if (!target.exists || !(skip || hasSameVersion)) { makeVersionPropertiesFile(target, versions) } target :: Nil |