Upgrading to GitLab 12.1.0.

Commit babf639a authored by Victor Seva's avatar Victor Seva

New upstream version 6.1

parent 89c639d8
language: c
language: python
env:
global:
- _COMPILE="libtool --mode=compile --tag=CC gcc"
- _CFLAGS="-O2 -Wall -DLUA_COMPAT_ALL -DLUA_COMPAT_5_2 -DLUA_USE_LINUX"
- _INSTALL="libtool --mode=install install -p"
- _LINK="libtool --mode=link --tag=CC gcc"
- _LIBS="-lm -Wl,-E -ldl -lreadline"
sudo: false
- prefix=/usr/local
- bindir=$prefix/bin
- incdir=$prefix/include
- libdir=$prefix/lib
addons:
apt:
packages:
- help2man
env:
global:
- _inst=$TRAVIS_BUILD_DIR/_inst
- luadir=$_inst/share/lua
- luaexecdir=$_inst/lib/lua
matrix:
- LUA=lua5.3
- LUA=lua5.2
- LUA=lua5.1
- LUA=luajit
- VLUA="lua=5.3"
- VLUA="lua=5.2"
- VLUA="lua=5.1"
- VLUA="luajit=2.1"
- VLUA="luajit=2.0"
before_install:
# Put back the links for libyaml, which are missing on recent Travis VMs
- test -f /usr/lib/libyaml.so ||
sudo find /usr/lib -name 'libyaml*' -exec ln -s {} /usr/lib \;
- sudo apt-get install help2man
# Fetch Lua sources.
- cd $TRAVIS_BUILD_DIR
- 'if test lua5.3 = "$LUA"; then
curl http://www.lua.org/ftp/lua-5.3.1.tar.gz | tar xz;
cd lua-5.3.1;
fi'
- 'if test lua5.2 = "$LUA"; then
curl http://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz;
cd lua-5.2.4;
fi'
- 'if test lua5.1 = "$LUA"; then
curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz;
cd lua-5.1.5;
fi'
# Unpack, compile and install Lua.
- 'if test luajit = "$LUA"; then
curl http://luajit.org/download/LuaJIT-2.0.3.tar.gz | tar xz;
cd LuaJIT-2.0.3;
make && sudo make install;
for header in lua.h luaconf.h lualib.h lauxlib.h luajit.h lua.hpp; do
if test -f /usr/local/include/luajit-2.0/$header; then
sudo ln -s /usr/local/include/luajit-2.0/$header /usr/local/include/$header;
fi;
done;
else
for src in src/*.c; do
test src/lua.c = "$src" || test src/luac.c = "$src" || eval $_COMPILE $_CFLAGS -c $src;
done;
eval $_LINK -o lib$LUA.la -version-info 0:0:0 -rpath $libdir *.lo;
sudo mkdir -p $libdir;
eval sudo $_INSTALL lib$LUA.la $libdir/lib$LUA.la;
eval $_COMPILE $_CFLAGS -c src/lua.c;
eval $_LINK -static -o $LUA lua.lo lib$LUA.la $_LIBS;
sudo mkdir -p $bindir;
eval sudo $_INSTALL $LUA $bindir/$LUA;
sudo mkdir -p $incdir;
for header in lua.h luaconf.h lualib.h lauxlib.h lua.hpp; do
if test -f src/$header; then
eval sudo $_INSTALL src/$header $incdir/$header;
fi;
done;
fi'
# Fetch LuaRocks.
- cd $TRAVIS_BUILD_DIR
- 'git clone https://github.com/keplerproject/luarocks.git luarocks-2.2.0'
- cd luarocks-2.2.0
- git checkout v2.2.0
# Compile and install luarocks.
- if test luajit = "$LUA"; then
./configure --lua-suffix=jit;
else
./configure;
fi
- 'make build && sudo make install'
# Tidy up file droppings.
- cd $TRAVIS_BUILD_DIR
- rm -rf lua-5.3.1 lua-5.2.4 lua-5.1.5 LuaJIT-2.0.3 luarocks-2.2.0
- pip install hererocks
- hererocks here -r^ --$VLUA
- export PATH=$PWD/here/bin:$PATH
install:
......@@ -99,7 +31,7 @@ install:
- 'for rock in ansicolors ldoc specl""; do
if test -z "$rock"; then break; fi;
if luarocks list | grep "^$rock$" >/dev/null; then continue; fi;
sudo luarocks install --server=http://rocks.moonscript.org/manifests/gvvaughan $rock;
luarocks install --server=http://rocks.moonscript.org/manifests/gvvaughan $rock;
done'
# Fudge timestamps on release branches.
......@@ -113,21 +45,19 @@ install:
# Build from rockspec, forcing uninstall of older luarocks installed
# above when testing the git rockspec, both for enforcing backwards
# compatibility by default, and for ease of maintenance.
- if test -f 'lyaml-6.0-1.rockspec'; then
sudo luarocks make 'lyaml-6.0-1.rockspec' LUA="$LUA";
- if test -f 'lyaml-6.1-1.rockspec'; then
luarocks make 'lyaml-6.1-1.rockspec';
else
sudo luarocks make --force 'lyaml-git-1.rockspec' LUA="$LUA";
luarocks make --force 'lyaml-git-1.rockspec';
fi
# Clean up files created by root
- sudo git clean -dfx
- sudo rm -rf slingshot /tmp/ldoc
script:
# Reconfigure for in-tree test install.
- test -f configure || ./bootstrap --verbose
- ./configure --prefix="$_inst" --disable-silent-rules LUA="$LUA"
- LUA=`pwd`/here/bin/lua
LUA_INCLUDE=-I`pwd`/here/include
./configure --prefix="$_inst" --disable-silent-rules
# Verify luarocks installation.
- make installcheck || make installcheck V=1
......
2015-07-27 Gary V. Vaughan <gary@gnu.org>
2016-10-08 Gary V. Vaughan <gary@gnu.org>
Release version 6.1
* NEWS.md: Record release date.
configury: bump release number to 6.1.
* configure.ac (AC_INIT): Bump release number to 6.1.
* .travis.yml: Regenerate.
implicit: parse an unquoted null token as lyaml.null
Fixes #13.
* specs/lib_lyaml_spec.yaml (scalars): Specify correct behaviour
with various spellings of 'null'.
(a map): Quote bare null tokens that should be parsed as strings.
* lib/lyaml/implicit.lua (null): Parse an unquoted null token as
lyaml.null.
* NEWS.md (Bug fixes): Update.
2016-10-07 Gary V. Vaughan <gary@gnu.org>
slingshot: sync with latest upstream.
* slingshot: Update submodule.
* .travis.yml: Regenerate.
* bootstrap: Regenerate.
configury: rearrange configure.ac macros for better error reporting
If libyaml.so is not in the path, the old order would fall over
during AX_PROG_LUA with an unhelpful failure message.
* configure.ac (AC_PATH_PROG, AX_PROG_LUA, AX_LUA_HEADERS): Move
invocations above LIBYAML checks.
2016-01-05 Gary V. Vaughan <gary@gnu.org>
maint: bump copyright years.
* bootstrap.conf, configure.ac, ext/yaml/emitter.c,
ext/yaml/lyaml.h, ext/yaml/parser.c, ext/yaml/scanner.c,
ext/yaml/yaml.c, lib/lyaml.lua, lib/lyaml/explicit.lua,
lib/lyaml/functional.lua, lib/lyaml/implicit.lua, local.mk,
slingshot, specs/specs.mk: Add 2016 to copyright years.
slingshot: update to latest revision for Travis GCE compatibility.
* slingshot: Pull latest upstream.
* .travis.yml: Regenerate.
2015-10-11 Gary V. Vaughan <gary@gnu.org>
configury: don't let libyaml search affect Lua headers test.
Closes #11.
* configure.ac (AC_SEARCH_LIBS): Save and restore $LIBS contents
around this search, so that -lyaml is not left prepended to
affect later checks.
(lyaml): Store -lyaml in LIBYAML.
* local.mk (ext_yaml_yaml_la_LIBADD): Add $(LIBYAML).
(ext_yaml_yaml_la_CPPFLAGS): Remove unset YAML_INCLUDE.
2015-07-26 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 6.0
* NEWS.md: Record release date.
......@@ -31,8 +91,6 @@
variables for intermediate values.
Adjust error messages expectations to match reality!
2015-07-26 Gary V. Vaughan <gary@gnu.org>
lyaml: ensure lyaml.dump has an equivalent signature to lyaml.load.
* lib/lyaml.lua (dump): Accept an option table of options.
(Dumper): Normalise options.
......@@ -194,7 +252,7 @@
https://github.com/gvvaughan/lyaml/issues/7
From Nick Muerdter
2015-07-13 Gary V. Vaughan <gary@gnu.org>
2015-07-12 Gary V. Vaughan <gary@gnu.org>
lyaml: support !!merge key type.
Fixes #8.
......@@ -214,8 +272,6 @@
(parser_mt.load_scalar): Parse !!int tag arguments fully.
* NEWS.md (Bug fixes): Update accordingly.
2015-07-12 Gary V. Vaughan <gary@gnu.org>
lyaml: load the whole range of !!float arguments fully.
* specs/lib_lyaml_spec.yaml (load): Specify more input types for
float tag value strings and how they should be loaded.
......@@ -374,12 +430,12 @@
slingshot: sync with upstream, for release fixes.
* slingshot: Sync with upstream.
2014-12-18 Gary V. Vaughan <gary@gnu.org>
slingshot: sync with upstream, for rebootstrap subproject fix.
* slingshot: Sync with upstream.
* bootstrap: Update from slingshot.
2014-12-18 Gary V. Vaughan <gary@gnu.org>
slingshot: sync with upstream, for luaexec_LTLIBRARIES support.
Close #5.
* slingshot: Sync with upstream.
......@@ -409,6 +465,8 @@
configury: remove references to lua52compat.h.
* local.mk (EXTRA_DIST): Remove ext/yaml/luacompat.h.
2014-12-16 Gary V. Vaughan <gary@gnu.org>
slingshot: sync with upstream, for release fixes.
* slingshot: Sync with upstream.
......@@ -444,12 +502,10 @@
(luaL_register): Lua 5.2 and 5.3 compatibility definitions.
* .travis.yml: Regenerate.
2014-12-16 Gary V. Vaughan <gary@gnu.org>
configury: adopt semantic versioning.
* configure.ac (AC_INIT): Bump version to 6.0.0.
2014-09-26 Gary V. Vaughan <gary@gnu.org>
2014-09-25 Gary V. Vaughan <gary@gnu.org>
maint: post-release administrivia.
* configure.ac (AC_INIT): Bump release version to 6.
......@@ -457,8 +513,6 @@
* .prev-version: Record previous version.
* ./local.mk (old_NEWS_hash): Auto-update.
2014-09-25 Gary V. Vaughan <gary@gnu.org>
Release version 5
* NEWS: Record release date.
......@@ -577,7 +631,7 @@
add waffle.io badge
2014-05-21 Gary V. Vaughan <gary@gnu.org>
2014-05-20 Gary V. Vaughan <gary@gnu.org>
maint: fix a README typo.
* README.md: Remove a spurious word.
......@@ -591,15 +645,13 @@
else `GIT=true ./bootstrap` doesn't work.
* .travis.yml: Regenerate.
2014-01-05 Gary V. Vaughan <gary@gnu.org>
2014-01-04 Gary V. Vaughan <gary@gnu.org>
slingshot: sync with upstream.
Fix the annoying contest.sed file dropping bug.
* slingshot: Sync with upstream.
* bootstrap: Sync with slingshot.
2014-01-04 Gary V. Vaughan <gary@gnu.org>
maint: update copyright notices to include 2014.
* .x-upate-copyright: New file. Exclude files not owned by this
project from update-copyright rules.
......@@ -620,7 +672,7 @@
copying over a standard GPLv3 COPYING boilerplate.
* .travis.yml: Regenerate.
2013-11-15 Gary V. Vaughan <gary@gnu.org>
2013-11-14 Gary V. Vaughan <gary@gnu.org>
maint: prevent pointer type mismatch warnings.
* ext/yaml/lyaml.h (lua_pushyamlstr): Cast away the impedence
......@@ -632,7 +684,7 @@
* ext/yaml/scanner.c (Pscanner): Likewise.
* NEWS: Update.
2013-09-11 Gary V. Vaughan <gary@gnu.org>
2013-09-10 Gary V. Vaughan <gary@gnu.org>
maint: post-release administrivia.
* configure.ac (AC_INIT): Bump revision to 5.
......@@ -643,14 +695,12 @@
Release version 4
* NEWS: Record release date.
2013-08-30 Gary V. Vaughan <gary@gnu.org>
2013-08-29 Gary V. Vaughan <gary@gnu.org>
docs: update README.
* README.md: Remove documentation for removed lyaml.configure
call, and add documentation for new yaml.emitter call.
2013-08-29 Gary V. Vaughan <gary@gnu.org>
specs: remove trailing blanks.
* specs/ext_yaml_emitter_spec.yaml: Remove trailing blanks.
......@@ -734,6 +784,8 @@
* slingshot: Pick up recent improvements, particularly compatibility
with upcoming lyaml 4 release.
2013-07-27 Gary V. Vaughan <gary@gnu.org>
scanner: bind YAML tokenizer.
* specs/ext_lyaml_scanner_spec.yaml: New file. Specify behaviour
of tokenizing scanner.
......@@ -745,8 +797,6 @@
* README.md: Add instructions for using lyaml.scanner().
* NEWS: Update.
2013-07-27 Gary V. Vaughan <gary@gnu.org>
parser: factor out function dispatch for simple events.
* ext/lyaml/parser.c (parse_STREAM_END, parse_SEQUENCE_END)
(parse_MAPPING_END): Delete.
......@@ -792,7 +842,7 @@
...from here.
Adjust all callers.
2013-07-26 Gary V. Vaughan <gary@gnu.org>
2013-07-25 Gary V. Vaughan <gary@gnu.org>
docs: add missing link, and missing space.
* README.md: Add missing [libtool][] destination and insert a
......@@ -802,8 +852,6 @@
* README.md: Rewrite to provide a tiny bit more insight into how
to install and use lyaml.
2013-07-25 Gary V. Vaughan <gary@gnu.org>
specs: quote 5.2 illegal escapes carefully.
* specs/parser_spec.yaml: Use [[]] quoting to prevent Lua 5.2
from trying to resolve \ as an escape sequence.
......@@ -831,7 +879,7 @@
* local.mk (EXTRA_DIST): Add parser.c.
* NEWS: Update.
2013-07-15 Gary V. Vaughan <gary@gnu.org>
2013-07-14 Gary V. Vaughan <gary@gnu.org>
slingshot: sync with upstream.
Use upstream slingshot, which prevents us requesting installation
......@@ -893,6 +941,8 @@
and rockspec_conf.
(smc_rockspec): git rockspec is always revision 1!
2013-04-26 Gary V. Vaughan <gary@gnu.org>
maint: support external_dependencies with mkrockspecs.
* build-aux/mkrockspecs: Support ordering of external_dependencies.
Add quote marks around various paths in case of whitespace after
......@@ -902,8 +952,6 @@
* rockspec.conf (external_dependencies): Required for a correct
build.
2013-04-26 Gary V. Vaughan <gary@gnu.org>
Revert "maint: post-release administrivia."
This reverts commit 9fcdd06a1f88d6db0ab344b0de4dda314ff8eb8c.
......@@ -957,6 +1005,8 @@
interpreter in the build matrix.
(script): Pass LUA_INCDIR to make luarocks-config.lua rule.
2013-04-05 Gary V. Vaughan <gary@gnu.org>
maint: move Travis CI local luarocks build into install key.
* .travis.yml (script): Move local luarocks build from here...
(install): ...to here.
......@@ -1032,7 +1082,7 @@
maint: use travis CI server.
* .travis.yml: New file. Travis CI directives.
2013-03-18 Gary V. Vaughan <gary@gnu.org>
2013-03-17 Gary V. Vaughan <gary@gnu.org>
docs: insert missing link.
* README.md (Lua): Add missing URL.
......@@ -1047,8 +1097,6 @@
* GNUmakefile, Makefile.am, bootstrap.conf, configure.ac:
Relicense files authored by me under MIT.
2013-03-17 Gary V. Vaughan <gary@gnu.org>
maint: bump release number to 2.
* configure.ac (AC_INIT): Bump release number to 2.
......
# Maintainer rules.
#
# Copyright (C) 2013-2015 Gary V. Vaughan
# Copyright (C) 2013-2016 Gary V. Vaughan
# Written by Gary V. Vaughan, 2013
#
# This program is free software; you can redistribute it and/or modify it
......
# Non-recursive Make rules.
#
# Copyright (C) 2013-2015 Gary V. Vaughan
# Copyright (C) 2013-2016 Gary V. Vaughan
# Written by Gary V. Vaughan, 2013
#
# This program is free software; you can redistribute it and/or modify it
......
......@@ -16,7 +16,7 @@
# Non-recursive Make rules.
#
# Copyright (C) 2013-2015 Gary V. Vaughan
# Copyright (C) 2013-2016 Gary V. Vaughan
# Written by Gary V. Vaughan, 2013
#
# This program is free software; you can redistribute it and/or modify it
......@@ -34,7 +34,7 @@
# Non-recursive Make rules.
#
# Copyright (C) 2013-2015 Gary V. Vaughan
# Copyright (C) 2013-2016 Gary V. Vaughan
# Written by Gary V. Vaughan, 2013
#
# Permission is hereby granted, free of charge, to any person obtaining
......@@ -58,7 +58,7 @@
# Lyaml Specl make rules.
#
# Copyright (c) 2013-2015 Gary V. Vaughan
# Copyright (C) 2013-2016 Gary V. Vaughan
# Written by Gary V. Vaughan, 2013
#
# This program is free software; you can redistribute it and/or modify it
......@@ -80,7 +80,7 @@
# terms of the MIT license reproduced below.
# ==================================================================== #
# Copyright (C) 2013-2015 Gary V. Vaughan #
# Copyright (C) 2013-2016 Gary V. Vaughan #
# #
# Permission is hereby granted, free of charge, to any person #
# obtaining a copy of this software and associated documentation #
......@@ -111,7 +111,7 @@
# terms of the MIT license reproduced below.
# ==================================================================== #
# Copyright (C) 2013-2015 Reuben Thomas and Gary V. Vaughan #
# Copyright (C) 2013-2016 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 #
......@@ -265,7 +265,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(luaexecdir)" \
"$(DESTDIR)$(lualyamldir)" "$(DESTDIR)$(modulesdir)" \
"$(DESTDIR)$(docdir)"
LTLIBRARIES = $(lib_LTLIBRARIES) $(luaexec_LTLIBRARIES)
ext_yaml_yaml_la_LIBADD =
am__DEPENDENCIES_1 =
ext_yaml_yaml_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__dirstamp = $(am__leading_dot)dirstamp
am__objects_1 =
am_ext_yaml_yaml_la_OBJECTS = ext/yaml/ext_yaml_yaml_la-yaml.lo \
......@@ -417,6 +418,7 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBYAML = @LIBYAML@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
......@@ -576,7 +578,8 @@ ext_yaml_yaml_la_SOURCES = \
$(NOTHING_ELSE)
ext_yaml_yaml_la_LDFLAGS = -module -avoid-version
ext_yaml_yaml_la_CPPFLAGS = $(LUA_INCLUDE) $(YAML_INCLUDE)
ext_yaml_yaml_la_CPPFLAGS = $(LUA_INCLUDE)
ext_yaml_yaml_la_LIBADD = $(LIBYAML)
lualyamldir = $(luadir)/lyaml
dist_lualyaml_DATA = \
lib/lyaml/explicit.lua \
......
# lyaml NEWS - User visible changes
## Noteworthy changes in release 6.1 (2016-10-08) [stable]
### Bug fixes
- `lyaml.load` now correctly reads implicit null scalars in a YAML
document as an `lyaml.null` reference, identical to the "~"
shorthand syntax, according to [the specification][nullspec].
```yaml
empty:
canonical: ~
english: null
~: null key
```
## Noteworthy changes in release 6.0 (2015-07-27) [stable]
### New Features
......
This diff is collapsed.
# bootstrap.conf (lyaml) version 2014-01-04
# Written by Gary V. Vaughan, 2013
#
# Copyright (C) 2013-2015 Gary V. Vaughan
# Copyright (C) 2013-2016 Gary V. Vaughan
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
......
......@@ -6,7 +6,7 @@ SH=--[[ # -*- mode: lua; -*-
## terms of the MIT license reproduced below.
## ====================================================================
## Copyright (C) 2013-2015 Gary V. Vaughan
## Copyright (C) 2013-2016 Gary V. Vaughan
##
## Permission is hereby granted, free of charge, to any person
## obtaining a copy of this software and associated documentation
......@@ -158,7 +158,7 @@ Report bugs to http://github.com/gvvaughan/slingshot/issues.]])
end
prog["--version"] = function ()
print [[mkrockspecs (slingshot) 8.0.0
print [[mkrockspecs (slingshot) 8.0.1
Written by Gary V. Vaughan <gary@gnu.org>, 2013
Copyright (C) 2013, Gary V. Vaughan
......
# Slingshot release rules for GNU Make.
# ======================================================================
# Copyright (C) 2001-2015 Free Software Foundation, Inc.
# Copyright (C) 2001-2016 Free Software Foundation, Inc.
# Originally by Jim Meyering, Simon Josefsson, Eric Blake,
# Akim Demaille, Gary V. Vaughan, and others.
# This version by Gary V. Vaughan, 2013.
......@@ -365,7 +365,7 @@ check-in-release-branch:
$(AM_V_at)remove_re=$(grep-clean-files); \
$(GIT) rm -f `$(GIT) ls-files |$(EGREP) -v "$$remove_re"`
$(AM_V_at)ln -s . '$(my_distdir)'
$(AM_V_at)$(TAR) zxf '$(release-tarball)'
$(AM_V_at)$(TAR) zxhf '$(release-tarball)'
$(AM_V_at)rm -f '$(my_distdir)' '$(release-tarball)'
$(AM_V_at)$(GIT) add .
$(AM_V_at)$(GIT) commit -s -a -m 'Release v$(VERSION).'
......
......@@ -4,7 +4,7 @@
# terms of the MIT license reproduced below.
# ==================================================================== #
# Copyright (C) 2013-2015 Reuben Thomas and Gary V. Vaughan #
# Copyright (C) 2013-2016 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 #
......
......@@ -4,7 +4,7 @@
# terms of the MIT license reproduced below.
# ==================================================================== #
# Copyright (C) 2013-2015 Gary V. Vaughan #
# Copyright (C) 2013-2016 Gary V. Vaughan #
# #
# Permission is hereby granted, free of charge, to any person #
# obtaining a copy of this software and associated documentation #
......
This diff is collapsed.
## configure.ac
## Written by Gary V. Vaughan, 2013
##
## Copyright (C) 2013-2015 Gary V. Vaughan
## Copyright (C) 2013-2016 Gary V. Vaughan
##
## Permission is hereby granted, free of charge, to any person obtaining
## a copy of this software and associated documentation files (the
......@@ -26,7 +26,7 @@
AC_PREREQ([2.68])
## Initialise autoconf and automake
AC_INIT([lyaml], [6.0], [http://github.com/gvvaughan/lyaml/issues])
AC_INIT([lyaml], [6.1], [http://github.com/gvvaughan/lyaml/issues])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
......@@ -50,23 +50,22 @@ AC_SUBST(LIBTOOL_DEPS)
## Check for programs
AC_PROG_CC
AC_PATH_PROG([SPECL], [specl], [:])
AC_PATH_PROG([LDOC], [ldoc], [false])
AM_CONDITIONAL([HAVE_LDOC], [test false != "$LDOC"])
AX_PROG_LUA(5.1, 5.4)
## Check for header files
AC_HEADER_STDC
AX_LUA_HEADERS
AC_CHECK_HEADERS([yaml.h])
## Search libs
save_LIBS=$LIBS LIBS=
AC_SEARCH_LIBS([yaml_document_initialize], [yaml], [], [
AC_MSG_ERROR([Required library 'yaml' could not be found])])
## Lua
AC_PATH_PROG([SPECL], [specl], [:])
AX_PROG_LUA(5.1, 5.4)
AX_LUA_HEADERS
## LDoc
AC_PATH_PROG([LDOC], [ldoc], [false])
AM_CONDITIONAL([HAVE_LDOC], [test false != "$LDOC"])
AC_SUBST([LIBYAML], [$LIBS])
LIBS=$save_LIBS
## Generate output files
AC_CONFIG_HEADERS([config.h])
......
......@@ -3,7 +3,7 @@
<html>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<head>
<title>lyaml 6.0 Reference</title>
<title>lyaml 6.1 Reference</title>
<link rel="stylesheet" href="ldoc.css" type="text/css" />
</head>
<body>
......@@ -24,13 +24,13 @@
<div id="navigation">
<br/>
<h1>lyaml 6.0</h1>
<h1>lyaml 6.1</h1>
<h2>Modules</h2>
<ul class="$(kind=='Topics' and '' or 'nowrap'">
<ul class="nowrap">
<li><a href="modules/lyaml.html">lyaml</a></li>
<li><a href="modules/lyaml.explicit.html">lyaml.explicit</a></li>
<li><a href="modules/lyaml.functional.html">lyaml.functional</a></li>
......@@ -89,8 +89,8 @@ MIT license (the same license as Lua itself). There is no warranty.</p>
</div> <!-- id="content" -->
</div> <!-- id="main" -->
<div id="about">
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.3</a></i>
<i style="float:right;">Last updated 2015-07-27 01:35:37 </i>
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.5</a></i>
<i style="float:right;">Last updated 2016-10-08 11:19:36 </i>
</div> <!-- id="about" -->
</div> <!-- id="container" -->
</body>
......
......@@ -28,7 +28,6 @@ del,ins {
text-decoration: none;
}
li {
list-style: disc;
margin-left: 20px;
}
caption,th {
......@@ -88,7 +87,7 @@ em { font-style: italic;}
h1 {
font-size: 1.5em;
margin: 0 0 20px 0;
margin: 20px 0 20px 0;
}
h2, h3, h4 { margin: 15px 0 10px 0; }
h2 { font-size: 1.25em; }
......
......@@ -3,7 +3,7 @@
<html>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<head>
<title>lyaml 6.0 Reference</title>
<title>lyaml 6.1 Reference</title>
<link rel="stylesheet" href="../ldoc.css" type="text/css" />
</head>
<body>
......@@ -24,7 +24,7 @@
<div id="navigation">
<br/>
<h1>lyaml 6.0</h1>
<h1>lyaml 6.1</h1>
<ul>
<li><a href="../index.html">Index</a></li>
......@@ -37,7 +37,7 @@
<h2>Modules</h2>
<ul class="$(kind=='Topics' and '' or 'nowrap'">
<ul class="nowrap">
<li><a href="../modules/lyaml.html">lyaml</a></li>
<li><strong>lyaml.explicit</strong></li>
<li><a href="../modules/lyaml.functional.html">lyaml.functional</a></li>
......@@ -233,7 +233,7 @@
<h3>Parameters:</h3>
<ul>
<li><span class="parameter">value</span>
<span class="types"><a class="type" href="http://www.lua.org/manual/5.2/manual.html#6.4">string</a></span>
<span class="types"><a class="type" href="https://www.lua.org/manual/5.2/manual.html#6.4">string</a></span>
token
</li>
</ul>
......@@ -241,7 +241,7 @@
<h3>Returns:</h3>
<ol>
<span class="types"><a class="type" href="http://www.lua.org/manual/5.2/manual.html#6.4">string</a></span>
<span class="types"><a class="type" href="https://www.lua.org/manual/5.2/manual.html#6.4">string</a></span>
<em>value</em> which was a string already
</ol>
......@@ -259,8 +259,8 @@
</div> <!-- id="content" -->
</div> <!-- id="main" -->
<div id="about">
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.3</a></i>
<i style="float:right;">Last updated 2015-07-27 01:35:37 </i>
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.5</a></i>
<i style="float:right;">Last updated 2016-10-08 11:19:36 </i>
</div> <!-- id="about" -->
</div> <!-- id="container" -->
</body>
......
......@@ -3,7 +3,7 @@
<html>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<head>
<title>lyaml 6.0 Reference</title>
<title>lyaml 6.1 Reference</title>
<link rel="stylesheet" href="../ldoc.css" type="text/css" />
</head>
<body>
......@@ -24,7 +24,7 @@
<div id="navigation">
<br/>
<h1>lyaml 6.0</h1>
<h1>lyaml 6.1</h1>
<ul>
<li><a href="../index.html">Index</a></li>
......@@ -38,7 +38,7 @@
<h2>Modules</h2>
<ul class="$(kind=='Topics' and '' or 'nowrap'">
<ul class="nowrap">
<li><a href="../modules/lyaml.html">lyaml</a></li>