From 7faaa56f34f60fcf1ce4e0b0370f883be851b004 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Thu, 18 Apr 2019 11:39:19 -0700
Subject: [PATCH] revert condDependsOn | put new firrtl jar into rocket

---
 build.sbt    | 4 ++--
 common.mk    | 9 ++++-----
 variables.mk | 5 +++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.sbt b/build.sbt
index 035fed2..94d07ea 100644
--- a/build.sbt
+++ b/build.sbt
@@ -31,7 +31,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
 // Checks for -DROCKET_USE_MAVEN.
 // If it's there, use a maven dependency.
 // Else, depend on subprojects in git submodules.
-def testchipIpDependsOn(prj: Project): Project = {
+def conditionalDependsOn(prj: Project): Project = {
   if (sys.props.contains("ROCKET_USE_MAVEN")) {
     prj.settings(Seq(
       libraryDependencies += "edu.berkeley.cs" %% "testchipip" % "1.0-020719-SNAPSHOT",
@@ -41,7 +41,7 @@ def testchipIpDependsOn(prj: Project): Project = {
   }
 }
 
-lazy val example = testchipIpDependsOn(project in file("."))
+lazy val example = conditionalDependsOn(project in file("."))
   .settings(commonSettings)
 
 lazy val boom = (project in file("generators/boom"))
diff --git a/common.mk b/common.mk
index abe9041..b090285 100644
--- a/common.mk
+++ b/common.mk
@@ -20,13 +20,12 @@ TESTCHIPIP_CLASSES ?= "$(TESTCHIP_DIR)/target/scala-$(SCALA_VERSION_MAJOR)/class
 #########################################################################################
 # jar creation variables and rules
 #########################################################################################
-FIRRTL_DIR = $(base_dir)/tools/firrtl
-FIRRTL_JAR ?= $(base_dir)/lib/firrtl.jar
+FIRRTL_JAR ?= $(ROCKETCHIP_DIR)/lib/firrtl.jar
 
-$(FIRRTL_JAR): $(call lookup_scala_srcs, $(FIRRTL_DIR)/firrtl/src/main/scala)
-	$(MAKE) -C $(FIRRTL_DIR) SBT="$(SBT)" root_dir=$(FIRRTL_DIR) build-scala
+$(FIRRTL_JAR): $(call lookup_scala_srcs, $(REBAR_FIRRTL_DIR)/src/main/scala)
+	$(MAKE) -C $(REBAR_FIRRTL_DIR) SBT="$(SBT)" root_dir=$(REBAR_FIRRTL_DIR) build-scala
 	mkdir -p $(dir $@)
-	cp -p $(FIRRTL_DIR)/utils/bin/firrtl.jar $@
+	cp -p $(REBAR_FIRRTL_DIR)/utils/bin/firrtl.jar $@
 	touch $@
 
 #########################################################################################
diff --git a/variables.mk b/variables.mk
index df0bba1..5aea54a 100644
--- a/variables.mk
+++ b/variables.mk
@@ -34,8 +34,9 @@ endif
 #########################################################################################
 # path to rocket-chip and testchipip
 #########################################################################################
-ROCKETCHIP_DIR = $(base_dir)/generators/rocket-chip
-TESTCHIP_DIR   = $(base_dir)/generators/testchipip
+ROCKETCHIP_DIR   = $(base_dir)/generators/rocket-chip
+TESTCHIP_DIR     = $(base_dir)/generators/testchipip
+REBAR_FIRRTL_DIR = $(base_dir)/tools/firrtl
 
 #########################################################################################
 # names of various files needed to compile and run things