diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2016-09-26 16:26:18 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-26 16:26:18 -0700 |
commit | 0245f373ce51eabd94463f9d7293c72fcf870593 (patch) | |
tree | cb0b1df0d8fdc0d079fa95600d7c430ef33d617a /build.sbt | |
parent | d35a7bde94b6c7b1626bd6085a646a352da7cee2 (diff) | |
parent | 891353e709806a1f8a7005b1c65827dd6194f5a2 (diff) | |
download | scala-0245f373ce51eabd94463f9d7293c72fcf870593.tar.gz scala-0245f373ce51eabd94463f9d7293c72fcf870593.tar.bz2 scala-0245f373ce51eabd94463f9d7293c72fcf870593.zip |
Merge pull request #5414 from szeiger/wip/no-partest-in-pack
Do not build partest-javaagent and partest-extras for `pack`
See scala-dev#223
Diffstat (limited to 'build.sbt')
-rw-r--r-- | build.sbt | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -510,8 +510,10 @@ lazy val scalap = configureAsSubproject(project) ) .dependsOn(compiler) -lazy val partestExtras = configureAsSubproject(Project("partest-extras", file(".") / "src" / "partest-extras")) +lazy val partestExtras = Project("partest-extras", file(".") / "src" / "partest-extras") .dependsOn(replJlineEmbedded) + .settings(commonSettings: _*) + .settings(generatePropertiesFileSettings: _*) .settings(clearSourceAndResourceDirectories: _*) .settings(disableDocs: _*) .settings(disablePublishing: _*) @@ -597,8 +599,6 @@ lazy val partestJavaAgent = Project("partest-javaagent", file(".") / "src" / "pa // Setting name to "scala-partest-javaagent" so that the jar file gets that name, which the Runner relies on name := "scala-partest-javaagent", description := "Scala Compiler Testing Tool (compiler-specific java agent)", - // writing jar file to $buildDirectory/pack/lib because that's where it's expected to be found - setJarLocation, // add required manifest entry - previously included from file packageOptions in (Compile, packageBin) += Package.ManifestAttributes( "Premain-Class" -> "scala.tools.partest.javaagent.ProfilingAgent" ), @@ -829,7 +829,7 @@ lazy val root: Project = (project in file(".")) ) // The following subprojects' binaries are required for building "pack": -lazy val distDependencies = Seq(replJline, replJlineEmbedded, compiler, library, partestExtras, partestJavaAgent, reflect, scalap, scaladoc) +lazy val distDependencies = Seq(replJline, replJlineEmbedded, compiler, library, reflect, scalap, scaladoc) lazy val dist = (project in file("dist")) .settings(commonSettings) |