aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2016-11-17 11:51:08 +0100
committerGuillaume Martres <smarter@ubuntu.com>2016-11-22 01:35:07 +0100
commit6acdc1e85f04cc3a240ddb91983588897786d8ca (patch)
treea86262ad133d0dc3af19919cdc6ff77d1044003a /project
parentc061baf8c4a81f2b1505c30a5240857411981f62 (diff)
downloaddotty-6acdc1e85f04cc3a240ddb91983588897786d8ca.tar.gz
dotty-6acdc1e85f04cc3a240ddb91983588897786d8ca.tar.bz2
dotty-6acdc1e85f04cc3a240ddb91983588897786d8ca.zip
Move bridge to correct location, fix unmanaged sources in build
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/project/Build.scala b/project/Build.scala
index 745c29960..b5b1df56a 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -140,9 +140,9 @@ object DottyBuild extends Build {
// necessary evil: dottydoc currently needs to be included in the dotty
// project, for sbt integration
unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value),
- unmanagedSourceDirectories in Compile += baseDirectory.value / "doc-tool" / "src",
+ unmanagedSourceDirectories in Compile += baseDirectory.value / ".." / "doc-tool" / "src",
unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value),
- unmanagedSourceDirectories in Test += baseDirectory.value / "doc-tool" / "test",
+ unmanagedSourceDirectories in Test += baseDirectory.value / ".." / "doc-tool" / "test",
// set system in/out for repl
connectInput in run := true,