From bc137ff53e95b29016a51e271e2a2371e7150946 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Thu, 10 May 2012 10:45:51 -0400 Subject: Don't regenerate properties file if skip is true (i.e. locker/quick is locked) --- project/Layers.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'project/Layers.scala') diff --git a/project/Layers.scala b/project/Layers.scala index 9438c752b5..3d6d780f8f 100644 --- a/project/Layers.scala +++ b/project/Layers.scala @@ -59,7 +59,7 @@ trait Layers extends Build { // TODO - Allow other scalac option settings. scalacOptions in Compile <++= (scalaSource in Compile) map (src => Seq("-sourcepath", src.getAbsolutePath)), classpathOptions := ClasspathOptions.manual, - resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, streams) map Versions.generateVersionPropertiesFile("library.properties"), + resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, skip in Compile, streams) map Versions.generateVersionPropertiesFile("library.properties"), referenceScala ) @@ -71,7 +71,7 @@ trait Layers extends Build { unmanagedSourceDirectories in Compile <+= (baseDirectory) apply (_ / "src" / "msil"), defaultExcludes := ("tests"), defaultExcludes in unmanagedResources := "*.scala", - resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, streams) map Versions.generateVersionPropertiesFile("compiler.properties"), + resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, skip in Compile, streams) map Versions.generateVersionPropertiesFile("compiler.properties"), // Note, we might be able to use the default task, but for some reason ant was filtering files out. Not sure what's up, but we'll // stick with that for now. unmanagedResources in Compile <<= (baseDirectory) map { -- cgit v1.2.3