From b596f9887998fc2f2e30ce904bb42e37e428ddfd Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Sat, 29 Jun 2019 15:57:04 +0900 Subject: [PATCH] Include an up-to-date ChangeLog with every build --- .gitlab-ci.yml | 1 + ChangeLog | 10 ++++------ ChangeLogs/ChangeLog-1.0.27 | 17 +++++++++++++++++ tools/Makefile.am | 1 + tools/create-changelog.sh | 16 ++++++++++++++++ 5 files changed, 39 insertions(+), 6 deletions(-) create mode 100755 tools/create-changelog.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc169745d..0a07b2344 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,7 @@ prepare: script: - find -path ./.git -prune -o -type f | xargs tools/style-check.sh - ./autogen.sh + - ./tools/create-changelog.sh - ./configure - make dist artifacts: diff --git a/ChangeLog b/ChangeLog index 15c43b2cc..ad8265e2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,4 @@ -This file is automatically generated at release time using git commit -messages. - -For the latest changes please refer to the output of `git log` or see: - - https://gitlab.com/sane-project/backends/commits/master +This file is automatically replaced at build time from the git commit +messages and included in our source tarballs. When you see this text +you're using a `git checkout` and should use the `git log` command to +see what has changed. diff --git a/ChangeLogs/ChangeLog-1.0.27 b/ChangeLogs/ChangeLog-1.0.27 index 508a9a834..63d3d578e 100644 --- a/ChangeLogs/ChangeLog-1.0.27 +++ b/ChangeLogs/ChangeLog-1.0.27 @@ -1,3 +1,20 @@ +commit 82cd8f245cf26879b3f94348d4069dcec8d49f21 (tag: RELEASE_1_0_27, tag: 1.0.27) +Author: m. allan noah +Date: 2017-05-22 11:16:40 -0400 + + SANE-backends release 1.0.27 + + Moved old changelogs to new directory, and excluded them from + release tarball. + + Improved release docs. + + Updated config.* files + + Bumped version numbers. + + Wrote release notes. + commit 16f3060061a17cbc54f3415a7e2abc1c35f3fcd2 Author: Rolf Bensch Date: Sat May 20 14:13:19 2017 +0200 diff --git a/tools/Makefile.am b/tools/Makefile.am index 89a66b326..8428ae68b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -34,6 +34,7 @@ CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS) EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \ RenSaneDlls.cmd README xerox EXTRA_DIST += style-check.sh +EXTRA_DIST += create-changelog.sh sane_find_scanner_SOURCES = sane-find-scanner.c if have_usblib diff --git a/tools/create-changelog.sh b/tools/create-changelog.sh new file mode 100755 index 000000000..a0b8d9170 --- /dev/null +++ b/tools/create-changelog.sh @@ -0,0 +1,16 @@ +#!/bin/sh -u +# tools/create-changelog.sh -- for inclusion in source tarballs +# Copyright (C) 2019 Olaf Meeuwissen +# +# License: GPL-3.0+ + +git log --date=iso8601 --decorate=short 1.0.27..HEAD \ + | sed 's/^[ \t]*$//' \ + > ChangeLog + +cat << EOF >> ChangeLog + +---------------------------------------------------------------------- +Older ChangeLog entries can be found in the ChangeLogs/ directory on a +file per release basis. Please note that 1.0.26 was never released. +EOF