diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-18 14:55:23 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-05-17 07:57:27 +1000 |
| commit | 71a5bdaf57f90b46a6bed8af28deebb1174318c7 (patch) | |
| tree | 97daf6dcfc772482fc839d59a5d0f6ce10b30a95 | |
| parent | 83864872d7b642520fdf522fd300151d8bc22da4 (diff) | |
| download | scala-71a5bdaf57f90b46a6bed8af28deebb1174318c7.tar.gz scala-71a5bdaf57f90b46a6bed8af28deebb1174318c7.tar.bz2 scala-71a5bdaf57f90b46a6bed8af28deebb1174318c7.zip | |
[backport] sbt build targets build/
It avoids confusion with existing test/partest scripts
that test the compiler in build/, while sbt it targeting build-sbt/.
| -rw-r--r-- | build.sbt | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -4,8 +4,8 @@ * What you see below is very much work-in-progress. The following features are implemented: * - Compiling all classses for the compiler and library ("compile" in the respective subprojects) * - Running JUnit tests ("test") and partest ("test/it:test") - * - Creating build-sbt/quick with all compiled classes and launcher scripts ("dist/mkQuick") - * - Creating build-sbt/pack with all JARs and launcher scripts ("dist/mkPack") + * - Creating build/quick with all compiled classes and launcher scripts ("dist/mkQuick") + * - Creating build/pack with all JARs and launcher scripts ("dist/mkPack") * - Building all scaladoc sets ("doc") * - Publishing ("publishDists" and standard sbt tasks like "publish" and "publishLocal") * @@ -771,8 +771,8 @@ def configureAsForkOfJavaProject(project: Project): Project = { lazy val buildDirectory = settingKey[File]("The directory where all build products go. By default ./build") lazy val mkBin = taskKey[Seq[File]]("Generate shell script (bash or Windows batch).") -lazy val mkQuick = taskKey[Unit]("Generate a full build, including scripts, in build-sbt/quick") -lazy val mkPack = taskKey[Unit]("Generate a full build, including scripts, in build-sbt/pack") +lazy val mkQuick = taskKey[Unit]("Generate a full build, including scripts, in build/quick") +lazy val mkPack = taskKey[Unit]("Generate a full build, including scripts, in build/pack") // Defining these settings is somewhat redundant as we also redefine settings that depend on them. // However, IntelliJ's project import works better when these are set correctly. @@ -831,7 +831,7 @@ def generateServiceProviderResources(services: (String, String)*): Setting[_] = } }.taskValue -buildDirectory in ThisBuild := (baseDirectory in ThisBuild).value / "build-sbt" +buildDirectory in ThisBuild := (baseDirectory in ThisBuild).value / "build" // Add tab completion to partest commands += Command("partest")(_ => PartestUtil.partestParser((baseDirectory in ThisBuild).value, (baseDirectory in ThisBuild).value / "test")) { (state, parsed) => |