summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-03-18 14:55:23 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-03-26 09:20:41 -0700
commitb86021f47fbae1c5ca54e094c2669b7f4f27371d (patch)
tree7a78a828fca912157630cc2b482dee7bf820415a /build.sbt
parent0e4c39aee4196573e8fb94a01fd92e0be4e4dd05 (diff)
downloadscala-b86021f47fbae1c5ca54e094c2669b7f4f27371d.tar.gz
scala-b86021f47fbae1c5ca54e094c2669b7f4f27371d.tar.bz2
scala-b86021f47fbae1c5ca54e094c2669b7f4f27371d.zip
sbt build targets build/
It avoids confusion with existing test/partest scripts that test the compiler in build/, while sbt it targeting build-sbt/.
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt10
1 files changed, 5 insertions, 5 deletions
diff --git a/build.sbt b/build.sbt
index 4dae2abe35..761165dfa7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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")
*
@@ -715,8 +715,8 @@ def configureAsSubproject(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.
@@ -775,7 +775,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) =>