From 6a5764225fd0efdb83c67124abcc06ab9bd02fc6 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Thu, 14 Sep 2017 09:42:07 -0700
Subject: Update sbt to 0.13.16; add Scala 2.12 support. (#675)

To clean, test, and build Scala 2.11 and Scala 2.12 versions:
  % sbt +clean +test +publishLocal---
 Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9cf211f2..e8d1f613 100644
--- a/Makefile
+++ b/Makefile
@@ -25,15 +25,15 @@ c_resources_dir := src/main/resources
 
 test_outs    := $(addprefix $(targetDir)/, $(addsuffix .out, $(test_results)))
 
-.PHONY:	smoke publish-local check clean jenkins-build coverage scaladoc test checkstyle compile
+.PHONY:	smoke publish-local pubishLocal check clean jenkins-build coverage scaladoc test checkstyle compile
 
-default:	publish-local
+default:	publishLocal
 
 smoke compile:
 	$(SBT) $(SBT_FLAGS) compile
 
-publish-local:
-	$(SBT) $(SBT_FLAGS) publish-local
+publish-local publishLocal:
+	$(SBT) $(SBT_FLAGS) publishLocal
 
 test:
 	$(SBT) $(SBT_FLAGS) test
@@ -69,7 +69,7 @@ site:
 # We need to run the coverage tests last, since Jenkins will fail the build if it can't find their results.
 jenkins-build: clean
 	$(SBT) $(SBT_FLAGS) test
-	$(SBT) $(SBT_FLAGS) clean publish-local
+	$(SBT) $(SBT_FLAGS) clean publishLocal
 	$(SBT) $(SBT_FLAGS) scalastyle coverage test
 	$(SBT) $(SBT_FLAGS) coverageReport
 
@@ -87,3 +87,8 @@ $(targetDir)/%.h:	$(c_resources_dir)/%.h
 
 $(targetDir)/%.out:	$(targetDir)/%
 	$(SBT) $(SBT_FLAGS) "test:runMain ChiselTests.MiniChisel $(notdir $(basename $<)) $(CHISEL_FLAGS) --test --targetDir $(targetDir)"
+
+# The "last-resort" rule.
+# We assume the target is something like "+clean".
+%::
+	$(SBT) $(SBT_FLAGS) $@
-- 
cgit v1.2.3