diff --git a/Makefile b/Makefile index e60d2ab..4a1c63a 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ PREFIX ?= /usr/local ESSTRACORE := esstracore.so ESSTRALINK := esstralink.so ESSTRAUTIL := esstra +UTIL2 := esstra-full-paths +UTIL3 := has-spdx-id.py +UTIL4 := esstra-to-spdx-list.sh SUBDIRS := core link util @@ -28,7 +31,7 @@ all clean: install: all install -m 0755 -D -t $(INSTALLDIR_PLUGIN) core/$(ESSTRACORE) link/$(ESSTRALINK) - install -m 0755 -D -t $(INSTALLDIR_BIN) util/$(ESSTRAUTIL) + install -m 0755 -D -t $(INSTALLDIR_BIN) util/$(ESSTRAUTIL) util/$(UTIL2) util/$(UTIL3) util/$(UTIL4) install-specs: all @gcc -dumpspecs | \ @@ -40,6 +43,9 @@ uninstall: uninstall-specs rm -f $(INSTALLDIR_PLUGIN)/$(ESSTRACORE) rm -f $(INSTALLDIR_PLUGIN)/$(ESSTRALINK) rm -f $(INSTALLDIR_BIN)/$(ESSTRAUTIL) + rm -f $(INSTALLDIR_BIN)/$(UTIL2) + rm -f $(INSTALLDIR_BIN)/$(UTIL3) + rm -f $(INSTALLDIR_BIN)/$(UTIL4) uninstall-specs: @[ -e $(SPECFILE) ] && \ diff --git a/util/esstra-full-paths b/util/esstra-full-paths new file mode 100755 index 0000000..8890ec7 --- /dev/null +++ b/util/esstra-full-paths @@ -0,0 +1,17 @@ +#!/usr/bin/env python3 +# esstra-full-paths +# parse esstra output and show full filepaths +# +# do I need to strip off a base dir here? + +import fileinput + +cur_dir = "" +for line in fileinput.input(): + line = line.strip() + if line.startswith("- Directory:"): + cur_dir = line.split("Directory: ", 1)[1] + continue + if line.startswith("- File:"): + filename = line.split("File: ", 1)[1] + print( "- Path: " + cur_dir + "/" + filename) diff --git a/util/esstra-to-spdx-list.sh b/util/esstra-to-spdx-list.sh new file mode 100755 index 0000000..b3932bd --- /dev/null +++ b/util/esstra-to-spdx-list.sh @@ -0,0 +1,54 @@ +#!/bin/sh +# esstra-to-spdx-list.sh - convert esstra output into an spdx list +# usage: esstra-to-spdx-list.sh +# + +usage() { + cat <