Merge pull request #933 from zslwyuan/patch-1

generate the .sbtopt file during repo initialization. ucb-bar#932 and ucb-bar#880

.circleci/do-rtl-build.sh

@@ -21,6 +21,9 @@ cd $LOCAL_CHIPYARD_DIR
 ./scripts/init-submodules-no-riscv-tools.sh
 ./scripts/init-fpga.sh
 
+# replace the workspace dir with a local dir so you can copy around
+sed -i -E 's/(workspace=).*(\/tools)/\1$PWD\2/g' .sbtopts
+
 # set stricthostkeychecking to no (must happen before rsync)
 run "echo \"Ping $SERVER\""
 

.circleci/run-firesim-scala-tests.sh

@@ -22,6 +22,9 @@ cd $LOCAL_CHIPYARD_DIR/sims/firesim
 ./scripts/build-libdwarf.sh
 cd $LOCAL_CHIPYARD_DIR
 
+# replace the workspace dir with a local dir so you can copy around
+sed -i -E 's/(workspace=).*(\/tools)/\1$PWD\2/g' .sbtopts
+
 make -C $LOCAL_CHIPYARD_DIR/tools/dromajo/dromajo-src/src
 
 # set stricthostkeychecking to no (must happen before rsync)

.gitignore

@@ -20,3 +20,4 @@ tags
 env-riscv-tools.sh
 env-esp-tools.sh
 .bsp/
+.sbtopts

.sbtopts

@@ -1,2 +0,0 @@
--Dsbt.sourcemode=true
--Dsbt.workspace=$PWD/tools

scripts/init-submodules-no-riscv-tools-nolog.sh

@@ -81,3 +81,5 @@ echo "# line auto-generated by init-submodules-no-riscv-tools.sh" >> env.sh
 echo '__DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]:-${(%):-%x}}")")"' >> env.sh
 echo "PATH=\$__DIR/bin:\$PATH" >> env.sh
 echo "PATH=\$__DIR/software/firemarshal:\$PATH" >> env.sh
+echo "-Dsbt.sourcemode=true" > .sbtopts
+echo "-Dsbt.workspace=$CHIPYARD_DIR/tools"  >> .sbtopts