From a74bbef25f8aa4d6b43be23b3831655efad1711c Mon Sep 17 00:00:00 2001 From: Jim Lawson Date: Thu, 7 Apr 2016 13:48:33 -0700 Subject: Use find instead of sbt to determine (potential) sources. --- Makefile | 5 +---- sourcesFromSbt.sh | 10 ---------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100755 sourcesFromSbt.sh diff --git a/Makefile b/Makefile index 29534b83..0ecfa6e6 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,7 @@ sbt ?= sbt stanza ?= $(install_dir)/stanza stanza_bin ?= $(install_dir)/firrtl-stanza scala_jar ?= $(install_dir)/firrtl.jar -# The following is slow but accurate. -# We use 'unmanaged' so we don't include source files generated by the -# build itself (otherwise, we'd need to include the rules to build them). -scala_src := $(shell $(sbt) "show compile:unmanaged-sources compile:unmanaged-resources" | ./sourcesFromSbt.sh ) +scala_src := $(shell find src -type f \( -name "*.scala" -o -path "*/resources/*" \)) stanza_src=$(shell ls src/main/stanza/*.stanza) all-noise: diff --git a/sourcesFromSbt.sh b/sourcesFromSbt.sh deleted file mode 100755 index e2b6a170..00000000 --- a/sourcesFromSbt.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Parse the output of: -# sbt "show compile:sources compile:resources". -# -# Set the field delimiter to any of '(', ',', or ')' -# and split lines beginning with: -# [info] ArrayBuffer( -# [info] List( -# throwing away the initial 'field' up to and including the '('. -gawk -F '\\(|,|\\)' '/\[info\]\s+((ArrayBuffer)|(List))\(/ { $1 = ""; print $0 }' -- cgit v1.2.3