-
Notifications
You must be signed in to change notification settings - Fork 678
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
.sbtopts file added + Check for BINARY/THIN_CLIENT
flags
#880
Conversation
Tried to quickly fix the thin client issues with always giving See description of how to start sbt for its different version: sbt/sbt#6468 (comment) |
BINARY
flagBINARY/THIN_CLIENT
flags
Any thoughts on this PR @tymcauley since you are the one who brought up |
override SBT_OPTS += -Dsbt.sourcemode=true -Dsbt.workspace=$(base_dir)/tools | ||
SBT_OPTS_FILE := $(base_dir)/.sbtopts | ||
ifneq (,$(wildcard $(SBT_OPTS_FILE))) | ||
override SBT_OPTS += $(subst $$PWD,$(base_dir),$(shell cat $(SBT_OPTS_FILE))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is setting SBT_OPTS
necessary now that .sbtopts
exists? I was able to remove this code and run the start-sbt-server
target just fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nevermind, this is necessary as I mentioned here: #880 (comment)
Looks great! I also really like the As I mentioned in that comment, on this branch I was able to run the |
Ah, nevermind, I see sbt/sbt#6468 (comment) mentions that the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
I do find it weird that launching SBT varies so much between the different versions. But in any case, I think this helps satisfy users who use the script vs the launch jar. |
**Related issue**: ucb-bar#932 and ucb-bar#880 **Type of change**: other enhancement **Impact**: other (change a repo initialization script) **Release Notes** change a repo initialization script [init-submodules-no-riscv-tools-nolog.sh](https://github.com/zslwyuan/chipyard/blob/master/scripts/init-submodules-no-riscv-tools-nolog.sh) so it can generate the .sbtopt file in the Chipyard directory during repo initialization and use the absolute path for the SBT workspace variables in .sbtopts. Hope it can adapt to more compilation scenarios. For example, now users should be able to open the shipyard project directly using Intellij.
generate the .sbtopt file during repo initialization. ucb-bar#932 and ucb-bar#880
Related issue: #833
Type of change: other enhancement
Impact: other
Release Notes
It seems like using the
.sbtopts
file helps with the thin SBT client (sets up the Chisel/Firrtl path properly). This PR changes Chipyard to be more similar to Rocket Chip and hopefully fixes #833 (or some subset of its problems). Additionally, this adds small check to make sure theBINARY
flag is present when doingrun-*
targets.