From 45946bba6942378970ae42502f7b2829c2d3c58f Mon Sep 17 00:00:00 2001
From: Jack
Date: Tue, 6 Oct 2015 16:03:48 -0700
Subject: Added ability to test scala FIRRTL

---
 Makefile | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3085bfaa..9e67e3e1 100644
--- a/Makefile
+++ b/Makefile
@@ -20,13 +20,13 @@ install-mac:
 	cd src/lib/stanza && sudo ./stanza -platform os-x -install /usr/local/bin/stanza
 
 build-deploy: 
-	cd $(firrtl_dir) && stanza -i firrtl-main.stanza -o $(root_dir)/utils/bin/firrtl
+	cd $(firrtl_dir) && stanza -i firrtl-main.stanza -o $(root_dir)/utils/bin/firrtl-stanza
 
 build: 
-	cd $(firrtl_dir) && stanza -i firrtl-test-main.stanza -o $(root_dir)/utils/bin/firrtl
+	cd $(firrtl_dir) && stanza -i firrtl-test-main.stanza -o $(root_dir)/utils/bin/firrtl-stanza
 
 build-fast: 
-	cd $(firrtl_dir) && stanza -i firrtl-test-main.stanza -o $(root_dir)/utils/bin/firrtl -flags OPTIMIZE
+	cd $(firrtl_dir) && stanza -i firrtl-test-main.stanza -o $(root_dir)/utils/bin/firrtl-stanza -flags OPTIMIZE
 
 check:
 	cd $(test_dir) && lit -v . --path=$(root_dir)/utils/bin/
@@ -66,4 +66,18 @@ done: build check
 fail:
 	say "fail"
 
-.PHONY: all install build-deploy build check clean fail succeed regress
+# Scala Added Makefile commands
+
+build-scala:
+	sbt "assembly"
+
+test-scala:
+	cd $(test_dir)/parser && lit -v . --path=$(root_dir)/utils/bin/
+
+set-scala:
+	ln -f -s $(root_dir)/utils/bin/firrtl-scala $(root_dir)/utils/bin/firrtl
+
+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
-- 
cgit v1.2.3


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 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3


From 7a7936c8fbddbffc1c4775fafeb5106ba1002dd4 Mon Sep 17 00:00:00 2001
From: Jack
Date: Thu, 15 Oct 2015 13:50:36 -0700
Subject: Added infer-types pass, seems to work. Added infer-types error
 checking, modified Logger slightly, added Primops object for utility
 functions, minor changes in Utils

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 357c3189..4e2e3b17 100644
--- a/Makefile
+++ b/Makefile
@@ -76,6 +76,7 @@ build-scala:
 
 test-scala:
 	cd $(test_dir)/parser && lit -v . --path=$(root_dir)/utils/bin/
+	cd $(test_dir)/passes/infer-types && lit -v . --path=$(root_dir)/utils/bin/
 
 set-scala:
 	ln -f -s $(root_dir)/utils/bin/firrtl-scala $(root_dir)/utils/bin/firrtl
-- 
cgit v1.2.3