Add make release target for simplified maintenance

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

.gitignore

@@ -1,25 +1,24 @@
-Makefile
-archive
-autom4te.cache
-config.h
-config.log
-config.status
-libtool
-examples/.deps
-examples/Makefile
-examples/cli
-examples/cli.o
-examples/testit
-examples/testit.o
-include/Makefile
-man/Makefile
-man/Makefile
-src/.deps
-src/Makefile
-src/*.o
-src/*.lo
-src/libeditline.a
-src/libeditline.la
-stamp-h1
 *~
 */.libs/
+*.lo
+*.o
+.deps
+Makefile
+Makefile.in
+aclocal.m4
+archive
+autom4te.cache
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1

.travis.yml

@@ -5,6 +5,11 @@ language: c
 # We don't need to install packages, use dockerized build, quicker
 sudo: false
 
+# Test build with both GCC and Clang (LLVM)
+compiler:
+  - gcc
+  - clang
+
 env:
   global:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
@@ -19,7 +24,7 @@ addons:
     notification_email: troglobit@gmail.com
     build_command_prepend: "./autogen.sh && ./configure --enable-sigstop --enable-terminal-bell"
     build_command:   "make -j5"
-    branch_pattern: master
+    branch_pattern: dev
 
 # We don't store generated files (configure and Makefile) in GIT,
 # so we must customize the default build script to run ./autogen.sh

ChangeLog.md

@@ -3,6 +3,37 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+
+[1.15.2][] - 2016-06-06
+-----------------------
+
+Bug fixes and minor feature creep in `pkg-config` support.
+
+### Changes
+- Prevent mangling of symbols when linking with C++.  Patch courtesy of
+  Jakub Pawlowski
+- Add `libeditline.pc` for `pkg-config`
+
+### Fixes
+- Do not assume a termcap library exists, check for `tgetent()` in
+  curses, ncurses, tinfo and termcap libraries
+- Call `tty_flush()` when user calls `rl_forced_update_display()`
+  to prevent screen becoming garbled.  Patch by Jakub Pawlowski
+
+
+[1.15.1][] - 2015-11-16
+-----------------------
+
+Bug fixes only.
+
+### Changes
+- Update README with origin of this version of editline
+
+### Fixes
+- Fix build system, don't force automake v1.11, require at least v1.11
+- Fix build problem with examples using `--enable-termcap`
+
+
 [1.15.0][] - 2015-09-10
 -----------------------
 
@@ -123,7 +154,9 @@ Adaptations to Debian editline package.
 - First version, forked from Minix current 2008-06-06
 
 
-[UNRELEASED]:    https://github.com/troglobit/finit/compare/1.15.0...HEAD
+[UNRELEASED]:    https://github.com/troglobit/finit/compare/1.15.1...HEAD
+[1.15.2]:        https://github.com/troglobit/finit/compare/1.15.1...1.15.2
+[1.15.1]:        https://github.com/troglobit/finit/compare/1.15.0...1.15.1
 [1.15.0]:        https://github.com/troglobit/finit/compare/1.14.2...1.15.0
 [1.14.2]:        https://github.com/troglobit/finit/compare/1.14.1...1.14.2
 [1.14.1]:        https://github.com/troglobit/finit/compare/1.14.0...1.14.1

Makefile.am

@@ -1,4 +1,38 @@
-AUTOMAKE_OPTIONS = foreign
-doc_DATA         = README LICENSE CHANGELOG
-EXTRA_DIST       = LICENSE CHANGELOG INSTALL
-SUBDIRS          = src include man examples
+pkgconfigdir    = $(libdir)/pkgconfig
+pkgconfig_DATA  = libeditline.pc
+doc_DATA        = README LICENSE CHANGELOG
+EXTRA_DIST      = LICENSE CHANGELOG INSTALL
+SUBDIRS         = src include man examples
+
+## Generate MD5 checksum file
+MD5 = md5sum
+md5-dist:
+	@for file in $(DIST_ARCHIVES); do	\
+		$(MD5) $$file > $$file.md5;	\
+	done
+
+## Check if tagged in git
+release-hook:
+	if [ ! `git tag | grep $(PACKAGE_VERSION)` ]; then				\
+		echo;									\
+		printf "\e[1m\e[41mCannot find release tag $(PACKAGE_VERSION)\e[0m\n";	\
+		printf "\e[1m\e[5mDo release anyway?\e[0m "; read yorn;			\
+		if [ "$$yorn" != "y" -a "$$yorn" != "Y" ]; then				\
+			printf "OK, aborting release.\n";				\
+			exit 1;								\
+		fi;									\
+		echo;									\
+	else										\
+		echo;									\
+		printf "\e[1m\e[42mFound GIT release tag $(PACKAGE_VERSION)\e[0m\n";	\
+		printf "\e[1m\e[44m>>Remember to push tags!\e[0m\n";			\
+		echo;									\
+	fi
+
+## Target to run when building a release
+release: dist release-hook md5-dist
+	@for file in $(DIST_ARCHIVES); do						\
+		printf "$$file    \tDistribution tarball\n";				\
+		printf "$$file.md5\t"; cat $$file.md5 | cut -f1 -d' ';			\
+		mv $$file* ../;								\
+	done

README.md

@@ -137,12 +137,20 @@ The `$DESTDIR` environment variable is honored at install.  See
 Origin & References
 --------------------
 
-This [line editing][] library was created by Simmule Turner and Rich Salz
-in in 1992.  It is distributed under a “C News-like” license, similar to
-the [BSD license][].  For details, see the file [LICENSE][].
+This [line editing][] library was created by Simmule Turner and
+[Rich Salz][upstream] in in 1992.  It is distributed under a “C
+News-like” license, similar to the [BSD license][].  Rich's latest
+version is however under the Apache license.  For details on the
+licensing terms of this version of the software, see [LICENSE][].
 
-This version of the editline library is forked from the [Minix 3][] source
-tree.  Patches and bug fixes from the following forks, all based on the
+This version of the editline library was forked from the [Minix 3][]
+source tree and is *not* related to the similarily named NetBSD version
+that [Jess Thrysøe][jess] disitributes to the world outside BSD.  The
+libraries have much in common, but the latter is heavily refactored and
+also relies on libtermcap (usually supplied by ncurses), whereas this
+library only uses termios from the standard C library.
+
+Patches and bug fixes from the following forks, all based on the
 original comp.sources.unix posting, have been merged:
 
 * Debian [libeditline][]
@@ -166,7 +174,9 @@ Outstanding issues are listed in the [TODO.md][] file.
 [TODO.md]:         https://github.com/troglobit/editline/blob/master/TODO.md
 [ChangeLog.md]:    https://github.com/troglobit/editline/blob/master/ChangeLog.md
 [FSF readline]:    http://www.gnu.org/software/readline/
-[Minix 3]:         http://www.minix3.org/
+[upstream]:        https://github.com/richsalz/editline/
+[Minix 3]:         http://www.cise.ufl.edu/~cop4600/cgi-bin/lxr/http/source.cgi/lib/editline/
+[jess]:            http://thrysoee.dk/editline/
 [BSD license]:     http://en.wikipedia.org/wiki/BSD_licenses
 [libeditline]:     http://packages.qa.debian.org/e/editline.html
 [Heimdal]:         http://www.h5l.org

autogen.sh

@@ -1,7 +1,3 @@
 #!/bin/sh
 
-# Use v1.11 for backwards compat with Ubuntu 12.04 LTS
-export ACLOCAL=aclocal-1.11
-export AUTOMAKE=automake-1.11
-
 autoreconf -W portability -visfm

configure.ac

@@ -1,26 +1,11 @@
-# Minix libeditline                                           -*- Autoconf -*-
-#
-# Copyright (c) 2008-2013  Joachim Nilsson <troglobit()gmail!com>
-#
-# Process this file with autoconf to produce a configure script.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-AC_PREREQ(2.61)
-AC_INIT(editline, 1.15.0, https://github.com/troglobit/editline/issues)
-AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
+AC_INIT(editline, 1.15.2, https://github.com/troglobit/editline/issues)
+AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/editline.c])
 AC_CONFIG_HEADER([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile include/Makefile man/Makefile examples/Makefile])
+AC_CONFIG_FILES([Makefile libeditline.pc src/Makefile include/Makefile man/Makefile examples/Makefile])
 
 # Checks for programs.
 AC_PROG_CC
@@ -83,7 +68,15 @@ AC_ARG_ENABLE(termcap,
    [AS_HELP_STRING([--enable-termcap], [Use termcap library to query terminal size.])],
    AC_DEFINE([CONFIG_USE_TERMCAP], 1, [Define to use the termcap library for terminal size.]))
 
-AM_CFLAGS="-std=gnu99 $inline_cflags -W -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow -Wcast-qual"
-AC_SUBST(AM_CFLAGS)
+# Check for a termcap compatible library if enabled
+AS_IF([test "$enable_termcap" != no],
+	AC_CHECK_LIB(termcap, tgetent, , [
+		AC_CHECK_LIB(tinfo, tgetent, , [
+			AC_CHECK_LIB(curses, tgetent, , [
+				AC_CHECK_LIB(ncurses, tgetent, , [
+					AC_MSG_ERROR([Cannot find a termcap capable library, try installing Ncurses.])])
+			])
+		])
+	]))
 
 AC_OUTPUT

examples/.gitignore

@@ -0,0 +1,3 @@
+*.o
+cli
+testit

examples/Makefile.am

@@ -1,6 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
-
 noinst_PROGRAMS  = testit cli
-LDADD            = $(top_builddir)/src/libeditline.la $(TERMLIBS)
+LDADD            = $(top_builddir)/src/libeditline.la
 AM_CFLAGS        = -I$(top_srcdir)/src -I$(top_srcdir)/include
 AM_LDFLAGS       = -static

include/Makefile.am

@@ -1,4 +1,2 @@
-AUTOMAKE_OPTIONS = foreign
-
-library_includedir=$(includedir)
+library_includedir      = $(includedir)
 library_include_HEADERS = editline.h

include/editline.h

@@ -29,6 +29,10 @@
 #define ISMETA(x)       ((x) & 0x80)
 #define UNMETA(x)       ((x) & 0x7F)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Command status codes. */
 typedef enum {
     CSdone = 0,                 /* OK */
@@ -100,4 +104,8 @@ void rl_deprep_terminal(void);
 
 int rl_getc(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __EDITLINE_H__ */

libeditline.pc.in

@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@
+Description: A small line editing library without termcap/curses
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -leditline
+Cflags: -I${includedir}
+

m4/.gitignore

@@ -0,0 +1 @@
+*.m4

src/.gitignore

@@ -0,0 +1,2 @@
+libeditline.a
+libeditline.la

src/Makefile.am

@@ -1,3 +1,6 @@
-AUTOMAKE_OPTIONS        = foreign
 lib_LTLIBRARIES         = libeditline.la
 libeditline_la_SOURCES  = editline.c editline.h complete.c sysunix.c unix.h
+libeditline_la_CFLAGS   = -std=gnu99
+libeditline_la_CFLAGS  += -W -Wall -Wundef -Wunused -Wstrict-prototypes
+libeditline_la_CFLAGS  += -Werror-implicit-function-declaration -Wshadow -Wcast-qual
+libeditline_la_LDFLAGS  = $(AM_LDFLAGS) -version-info 0:0:0

src/complete.c

@@ -277,7 +277,6 @@ int rl_list_possib(char *token, char ***av)
 
 /**
  * Local Variables:
- *  version-control: t
  *  indent-tabs-mode: t
  *  c-file-style: "ellemtel"
  *  c-basic-offset: 4

src/editline.c

@@ -1170,6 +1170,7 @@ void rl_clear_message(void)
 void rl_forced_update_display()
 {
     redisplay();
+    tty_flush();
 }
 
 char *readline(const char *prompt)
@@ -1734,7 +1735,6 @@ el_status_t el_bind_key_in_metamap(int key, el_keymap_func_t function)
 
 /**
  * Local Variables:
- *  version-control: t
  *  indent-tabs-mode: t
  *  c-file-style: "ellemtel"
  *  c-basic-offset: 4

src/sysos9.c

@@ -57,7 +57,6 @@ void rl_add_slash(char *path, char *p)
 
 /**
  * Local Variables:
- *  version-control: t
  *  indent-tabs-mode: t
  *  c-file-style: "ellemtel"
  *  c-basic-offset: 4

src/sysunix.c

@@ -232,7 +232,6 @@ void rl_add_slash(char *path, char *p)
 
 /**
  * Local Variables:
- *  version-control: t
  *  indent-tabs-mode: t
  *  c-file-style: "ellemtel"
  *  c-basic-offset: 4