From e6510c83a2146436778fbd905bf6597eb187ca4f Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 26 Jun 2021 18:15:33 -0300 Subject: Makefile, README.md: Adapt to changes in aux/ --- .gitignore | 5 +- Makefile | 51 +++-- README.md | 10 +- aux/assert-shellcheck.sh | 2 +- aux/ci/ci-build.sh | 6 +- aux/ci/git-post-receive.sh | 6 +- aux/ci/git-pre-push.sh | 6 +- aux/ci/report.sh | 11 +- aux/guix/with-container.sh | 2 +- aux/tests-lib.sh | 8 + aux/workflow/TODOs.sh | 5 +- aux/workflow/assert-changelog.sh | 3 +- aux/workflow/assert-manpages.sh | 6 +- aux/workflow/assert-readme.sh | 7 +- aux/workflow/assert-spelling.sh | 0 aux/workflow/commonmark.sh | 7 +- aux/workflow/dist.sh | 10 + aux/workflow/l10n.sh | 50 ++++ aux/workflow/manpages.sh | 113 ++++----- aux/workflow/public.sh | 13 +- doc/eo.po | 480 -------------------------------------- doc/fr.po | 483 --------------------------------------- doc/po/eo.po | 480 ++++++++++++++++++++++++++++++++++++++ doc/po/fr.po | 483 +++++++++++++++++++++++++++++++++++++++ doc/po/pt.po | 482 ++++++++++++++++++++++++++++++++++++++ doc/pt.po | 482 -------------------------------------- doc/remembering.en.1 | 208 ----------------- doc/remembering.en.1.in | 208 +++++++++++++++++ doc/remembering.en.5 | 94 -------- doc/remembering.en.5.in | 94 ++++++++ doc/remembering.eo.1 | 231 ------------------- doc/remembering.eo.1.in | 231 +++++++++++++++++++ doc/remembering.eo.5 | 105 --------- doc/remembering.eo.5.in | 105 +++++++++ doc/remembering.fr.1 | 233 ------------------- doc/remembering.fr.1.in | 233 +++++++++++++++++++ doc/remembering.fr.5 | 107 --------- doc/remembering.fr.5.in | 107 +++++++++ doc/remembering.pt.1 | 231 ------------------- doc/remembering.pt.1.in | 231 +++++++++++++++++++ doc/remembering.pt.5 | 105 --------- doc/remembering.pt.5.in | 105 +++++++++ 42 files changed, 2971 insertions(+), 2868 deletions(-) create mode 100644 aux/workflow/assert-spelling.sh create mode 100755 aux/workflow/l10n.sh delete mode 100644 doc/eo.po delete mode 100644 doc/fr.po create mode 100644 doc/po/eo.po create mode 100644 doc/po/fr.po create mode 100644 doc/po/pt.po delete mode 100644 doc/pt.po delete mode 100644 doc/remembering.en.1 create mode 100644 doc/remembering.en.1.in delete mode 100644 doc/remembering.en.5 create mode 100644 doc/remembering.en.5.in delete mode 100644 doc/remembering.eo.1 create mode 100644 doc/remembering.eo.1.in delete mode 100644 doc/remembering.eo.5 create mode 100644 doc/remembering.eo.5.in delete mode 100644 doc/remembering.fr.1 create mode 100644 doc/remembering.fr.1.in delete mode 100644 doc/remembering.fr.5 create mode 100644 doc/remembering.fr.5.in delete mode 100644 doc/remembering.pt.1 create mode 100644 doc/remembering.pt.1.in delete mode 100644 doc/remembering.pt.5 create mode 100644 doc/remembering.pt.5.in diff --git a/.gitignore b/.gitignore index f58df71..b053e5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,12 @@ /public/ /tests/test-profiles/ -/remembering /src/remembering-c /src/remembering /remembering-test.* /run-tests /fallible* /vgcore.* +/doc/po/*.mo +/doc/po/*.po~ +/doc/*.1 +/doc/*.5 diff --git a/Makefile b/Makefile index 38e31d0..0c08f72 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ .POSIX: -DEFS = -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"' PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man VERSION = 0.2.1 DATE = 2021-02-23 NAME = remembering MAILING_LIST = public-inbox +DEFS = -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"' TRANSLATIONS = pt fr eo .SUFFIXES: .in @@ -13,7 +13,21 @@ TRANSLATIONS = pt fr eo .in: sed -e 's:@VERSION@:$(VERSION):g' -e 's:@DATE@:$(DATE):g' < $< > $@ -all: src/remembering src/remembering-c +manpages.en.in = \ + doc/remembering.en.1.in \ + doc/remembering.en.5.in + +manpages.in = $(manpages.en.in) \ + doc/remembering.pt.1.in \ + doc/remembering.fr.1.in \ + doc/remembering.eo.1.in \ + doc/remembering.pt.5.in \ + doc/remembering.fr.5.in \ + doc/remembering.eo.5.in + +manpages = $(manpages.in:.in=) + +all: src/remembering src/remembering-c $(manpages) chmod +x src/remembering run-tests: src/remembering-c.c @@ -25,29 +39,34 @@ check: all run-tests sh tests/ranking.sh sh tests/signals.sh -dev-check: check +dev-check: check public sh aux/assert-shellcheck.sh sh aux/workflow/assert-todos.sh sh aux/workflow/assert-changelog.sh $(NAME) $(NAME) sh aux/workflow/assert-readme.sh $(NAME) $(MAILING_LIST) - sh aux/workflow/manpages.sh '$(TRANSLATIONS)' --update sh aux/workflow/assert-manpages.sh $(NAME) $(MAILING_LIST) -clean: - rm -rf public/ tests/test-profiles/ src/remembering src/remembering-c run-tests fallible* vgcore* remembering-test.* - install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - cp $(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) - sh aux/workflows/manpages.sh '$(TRANSLATIONS)' --install '$(DESTDIR)$(MANPREFIX)' -- $(do_subst) + cp src/remembering $(DESTDIR)$(PREFIX)/bin + sh aux/workflow/manpages.sh -ip $(DESTDIR)$(MANPREFIX) $(manpages) uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/$(NAME) - sh aux/workflow/manpages.sh '$(TRANSLATIONS)' --uninstall '$(DESTDIR)$(MANPREFIX)' + rm -f $(DESTDIR)$(PREFIX)/bin/remembering + sh aux/workflow/manpages.sh -up $(DESTDIR)$(MANPREFIX) $(manpages) + +clean: + rm -rf public/ tests/test-profiles/ src/remembering src/remembering-c run-tests $(manpages) fallible* vgcore* remembering-test.* + +dist: + sh aux/workflow/dist.sh $(DATE) $(VERSION) $(NAME) $(NAME) $(MAILING_LIST) + +l10n-gen: + sh aux/workflow/l10n.sh -l '$(TRANSLATIONS)' $(manpages.en.in) -dist: clean public dev-check - sh aux/workflow/dist.sh $(DATE) $(VERSION) $(NAME) +public: l10n-gen all README.md TODOs.md CHANGELOG.md + sh aux/workflow/public.sh Remembering $(NAME) $(MAILING_LIST) public + sh aux/workflow/manpages.sh -Ho public $(manpages) -public: README.md TODOs.md CHANGELOG.md - sh aux/workflow/public.sh Remembering $(NAME) $(MAILING_LIST) - sh aux/workflow/manpages.sh '$(TRANSLATIONS)' --html '' -- $(do_subst) +spellcheck: public + aux/workflow/assert-spelling.sh -l '$(TRANSLATIONS) en' diff --git a/README.md b/README.md index 9dbe3a1..890d309 100644 --- a/README.md +++ b/README.md @@ -101,11 +101,11 @@ Send contributions to the [mailing list] via [`git send-email`](https://git-send ## Releases -- version [v0.2.1](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.2.1.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.2.1.tar.gz.asc)), released in 2021-02-23 -- version [v0.2.0](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.2.0.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.2.0.tar.gz.asc)), released in 2021-02-21 -- version [v0.1.2](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.2.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.2.tar.gz.asc)), released in 2021-01-26 -- version [v0.1.1](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.1.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.1.tar.gz.asc)), released in 2021-01-26 -- version [v0.1.0](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.0.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.0.tar.gz.asc)), released in 2021-01-26 +- [v0.2.1](https://git.euandreh.xyz/remembering/commit/?id=v0.2.1) [remembering-v0.2.1.tar.gz](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.2.1.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.2.1.tar.gz.asc)), released in 2021-02-23 +- [v0.2.0](https://git.euandreh.xyz/remembering/commit/?id=v0.2.0) [remembering-v0.2.0.tar.gz](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.2.0.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.2.0.tar.gz.asc)), released in 2021-02-21 +- [v0.1.2](https://git.euandreh.xyz/remembering/commit/?id=v0.1.2) [remembering-v0.1.2.tar.gz](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.2.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.2.tar.gz.asc)), released in 2021-01-26 +- [v0.1.1](https://git.euandreh.xyz/remembering/commit/?id=v0.1.1) [remembering-v0.1.1.tar.gz](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.1.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.1.tar.gz.asc)), released in 2021-01-26 +- [v0.1.0](https://git.euandreh.xyz/remembering/commit/?id=v0.1.0) [remembering-v0.1.0.tar.gz](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.0.tar.gz) ([sig](https://git.euandreh.xyz/remembering/snapshot/remembering-v0.1.0.tar.gz.asc)), released in 2021-01-26 ## License diff --git a/aux/assert-shellcheck.sh b/aux/assert-shellcheck.sh index cc01f3a..1779ea8 100755 --- a/aux/assert-shellcheck.sh +++ b/aux/assert-shellcheck.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -eux +set -eu git ls-files | \ xargs awk 'FNR==1 && /^#!\/bin\/sh$/ { print FILENAME }' | \ diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index 60af813..7fa3382 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -1,7 +1,7 @@ #!/bin/sh set -eux -PACKAGE="$1" +PROJECT="$1" LOGS_DIR="$2" read -r _ SHA _ # oldrev newrev refname FILENAME="$(date -Is)-$SHA.log" @@ -26,8 +26,8 @@ EOF git notes append -m "$NOTE" cd - - sh aux/ci/report.sh "$PACKAGE" - rsync -av public/ "/srv/http/$PACKAGE/" --delete + sh aux/ci/report.sh "$PROJECT" public + rsync -av public/ "/srv/http/$PROJECT/" --delete printf "\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s" "$STATUS" } diff --git a/aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh index ee8075f..167ac4a 100755 --- a/aux/ci/git-post-receive.sh +++ b/aux/ci/git-post-receive.sh @@ -9,6 +9,6 @@ for n in $(seq 0 $((GIT_PUSH_OPTION_COUNT - 1))); do fi done -PACKAGE="$(basename "$PWD" | cut -d. -f1)" # remove .git suffix -LOGS_DIR="/opt/ci/$PACKAGE/logs" -"/opt/ci/$PACKAGE/ci-build.sh" "$PACKAGE" "$LOGS_DIR" +PROJECT="$(basename "$PWD" | cut -d. -f1)" # remove .git suffix +LOGS_DIR="/opt/ci/$PROJECT/logs" +"/opt/ci/$PROJECT/ci-build.sh" "$PROJECT" "$LOGS_DIR" diff --git a/aux/ci/git-pre-push.sh b/aux/ci/git-pre-push.sh index e73b9b8..cccd6e5 100755 --- a/aux/ci/git-pre-push.sh +++ b/aux/ci/git-pre-push.sh @@ -3,9 +3,9 @@ set -eux TLD="$(cat aux/tld.txt)" -PACKAGE="$(basename "$PWD")" -LOGS_DIR="/opt/ci/$PACKAGE/logs" -REMOTE_GIT_DIR="/srv/git/$PACKAGE.git" +PROJECT="$(basename "$PWD")" +LOGS_DIR="/opt/ci/$PROJECT/logs" +REMOTE_GIT_DIR="/srv/git/$PROJECT.git" DESCRIPTION="$(mktemp)" if [ -f description ] diff --git a/aux/ci/report.sh b/aux/ci/report.sh index e71e1ac..c873f54 100755 --- a/aux/ci/report.sh +++ b/aux/ci/report.sh @@ -2,12 +2,13 @@ set -eu PROJECT="$1" +OUTDIR="$2" TLD="$(cat aux/tld.txt)" PASS='✅' FAIL='❌' -mkdir -p public/ci-logs public/ci-data +mkdir -p "$OUTDIR/ci-logs" "$OUTDIR/ci-data" OUT="$(mktemp)" chmod 644 "$OUT" @@ -20,8 +21,8 @@ wait for c in $(git notes list | cut -d\ -f2); do DATA="$(git notes --ref=refs/notes/ci-data show "$c")" FILENAME="$(echo "$DATA" | cut -d\ -f2)" - echo "$DATA" > "public/ci-data/$FILENAME" - git notes --ref=refs/notes/ci-logs show "$c" > "public/ci-logs/$FILENAME" + echo "$DATA" > "$OUTDIR/ci-data/$FILENAME" + git notes --ref=refs/notes/ci-logs show "$c" > "$OUTDIR/ci-logs/$FILENAME" done cat <> "$OUT" @@ -46,7 +47,7 @@ cat <> "$OUT"