bit better release file generation

Makefile.am

@@ -3,11 +3,11 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src po doc man lib
 
-EXTRA_DIST = INSTALL COPYING AUTHORS NEWS README README.md README.md.in THANKS TODO ChangeLog COMPLIANCE
+EXTRA_DIST = INSTALL COPYING AUTHORS NEWS README README.md README.md.in THANKS TODO ChangeLog RELEASE RELEASE.md COMPLIANCE
 
 dist_noinst_SCRIPTS = gennews.sh autogen.sh configure.sh rebuild.sh dist.sh
 
-DISTCLEANFILES = ChangeLog AUTHORS NEWS README README.md README.html README.txt
+DISTCLEANFILES = ChangeLog AUTHORS NEWS README README.md README.html README.txt RELEASE RELEASE.html RELEASE.txt
 
 dist-hook:
 	$(AM_V_GEN)if test -x "`which git 2>/dev/null`" -a -d "$(srcdir)/.git" ; then \
@@ -65,7 +65,22 @@ README.html: README.md
 	$(AM_V_GEN)$(MARKDOWN) $< >$@
 
 README.txt: README.html
-	$(AM_V_GEN)$(LINKS) -dump -width 80 $< >$@
+	$(AM_V_GEN)$(LINKS) -dump -width 80 -nolist $< | sed -r -e 's,^[[:space:]]*,,' >$@
+
+RELEASE: RELEASE.md
+	$(AM_V_GEN)cat $< | fmt -sct -w80 -g72 >$@
+
+RELEASE.html: RELEASE.md
+	$(AM_V_GEN)$(MARKDOWN) $< >$@
+
+RELEASE.txt: RELEASE.html
+	$(AM_V_GEN)$(LINKS) -dump -width 80 -nolist $< | sed -r -e 's,^[[:space:]]*,,' >$@
+
+NOTES.html: NOTES
+	$(AM_V_GEN)$(ASCIIDOC) -o - $< >$@
+
+TODO.html: TODO
+	$(AM_V_GEN)$(ASCIIDOC) -o - $< >$@
 
 INSTALL.cmakebuild: INSTALL-cmakebuild.md
 	$(AM_V_GEN)cat $< | fmt -sct -w80 -g72 >$@

autogen.sh

@@ -40,4 +40,4 @@ fi
 
 mkdir m4 2>/dev/null
 
-autoreconf -fiv
+autoreconf -iv

configure.ac

@@ -4,6 +4,15 @@
 AC_PREREQ([2.69])
 AC_INIT([icewm],[1.4.2],[https://github.com/bbidulock/icewm/issues])
 AC_REVISION([1.4.2])
+
+# set better defaults
+AC_PREFIX_DEFAULT([/usr])
+if test "$prefix" = /usr -o "$prefix" = NONE; then
+	test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+	test "$sharedstatedir" = '${prefix}/com' && sharedstatedir=/var
+	test "$localstatedir" = '${prefix}/var' && localstatedir=/var
+fi
+
 AC_CONFIG_SRCDIR([src/ysmapp.cc])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -14,6 +23,9 @@ AC_CANONICAL_TARGET
 DATE='2017-07-30'
 AC_SUBST([DATE])
 
+MDOCDATE='July 30, 2017'
+AC_SUBST([MDOCDATE])
+
 BRANCH='1.4.2'
 AC_SUBST([BRANCH])
 
@@ -23,10 +35,9 @@ TESTCASES="$TESTCASES iceview icesame iceicon icerun icelist icebar" # iceclock
 features=''
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([gnits 1.13.4 dist-xz no-dist-gzip std-options -Wall color-tests silent-rules tar-pax])
+AM_INIT_AUTOMAKE([1.16 dist-lzip no-dist-gzip std-options -Wall color-tests silent-rules tar-pax])
 AM_MAINTAINER_MODE
 AM_SILENT_RULES([yes])
-AC_PREFIX_DEFAULT([/usr])
 
 # Checks for programs.
 AC_LANG_CPLUSPLUS
@@ -49,7 +60,7 @@ AC_ARG_VAR([MARKDOWN],[markdown command. @<:@default=markdown@:>@])
 AC_CHECK_PROGS([MARKDOWN],[markdown],[${am_missing_run}markdown],[$PATH])
 
 AC_ARG_VAR([ASCIIDOC],[asciidoc command. @<:@default=asciidoctor@:>@])
-AC_CHECK_PROGS([ASCIIDOC],[asciidoctor asciidoc],[${am_missing_run}asciidoctor],[$PATH])
+AC_CHECK_PROGS([ASCIIDOC],[asciidoc asciidoctor],[${am_missing_run}asciidoc],[$PATH])
 
 AC_ARG_VAR([ASCIIDOC_BACKEND],[asciidoc backend @<:@default=NONE@:>@])
 if test -z "$ASCIIDOC_BACKEND"; then
@@ -60,6 +71,18 @@ if test -z "$ASCIIDOC_BACKEND"; then
 	esac
 fi
 
+AC_ARG_VAR([ASCIIMAN],[asciidoc to manpage converter. @<:@default=a2x@:>@])
+AC_CHECK_PROGS([ASCIIMAN],[a2x asciidoctor],[${am_missing_run}a2x],[$PATH])
+
+AC_ARG_VAR([ASCIIMAN_FORMAT],[asciidoc manpage option @<:@default=NONE@:>@])
+if test -z "$ASCIIMAN_FORMAT"; then
+	case "$ASCIIMAN" in
+		a2x) ASCIIMAN_FORMAT="--format=manpage" ;;
+		asciidoctor) ASCIIMAN_FORMAT="--backend=manpage" ;;
+		*) AC_MSG_WARN([ASCIIMAN $ASCIIMAN is not supported.]) ;;
+	esac
+fi
+
 AC_ARG_VAR([LINKS],[links command. @<:@default=lynx@:>@])
 AC_CHECK_PROGS([LINKS],[lynx links],[${am_missing_run}lynx],[$PATH])
 if test "$LINKS" = "links"; then
@@ -71,7 +94,6 @@ LT_PATH_LD
 LT_PREREQ([2.4.2])
 LT_INIT([dlopen])
 LT_LANG([C++])
-AC_PROG_LIBTOOL
 AC_SUBST([LIBTOOL_DEPS])
 
 AM_GNU_GETTEXT_VERSION([0.19.2])
@@ -95,6 +117,7 @@ PKG_PROG_PKG_CONFIG
 # Checks for libraries.
 
 # Checks for header files.
+AS_BOX([Header Files])
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
@@ -110,6 +133,7 @@ AC_CHECK_HEADERS([sys/sched.h sys/socket.h sys/soundcard.h sys/sysctl.h sys/time
 AC_CHECK_HEADERS([unistd.h uvm/uvm_param.h wchar.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
+AS_BOX([Typedefs, Structures, Compiler])
 AC_CHECK_HEADER_STDBOOL
 AC_C_INLINE
 AC_TYPE_PID_T

configure.sh

@@ -38,9 +38,6 @@ fi
 ./configure \
 	--enable-maintainer-mode \
 	--enable-dependency-tracking \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--mandir=/usr/share/man \
 	CPPFLAGS="$CPPFLAGS" \
 	CFLAGS="$DEBUG_CFLAGS -Wall -Werror $CFLAGS" \
 	CXXFLAGS="$DEBUG_CXXFLAGS -Wall -Werror $CXXFLAGS" \

dist.sh

@@ -8,5 +8,5 @@
 [ -f Makefile ] && make distclean
 ./autogen.sh
 ./configure.sh
-make "$jobs" distcheck
+make "$jobs" distcheck RELEASE.txt
 

gennews.sh

@@ -14,7 +14,7 @@ for o in $(git tag --sort=-creatordate) ""; do
 	i=$((i+1))
 	if [ -z "$t" ] ; then
 		head=$(git show -s --format=%H HEAD)
-		last=$(git show -s --format=%H "$o")
+		last=$(git show -s --format=%H "$o^{commit}")
 		if [ "$head" = "$last" ]; then
 			t="$o"
 			continue
@@ -28,8 +28,23 @@ for o in $(git tag --sort=-creatordate) ""; do
 	date=$(git show -s --format=%ci "$t^{commit}"|awk '{print$1}')
 	title="Release ${PACKAGE}${PACKAGE:+-}$version released $date"
 	under=$(echo "$title"|sed 's,.,-,g')
+	/usr/bin/echo -e "\n$title\n$under\n"
+	cmd="git notes --ref=release show $t"
+	notes=$(eval $cmd 2>/dev/null|sed 's,^,    ,')
+	lines=$(echo "$notes"|wc -l)
+	if [ $lines -gt 1 ] ; then
+		/usr/bin/echo -e "$cmd\n\n$notes\n"
+	fi
+	if [ :$t != :HEAD ] ; then
+		cmd="git tag -n100 -l ${t}"
+		notes=$(eval $cmd 2>/dev/null)
+		lines=$(echo "$notes"|wc -l)
+		if [ $lines -gt 1 ] ; then
+			/usr/bin/echo -e "$cmd\n\n$notes\n"
+		fi
+	fi
 	cmd="git shortlog -e -n -w80,6,8 ${o}${o:+...}${t}"
-	/usr/bin/echo -e "\n$title\n$under\n\n$cmd\n\n$(eval $cmd)\n"
+	/usr/bin/echo -e "$cmd\n\n$(eval $cmd)\n"
 	t="$o"
 done|sed -r 's,[[:space:]][[:space:]]*$,,'