Fix chiselSetup.sh, build.sbt

common/ip/tapasco_status/build.sbt

@@ -34,15 +34,3 @@ lazy val tapascostatus = (project in file(".")).dependsOn(packaging, axiutils, a
 cleanFiles ++= Seq((baseDirectory.value / "test"), (baseDirectory.value / "ip"), (baseDirectory.value / "chisel3"))
 
 aggregate in test := false
-
-lazy val chiselSetupTask = TaskKey[Unit]("chiselSetup", "Build latest chisel libs from source")
-
-chiselSetupTask := {
-  import sys.process._
-  "./chiselSetup.sh" !
-}
-
-(compile in Compile) := {
-  val x = chiselSetupTask.value
-  (compile in Compile).value
-}

common/ip/tapasco_status/chiselSetup.sh

@@ -2,24 +2,40 @@
 DIR=$PWD/chisel3
 URL=https://github.com/freechipsproject
 REPOS="firrtl firrtl-interpreter chisel3 chisel-testers"
-REPO_URLS=`for r in $REPOS; do echo $URL/$r.git; done`
-
-echo "Installing Chisel3 dependencies in $DIR ..."
+REPO_URLS=`for r in $REPOS; do echo $URL/$(echo $r | cut -d: -f1).git; done`
 
 if [ "$1" = "clean" ]; then
+	echo "Removing Chisel3 dependencies in $DIR ..."
 	rm -rf $DIR
 else
+	echo "Installing Chisel3 dependencies in $DIR ..."
 	mkdir -p $DIR
-	pushd $DIR &&
+	pushd $DIR
 	for r in $REPOS; do
 		if [ ! -e $r ]; then
-			git clone "$URL/$r.git" &&
-			pushd $r &&
-			sbt publishLocal &&
-			popd
+			R=`echo $r | cut -d: -f1`
+			V=`echo $r | cut -d: -s -f2`
+			C=${V:+"-b $V"}
+			echo "$R $V $C $URL/$R.git"
+			if git clone "$URL/$R.git" $C; then
+				pushd $R
+				if sbt publishLocal; then
+					popd
+				else
+					echo "could not build $r - check log" >&2
+					exit 1
+				fi
+			else
+				echo "could not clone $URL/$r.git - check log" >&2
+				exit 1
+			fi
+			echo "================================================"
+			echo "$R finished."
+			echo "================================================"
 		else
 			echo "$r already exists in $DIR/$r"
 		fi
-	done &&
+		if [[ $? -ne 0 ]]; then exit 1; fi
+	done
 	popd
 fi