diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-04-02 15:17:36 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-04-02 15:17:36 -0400 |
commit | 10c156d83bb24486df6c040b514d072bf6b112d5 (patch) | |
tree | 6abfc2ed51fbf96e2444498bb09d45049cf014a3 /stage2/PackageBuild.scala | |
parent | b9f8ff66c9e61daab016cc8e595f388f449ec780 (diff) | |
download | cbt-10c156d83bb24486df6c040b514d072bf6b112d5.tar.gz cbt-10c156d83bb24486df6c040b514d072bf6b112d5.tar.bz2 cbt-10c156d83bb24486df6c040b514d072bf6b112d5.zip |
only compile and only produce jars if there are actually files.
This seem desirable, but also fixes a test failure for which I have no idea why it didn't fail before but now.
Diffstat (limited to 'stage2/PackageBuild.scala')
-rw-r--r-- | stage2/PackageBuild.scala | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/stage2/PackageBuild.scala b/stage2/PackageBuild.scala index 8f6d185..79e54a7 100644 --- a/stage2/PackageBuild.scala +++ b/stage2/PackageBuild.scala @@ -4,23 +4,23 @@ import scala.collection.immutable.Seq abstract class PackageBuild(context: Context) extends BasicBuild(context) with ArtifactInfo{ def `package`: Seq[File] = lib.concurrently( enableConcurrency )( Seq(() => jar, () => docJar, () => srcJar) - )( _() ) + )( _() ).flatten - private object cacheJarBasicBuild extends Cache[File] - def jar: File = cacheJarBasicBuild{ - lib.jar( artifactId, version, compile, jarTarget ) + private object cacheJarBasicBuild extends Cache[Option[File]] + def jar: Option[File] = cacheJarBasicBuild{ + compile.flatMap( lib.jar( artifactId, version, _, jarTarget ) ) } - private object cacheSrcJarBasicBuild extends Cache[File] - def srcJar: File = cacheSrcJarBasicBuild{ + private object cacheSrcJarBasicBuild extends Cache[Option[File]] + def srcJar: Option[File] = cacheSrcJarBasicBuild{ lib.srcJar( sourceFiles, artifactId, version, scalaTarget ) } - private object cacheDocBasicBuild extends Cache[File] - def docJar: File = cacheDocBasicBuild{ + private object cacheDocBasicBuild extends Cache[Option[File]] + def docJar: Option[File] = cacheDocBasicBuild{ lib.docJar( scalaVersion, sourceFiles, dependencyClasspath, apiTarget, jarTarget, artifactId, version, scalacOptions, context.classLoaderCache ) } - override def jars = jar +: dependencyJars - override def exportedJars: Seq[File] = Seq(jar) + override def jars = jar.toVector ++ dependencyJars + override def exportedJars: Seq[File] = jar.toVector } |