Release v6.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

.travis.yml

@@ -60,4 +60,4 @@ script:
  - $LUAROCKS make $ROCKSPEC LUA="$LUA"
  # Use bin/specl if we built it, or else the specl rock we just installed.
  - test -f "$SPECL" || SPECL=luarocks/bin/specl;
- make check SPECL="$SPECL" V=1
+ LUA_PATH=`pwd`'/lib/?.lua;'"${LUA_PATH-;}" make check SPECL="$SPECL" V=1

COPYING

@@ -4,7 +4,7 @@ the terms of the MIT license (the same license as Lua itself),
 unless noted otherwise in the body of that file.
 
 ====================================================================
-Copyright (C) 2013 Gary V. Vaughan
+Copyright (C) 2013-2014 Gary V. Vaughan
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

ChangeLog

@@ -1,5 +1,92 @@
+2014-01-04 Gary V. Vaughan <gary@gnu.org>
+
+ Release version 6
+ * NEWS: Record release date.
+
+ bootstrap: auto-merge bootstrap.slingshot into bootstrap.
+ * src/merge-sections.in: New file. Merge sections of named files
+ into input from stdin.
+ * src/src.mk (EXTRA_DIST): Add build-aux/merge-sections.
+ * configure.ac (AC_CONFIG_FILES): Generate build-aux/merge-sections
+ from src/merge-sections.in.
+ * bootstrap, bootstrap.slingshot: Move from here...
+ * bulid-aux/bootstrap.in, bulid-aux/bootstrap.slingshot: ...to here.
+ * .gitignore: Adjust.
+ * build-aux/release.mk (release_extra_dist): Remove
+ bootstrap.slingshot.
+ * local.mk (EXTRA_DIST): Add build-aux/bootstrap.slingshot and
+ build-aux/bootstrap.
+ * bootstrap.conf (require_bootstrap_uptodate): Override bootstrap
+ default with a custom version that knows how to merge in slingshot
+ specific functions to upstream bootstrap.
+ * README.md: Remove bootstrap.slingshot instructions.
+ * bootstrap: Regenerate.
+ * NEWS: Update.
+
+2014-01-03 Gary V. Vaughan <gary@gnu.org>
+
+ configury: ensure ChangeLog even without gnulib_modules setting.
+ * bootstrap.slingshot (slingshot_ensure_changelog): New
+ function. Hook bootstrap's func_ensure_changelog into
+ func_prep so that it works even when we don't have gnulib_modules
+ containing gitlog-to-changelog in our bootstrap.conf.
+
+ configury: ChangeLog and README are now managed by bootstrap.
+ * bootstrap.conf (slingshot_force_changelog)
+ (slingshot_force_readme): Remove.
+
+ bootstrap: sync with upstream.
+ * bootstrap: Pick up some bugfixes and enhancements from earlier
+ today.
+
+2014-01-02 Gary V. Vaughan <gary@gnu.org>
+
+ bootstrap: sync with upstream.
+ * bootstrap: Pick up recent fixes from upstream.
+
+ maint: update copyright notices.
+ Add rules, and update all copyright notices.
+ * GNUmakefile (update-copyright): New rule to run
+ build-aux/update-copyright with appropriate options.
+ * local.mk (copyright_env): New macro with appropriate
+ update-copyright options.
+
+2013-12-11 Gary V. Vaughan <gary@gnu.org>
+
+ mkrockspecs: define spec.build before dereferencing it.
+ * src/mkrockspecs.in: If spec.build is not set before accessing
+ default to the empty table.
+
+2013-12-09 Gary V. Vaughan <gary@gnu.org>
+
+ release: make sure rockspecs are generated before emails.
+ * build-aux/release.mk (mail): Add dependency on rockspecs.
+
+ travis: support make check on partial installs.
+ * travis.yml.in (script): Set the LUA_PATH to point at the build
+ tree before running make check.
+ * .travis.yml: Regenerate.
+ * NEWS: Update.
+
+ mkrockspecs: fix a typo.
+ * src/mkrockspecs.in: Add missing 's' to spec.build.modules reset.
+
+ mkrockspecs: allow "builtin" builds even without --module-dir.
+ * src/mkrockspecs.in: Don't switch to autoconf builds for the
+ main rockspec if the default.build.modules is set in
+ rockspec.conf.
+ * NEWS: Update.
+
+ configury: bump release version to 6.
+ * configure.ac (AC_INIT): Bump release version to 6.
+
 2013-12-08 Gary V. Vaughan <gary@gnu.org>
 
+ maint: post-release administrivia.
+ * NEWS: Add header line for next release.
+ * .prev-version: Record previous version.
+ * ./local.mk (old_NEWS_hash): Auto-update.
+
  Release version 5
  * NEWS: Record release date.
 

GNUmakefile

@@ -1,4 +1,20 @@
-## maintainer rules.
+# Maintainer rules.
+#
+# Copyright (C) 2013-2014 Gary V. Vaughan
+# Written by Gary V. Vaughan, 2013
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ME = GNUmakefile
 
@@ -22,6 +38,30 @@ include build-aux/sanity.mk
 # Run sanity checks as part of distcheck.
 distcheck: $(local-check)
 
+
+## ------------------------- ##
+## Copyright Notice Updates. ##
+## ------------------------- ##
+
+# If you want to set UPDATE_COPYRIGHT_* environment variables,
+# for the build-aux/update-copyright script: set the assignments
+# in this variable in local.mk.
+update_copyright_env ?=
+
+# Run this rule once per year (usually early in January)
+# to update all FSF copyright year lists in your project.
+# If you have an additional project-specific rule,
+# add it in local.mk along with a line 'update-copyright: prereq'.
+# By default, exclude all variants of COPYING; you can also
+# add exemptions (such as ChangeLog..* for rotated change logs)
+# in the file .x-update-copyright.
+.PHONY: update-copyright
+update-copyright:
+ $(AM_V_GEN)grep -l -w Copyright \
+ $$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \
+ | $(update_copyright_env) xargs $(srcdir)/build-aux/$@
+
+
 ## ------ ##
 ## Specl. ##
 ## ------ ##

INSTALL

@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package. Some packages provide this
 `INSTALL' file but do not implement all of the features documented

Makefile.am

@@ -1,6 +1,6 @@
 # Non-recursive Make rules.
 #
-# Copyright (C) 2013 Gary V. Vaughan
+# Copyright (C) 2013-2014 Gary V. Vaughan
 # Written by Gary V. Vaughan, 2013
 #
 # This program is free software; you can redistribute it and/or modify it

Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -16,7 +16,25 @@
 
 # Non-recursive Make rules.
 #
-# Copyright (C) 2013 Gary V. Vaughan
+# Copyright (C) 2013-2014 Gary V. Vaughan
+# Written by Gary V. Vaughan, 2013
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Project-local Make rules.
+#
+# Copyright (C) 2013-2014 Gary V. Vaughan
 # Written by Gary V. Vaughan, 2013
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -34,7 +52,7 @@
 
 # Project make rules.
 #
-# Copyright (c) 2013 Gary V. Vaughan
+# Copyright (c) 2013-2014 Gary V. Vaughan
 # Written by Gary V. Vaughan, 2013
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -52,7 +70,7 @@
 
 # Specl make rules.
 #
-# Copyright (c) 2013 Gary V. Vaughan
+# Copyright (c) 2013-2014 Gary V. Vaughan
 # Written by Gary V. Vaughan, 2013
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -74,7 +92,7 @@
 # terms of the MIT license reproduced below.
 
 # ==================================================================== #
-# Copyright (C) 2013 Gary V. Vaughan #
+# Copyright (C) 2013-2014 Gary V. Vaughan #
 # #
 # Permission is hereby granted, free of charge, to any person #
 # obtaining a copy of this software and associated documentation #
@@ -105,7 +123,7 @@
 # terms of the MIT license reproduced below.
 
 # ==================================================================== #
-# Copyright (C) 2013 Reuben Thomas and Gary V. Vaughan #
+# Copyright (C) 2013-2014 Reuben Thomas and Gary V. Vaughan #
 # #
 # Permission is hereby granted, free of charge, to any person #
 # obtaining a copy of this software and associated documentation #
@@ -201,10 +219,10 @@ DIST_COMMON = $(srcdir)/local.mk $(srcdir)/src/src.mk \
  $(srcdir)/build-aux/rockspecs.mk INSTALL NEWS README AUTHORS \
  ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
  $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/travis.yml.in $(top_srcdir)/src/mkrockspecs.in \
- $(dist_bin_SCRIPTS) $(dist_lua_DATA) COPYING \
- build-aux/install-sh build-aux/missing \
- $(top_srcdir)/build-aux/install-sh \
+ $(srcdir)/travis.yml.in $(top_srcdir)/src/merge-sections.in \
+ $(top_srcdir)/src/mkrockspecs.in $(dist_bin_SCRIPTS) \
+ $(dist_lua_DATA) COPYING build-aux/install-sh \
+ build-aux/missing $(top_srcdir)/build-aux/install-sh \
  $(top_srcdir)/build-aux/missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -216,7 +234,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = .travis.yml build-aux/mkrockspecs
+CONFIG_CLEAN_FILES = .travis.yml build-aux/merge-sections \
+ build-aux/mkrockspecs
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -385,8 +404,10 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = $(LUA_INCLUDE)
-EXTRA_DIST = build-aux/mkrockspecs docs/mkrockspecs.1 $(NOTHING_ELSE) \
- $(specl_SPECS) $(NOTHING_ELSE) $(mkrockspecs) \
+EXTRA_DIST = build-aux/merge-sections build-aux/mkrockspecs \
+ docs/mkrockspecs.1 $(NOTHING_ELSE) $(specl_SPECS) \
+ $(NOTHING_ELSE) build-aux/bootstrap.in \
+ build-aux/bootstrap.slingshot $(mkrockspecs) \
  $(package_rockspec) $(rockspec_conf) $(NOTHING_ELSE)
 EXTRA_LTLIBRARIES = 
 CLEANFILES = docs/mkrockspecs.1 $(NOTHING_ELSE)
@@ -402,7 +423,12 @@ install_exec_hooks =
 lib_LTLIBRARIES = 
 man_MANS = docs/mkrockspecs.1
 save_release_files = $(scm_rockspec)
-old_NEWS_hash = e0348da6b6192ed4c00e3acdf306fb22
+old_NEWS_hash = b7f5ee3470e07fef2c1a882767f9b99b
+update_copyright_env = \
+ UPDATE_COPYRIGHT_HOLDER='(Free Software Foundation, Inc.|Gary V. Vaughan|Reuben Thomas)' \
+ UPDATE_COPYRIGHT_USE_INTERVALS=1 \
+ UPDATE_COPYRIGHT_FORCE=1
+
 specl_SPECS = \
  $(srcdir)/specs/mkrockspecs_spec.yaml \
  $(NOTHING_ELSE)
@@ -469,6 +495,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 .travis.yml: $(top_builddir)/config.status $(srcdir)/travis.yml.in
  cd $(top_builddir) && $(SHELL) ./config.status $@
+build-aux/merge-sections: $(top_builddir)/config.status $(top_srcdir)/src/merge-sections.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
 build-aux/mkrockspecs: $(top_builddir)/config.status $(top_srcdir)/src/mkrockspecs.in
  cd $(top_builddir) && $(SHELL) ./config.status $@
 
@@ -775,9 +803,10 @@ distcheck: dist
  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
  && am__cwd=`pwd` \
  && $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
  $(AM_DISTCHECK_CONFIGURE_FLAGS) \
  $(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
  && $(MAKE) $(AM_MAKEFLAGS) \
  && $(MAKE) $(AM_MAKEFLAGS) dvi \
  && $(MAKE) $(AM_MAKEFLAGS) check \

NEWS

@@ -1,5 +1,24 @@
 Slingshot NEWS - User visible changes.
 
+* Noteworthy changes in release 6 (2014-01-04) [stable]
+
+** New Features:
+
+ - A manually entered list of modules in rockspec.conf now
+ creates "builtin" autoconfless builds in the main rockspec
+ just as if --module-dir had been passed.
+ - Support running `make check` on installed packages, where the
+ checks require access to resources not visible in the install
+ tree (e.g. installed specl has all lua sources inlined, rather
+ than in an installed subtree, but unit tests need access to the
+ module subtree which is only visible in the build directory).
+
+** Incompatible Changes:
+
+ - `bootstrap.slingshot` is now automatically merged into the
+ `bootstrap` script, so you shouldn't copy it into your project
+ tree anymore, or add the glue to run it to your `bootstrap.conf`.
+
 * Noteworthy changes in release 5 (2013-12-08) [stable]
 
 ** New Features: