Remove support for bloop
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -19,6 +19,5 @@ tags
|
||||
*~
|
||||
env-riscv-tools.sh
|
||||
env-esp-tools.sh
|
||||
.bloop/
|
||||
.bsp/
|
||||
*_TIMESTAMP
|
||||
|
||||
@@ -65,13 +65,6 @@ VLOG_SOURCES = $(call lookup_srcs,$(SOURCE_DIRS),sv) $(call lookup_srcs,$(SOURCE
|
||||
SBT_SOURCE_DIRS = $(addprefix $(base_dir)/,generators sims/firesim/sim tools)
|
||||
SBT_SOURCES = $(call lookup_srcs,$(SBT_SOURCE_DIRS),sbt) $(base_dir)/build.sbt $(base_dir)/project/plugins.sbt $(base_dir)/project/build.properties
|
||||
|
||||
#########################################################################################
|
||||
# Bloop Project Definitions
|
||||
#########################################################################################
|
||||
$(BLOOP_CONFIG_DIR)/TIMESTAMP: $(SBT_SOURCES)
|
||||
cd $(base_dir) && $(SBT) ";project chipyardRoot; bloopInstall"
|
||||
touch $@
|
||||
|
||||
#########################################################################################
|
||||
# SBT Server Setup (needed to rebuild project correctly)
|
||||
#########################################################################################
|
||||
|
||||
@@ -11,6 +11,5 @@ addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.2")
|
||||
addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.3")
|
||||
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")
|
||||
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.6.1")
|
||||
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.1")
|
||||
addSbtPlugin("com.eed3si9n" % "sbt-sriracha" % "0.1.0")
|
||||
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.5" )
|
||||
|
||||
19
variables.mk
19
variables.mk
@@ -168,28 +168,9 @@ endif
|
||||
|
||||
SBT ?= java $(JAVA_OPTS) -jar $(ROCKETCHIP_DIR)/sbt-launch.jar $(SBT_OPTS) $(SBT_CLIENT_FLAG)
|
||||
|
||||
BLOOP ?= bloop
|
||||
BLOOP_CONFIG_DIR ?= $(base_dir)/.bloop
|
||||
# This mirrors the bloop default. Set to a system-unique port in a multi-user environment
|
||||
BLOOP_NAILGUN_PORT ?= 8212
|
||||
|
||||
ifdef ENABLE_BLOOP
|
||||
override SCALA_BUILDTOOL_DEPS += $(BLOOP_CONFIG_DIR)/TIMESTAMP
|
||||
# Two notes about the bloop invocation:
|
||||
# 1) the sed removes a leading {file:<path>} that sometimes needs to be
|
||||
# provided to SBT when a project but not for bloop.
|
||||
# 2) Generally, one could could pass '--' to indicate all remaining arguments are
|
||||
# destined for the scala Main, however a bug in Bloop's argument parsing causes the
|
||||
# --nailgun-port argument to be lost in this case. Workaround this by prefixing
|
||||
# every main-destined argument with "--args"
|
||||
define run_scala_main
|
||||
cd $(base_dir) && bloop --nailgun-port $(BLOOP_NAILGUN_PORT) run $(shell echo $(1) | sed 's/{.*}//') --main $(2) $(addprefix --args ,$3)
|
||||
endef
|
||||
else
|
||||
define run_scala_main
|
||||
cd $(base_dir) && $(SBT) ";project $(1); runMain $(2) $(3)"
|
||||
endef
|
||||
endif
|
||||
|
||||
FIRRTL_LOGLEVEL ?= error
|
||||
|
||||
|
||||
Reference in New Issue
Block a user