From 0122af3d602608bf41df7af1703a04bb738c0531 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 14 Oct 2015 14:00:21 -0700 Subject: Updated Makefile and README to be more friendly to Scala implementation --- Makefile | 5 ++++- README.md | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9e67e3e1..357c3189 100644 --- a/Makefile +++ b/Makefile @@ -21,12 +21,15 @@ install-mac: build-deploy: cd $(firrtl_dir) && stanza -i firrtl-main.stanza -o $(root_dir)/utils/bin/firrtl-stanza + make set-stanza build: cd $(firrtl_dir) && stanza -i firrtl-test-main.stanza -o $(root_dir)/utils/bin/firrtl-stanza + make set-stanza build-fast: cd $(firrtl_dir) && stanza -i firrtl-test-main.stanza -o $(root_dir)/utils/bin/firrtl-stanza -flags OPTIMIZE + make set-stanza check: cd $(test_dir) && lit -v . --path=$(root_dir)/utils/bin/ @@ -80,4 +83,4 @@ set-scala: set-stanza: ln -f -s $(root_dir)/utils/bin/firrtl-stanza $(root_dir)/utils/bin/firrtl -.PHONY: all install build-deploy build check clean fail succeed regress set-scala set-stanza build-scala +.PHONY: all install build-deploy build check clean fail succeed regress set-scala set-stanza build-scala test-scala diff --git a/README.md b/README.md index 4dc9d1b7..2c2a342e 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,9 @@ `make # Build & test` #### Scala implementation -The Scala FIRRTL implementation relies upon sbt. +The Scala FIRRTL implementation relies upon sbt 0.13.6. It uses sbt-assembly to create a fat JAR. +Using a bash script and a symbolic link it can be used with the same command-line arguments as the stanza implementation. Example use: - `sbt -mem 2048 "run-main Example ` -This command will read in <input> FIRRTL file, parse it, then output the AST to <output> + `make build-scala` + `make set-scala` # Creates symbolic link, make set-stanza reverts to stanza implementation + `./utils/bin/firrtl -i -o -X ` -- cgit v1.2.3