Store the version string in a single place

Instead of having the ttyplot version string in ttyplot.c (as three
separate variables) and recordings/expected.txt, store it only in
Makefile. This should make version bumping easier.

This string is given by `make` to the compiler as a -D option. The CI
workflow and get_back_in_sync.sh extract this string from the Makefile
using `grep`.

Author: edgar-bonet

.github/workflows/linux_and_macos.yml

@@ -205,8 +205,10 @@ jobs:
             ################################################################
           EOF
 
+          eval `grep ^VERSION Makefile | tr -d ' '`
+          sed "s/@VERSION@/$VERSION/" recordings/template.txt > recordings/expected.txt
           diff -u recordings/{expected,actual}.txt
-          rm -f recordings/actual.txt
+          rm -f recordings/{expected,actual}.txt
 
       - name: 'Clean'
         env:

Makefile

@@ -1,6 +1,8 @@
+VERSION    = 1.7.2
 DESTDIR   ?=
 PREFIX    ?= /usr/local
 MANPREFIX ?= $(PREFIX)/man
+CPPFLAGS += -DVERSION_STR='"$(VERSION)"'
 CFLAGS += -Wall -Wextra
 CFLAGS += `pkg-config --cflags ncursesw`
 LDLIBS += `pkg-config --libs ncursesw` -lm
@@ -22,6 +24,6 @@ clean:
 
 .c:
 	@pkg-config --version > /dev/null
-	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LDLIBS) -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< $(LDLIBS) -o $@
 
 .PHONY: all clean install uninstall

recordings/get_back_in_sync.sh

@@ -22,12 +22,13 @@ fi
 
 ./record.sh
 
-cp actual.txt expected.txt
+eval `grep ^VERSION ../Makefile | tr -d ' '`  # get the version number
+sed "s/$VERSION/@VERSION@/" actual.txt > template.txt
 
-git add expected.txt
+git add template.txt
 
 if git diff --cached --exit-code >/dev/null ; then
     echo 'Already in sync, good.'
 else
-    EDITOR=true git commit -m 'recordings: Sync expected.txt'
+    EDITOR=true git commit -m 'recordings: Sync template.txt'
 fi

recordings/expected.txt recordings/template.txtrecordings/expected.txt renamed to recordings/template.txt

@@ -19,7 +19,7 @@
 |  │                                                                                       |
 |  └─────────────────────────────────────────────────────────────────────────────────────> |
 |     X                                                           Thu Jan  1 00:00:00 1970 |
-|                                                  https://github.com/tenox7/ttyplot 1.7.0 |
+|                                                  https://github.com/tenox7/ttyplot @VERSION@ |
 +------------------------------------------------------------------------------------------+
 
 [90x20] Frame 2:
@@ -43,7 +43,7 @@
 |  │                                                                                    XX |
 |  └─────────────────────────────────────────────────────────────────────────────────────> |
 |     X last=3.0 min=1.0 max=3.0 avg=2.0                          Thu Jan  1 00:00:00 1970 |
-|       last=4.0 min=2.0 max=4.0 avg=3.0           https://github.com/tenox7/ttyplot 1.7.0 |
+|       last=4.0 min=2.0 max=4.0 avg=3.0           https://github.com/tenox7/ttyplot @VERSION@ |
 +------------------------------------------------------------------------------------------+
 
 [90x20] Frame 3:
@@ -67,6 +67,6 @@
 |  │                                                                                    XX |
 |  └─────────────────────────────────────────────────────────────────────────────────────> |
 |     X last=3.0 min=1.0 max=3.0 avg=2.0                          Thu Jan  1 00:00:00 1970 |
-|       last=4.0 min=2.0 max=4.0 avg=3.0           https://github.com/tenox7/ttyplot 1.7.0 |
+|       last=4.0 min=2.0 max=4.0 avg=3.0           https://github.com/tenox7/ttyplot @VERSION@ |
 +------------------------------------------------------------------------------------------+
 

ttyplot.c

@@ -41,13 +41,6 @@
 #include <err.h>
 #endif
 
-#define STR_(x) #x
-#define STR(x) STR_(x)
-#define VERSION_MAJOR 1
-#define VERSION_MINOR 7
-#define VERSION_PATCH 2
-#define VERSION_STR STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH)
-
 #define T_RARR '>'
 #define T_UARR '^'
 #ifdef NOACS