sled

чување 436036a89ee3adddc0c46fa0757e2cba4d3423eb
родитељ e38446b14d1e32981b0f5ac0805e5eea2cba03f8
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Mon, 11 Mar 2024 12:48:23 +0100

Rebuild when the date or version change

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
Makefile
 | 
20
+++++++++++++-------
M
lib/makedate
 | 
18
++++++++++++++----
M
lib/makeversion
 | 
16
+++++++++++++---
M
lib/mkpack
 | 
3
++-
M
lib/replacepat
 | 
2
+-

измењених датотека: 5, додавања: 43(+), брисања: 16(-)
diff --git a/Makefile b/Makefile
@@ -3,12 +3,12 @@ include config.mk
 .SUFFIXES: .1.in .1 .def.h .h.in .h .c .o
 
 .1.in.1:
-	sh -x lib/replacepat $< > $@
+	sh -x lib/replacepat $< $@
 
 .h.in.h:
-	sh -x lib/replacepat $< > $@
+	sh -x lib/replacepat $< $@
 
-all: $(PROG) $(MANPAGE)
+all: $(PROG) $(MANPAGE) makedate makeversion
 
 config.h: config.def.h
 	[ ! -r config.h ] && cp config.def.h config.h || true
@@ -19,11 +19,17 @@ date:
 version:
 	sh lib/makeversion
 
+makedate:
+	sh lib/makedate
+
+makeversion:
+	sh lib/makeversion
+
 sled.o: sled.c config.h draw.h termbox.h util.h version.h
 
-$(MANPAGE): $(MANPAGE).in version date
+$(MANPAGE): $(MANPAGE).in date version
 
-version.h: version.h.in version date
+version.h: version.h.in date version
 
 draw.o: draw.c config.h draw.h termbox.h util.h version.h
 
@@ -58,7 +64,7 @@ test: all
 	command -v perl >/dev/null || { echo Test suite requires perl; exit 1; }
 	perl lib/runtests
 
-pack: all version
+pack: all
 	sh -x lib/mkpack
 
-.PHONY: all clean install uninstall pack
+.PHONY: clean install makedate makeversion pack test uninstall
diff --git a/lib/makedate b/lib/makedate
@@ -9,12 +9,22 @@ e_user=$(id -un)
 if [ -d .git ] && command -v git >/dev/null 2>&1; then
 	if [ "$e_user" = "$user" ]; then
 		git log --format=format:%cd \
-			--date=format:"%B %d, %Y" -1 @ >date
+			--date=format:"%B %d, %Y" -1 @ >date.new
 	else
 		su "${user}" -c 'env LC_ALL=C git log --format=format:%cd \
-			--date=format:"%B %d, %Y" -1 @' >date
+			--date=format:"%B %d, %Y" -1 @' >date.new
 	fi
-	echo >>date
+	echo >>date.new
 else
-	printf "%s\n" "$FALLBACKDATE" >date
+	printf "%s\n" "$FALLBACKDATE" >date.new
+fi
+
+if [ -f date ]; then
+	if diff date date.new >/dev/null; then
+		rm date.new
+	else
+		mv date.new date
+	fi
+else
+	mv date.new date
 fi
diff --git a/lib/makeversion b/lib/makeversion
@@ -8,11 +8,21 @@ user=$(unalias ls >/dev/null 2>&1 || true; \
 e_user=$(id -un)
 if [ -d .git ] && command -v git >/dev/null 2>&1; then
 	if [ "$e_user" = "$user" ]; then
-		git describe 2>/dev/null | sed 's/^v//' >version
+		git describe 2>/dev/null | sed 's/^v//' >version.new
 	else
 		su "${user}" -c 'git describe' 2>/dev/null |
-			sed 's/^v//' >version
+			sed 's/^v//' >version.new
 	fi
 else
-	printf "%s\n" "$FALLBACKVER" >version
+	printf "%s\n" "$FALLBACKVER" >version.new
+fi
+
+if [ -f version ]; then
+	if diff version version.new >/dev/null; then
+		rm version.new
+	else
+		mv version.new version
+	fi
+else
+	mv version.new version
 fi
diff --git a/lib/mkpack b/lib/mkpack
@@ -1,6 +1,7 @@
 #!/bin/sh -x
 # vim: set ft=bash:
-DISTDIR=sled-$(cat version)
+DISTDIR=$(grep ^PROG config.mk |
+	sed -E 's,.*=[[:space:]]+([[:alpha:]]+),\1,')-$(cat version)
 mkdir "$DISTDIR"
 for f in $(git ls-files); do
 	d="$DISTDIR"/"$(dirname "$f")"
diff --git a/lib/replacepat b/lib/replacepat
@@ -2,4 +2,4 @@
 # vim: set ft=bash:
 DATE=$(cat date)
 VERSION=$(cat version)
-sed -e 's|%VERSION%|'"$VERSION"'|g' -e 's|%DATE%|'"$DATE"'|g' $1
+sed -e 's|%VERSION%|'"$VERSION"'|g' -e 's|%DATE%|'"$DATE"'|g' "$1" > "$2"