From 63620dab830f572d44d17db75b35410d42edea74 Mon Sep 17 00:00:00 2001 From: Ethan Wu Date: Tue, 30 May 2023 18:57:37 -0700 Subject: [PATCH] update barstools: move iocells to separate project root Currently Chipyard is including `barstools.iocell` as a separate project from the rest of barstools, and it does this by creating a new project rooted at `src` with its source directory rooted at `src/main/scala/barstools/iocell`. This causes problems for IDEs like IntelliJ which do not support having one source root from one project nested inside another source root from a different project. By breaking out `barstools.iocell` into a separate project root, this should cause IDEs and similar tools to better understand the project structure, and makes it so that `iocell` is not in two projects at the same time. --- build.sbt | 6 +----- tools/barstools | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 6f72940a..8ceb8f5f 100644 --- a/build.sbt +++ b/build.sbt @@ -230,11 +230,7 @@ lazy val nvdla = (project in file("generators/nvdla")) .settings(libraryDependencies ++= rocketLibDeps.value) .settings(commonSettings) -lazy val iocell = Project(id = "iocell", base = file("./tools/barstools/") / "src") - .settings( - Compile / scalaSource := baseDirectory.value / "main" / "scala" / "barstools" / "iocell", - Compile / resourceDirectory := baseDirectory.value / "main" / "resources" - ) +lazy val iocell = Project(id = "iocell", base = file("./tools/barstools/") / "iocell") .settings(chiselSettings) .settings(commonSettings) diff --git a/tools/barstools b/tools/barstools index fe81afec..400ce780 160000 --- a/tools/barstools +++ b/tools/barstools @@ -1 +1 @@ -Subproject commit fe81afec14634316606a9dd10628c220d53bd256 +Subproject commit 400ce780a9b59a4a617e3ae9dbd0e97ca8e802ab