From 4d57d98d263a1c685c38fdb9b0af82078612ffd9 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 16 May 2022 07:23:21 -0700 Subject: Version 1 is released. --- Makefile | 17 ++++++++++++++--- pw.1 | 2 +- pw.c | 5 +++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index a00ae4c..2050b94 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,18 @@ +PW_SHA256 := 6675178bf43216cf302d4291269b51dc87eb87235e798c4e3e30b742e458d828 NEEDED_CFLAGS := -std=c99 -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ +ifeq ($(shell sha256sum pw.c),$(PW_SHA256) pw.c) +PW_VERSION := 1 +else +PW_VERSION := 1-$(shell git rev-parse --short HEAD) +PW_VERSION := $(PW_VERSION)$(shell git diff --quiet || printf -- "-dirty") +endif CFLAGS ?= -g -O2 -W -Wall -override CFLAGS += $(NEEDED_CFLAGS) +override CFLAGS += $(NEEDED_CFLAGS) -DCONFIG_PW_VER=\"$(PW_VERSION)\" DESTDIR ?= /usr/local +.PHONY: all pw.1 +all: pw pw.1 pw: -clean: ; rm -f pw -install: ; install pw $(DESTDIR)/bin/pw +clean:; rm -f pw +install:; install pw $(DESTDIR)/bin/pw; install pw.1 $(DESTDIR)/share/man/man1 +pw.1:; @sed -e '/^\.TH/s/Version [^"]\+/Version $(PW_VERSION)/' pw.1 > pw.tmp + cmp -s pw.1 pw.tmp && rm pw.tmp || mv pw.tmp pw.1 diff --git a/pw.1 b/pw.1 index 23e50d3..3f05bdc 100644 --- a/pw.1 +++ b/pw.1 @@ -24,7 +24,7 @@ .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. -.TH PW 1 "26 April 2022" "Utility Commands" "Pipe Watch" +.TH PW 1 "16 May 2022" "Version 1" "Pipe Watch" .SH NAME pw \- Pipe Watch: monitor recent lines of output from pipe diff --git a/pw.c b/pw.c index c8b3944..9b7f860 100644 --- a/pw.c +++ b/pw.c @@ -299,7 +299,8 @@ static char *getln(FILE *stream) static void usage(void) { fprintf(stderr, - "\nUsage: | %s [options]\n\n" + "\nThis is pw version %s.\n\n" + "Usage: | %s [options]\n\n" "-i realnum poll interval (s)\n" "-l realnum long update interval (s)\n" "-n integer display size (# of lines)\n" @@ -317,7 +318,7 @@ static void usage(void) "Standard input must be redirected; it cannot be the same device\n" "as the controlling tty (/dev/tty) of the terminal session.\n\n" "For a full description, see the manual page.\n\n", - pw_name, pw_name); + CONFIG_PW_VER, pw_name, pw_name); exit(EXIT_FAILURE); } -- cgit v1.2.3