Skip to content

Commit

Permalink
maint: migrate build system from Autotools to Luke.
Browse files Browse the repository at this point in the history
* build-aux/luke, lukefile: New build system.
* .x-update-copyright, bootstrap, bootstrap.conf,
build-aux/sanity-cfg.mk, configure.ac, rockspec.conf,
slingshot, specs/specs.mk: Removed.
* .gitignore, .travis.yml, build-aux/config.ld.in,
lyaml-git-1.rockspec: Adjust accordingly.
* ext/yaml/emitter.c, ext/yaml/parser.c, ext/yaml/scanner.c,
ext/yaml/yaml.c: Remove dependency on config.h.
* AUTHOR, NEWS.md, README.md: Update.
* COPYING, lib/yaml.lua: Move from here...
* LICENSE, lib/yaml/init.lua: ...to here.

Signed-off-by: Gary V. Vaughan <[email protected]>
  • Loading branch information
gvvaughan committed Jan 22, 2017
1 parent b23f7bd commit ba078ae
Show file tree
Hide file tree
Showing 23 changed files with 1,775 additions and 6,368 deletions.
36 changes: 4 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,38 +1,10 @@
*~
*.html
*.la
*.lo
*.o
*.so
.DS_Store
.deps
.dirstamp
.libs
/.autom4te.cfg
/.gitmodules
*.html
*.src.rock
/ChangeLog
/INSTALL
/Makefile
/Makefile.in
/NEWS
/README
/aclocal.m4
/build-aux/*
!/build-aux/config.ld.in
!/build-aux/sanity-cfg.mk
/config.h
/config.h.in
/config.log
/config.lt
/config.status
/configure
/doc
/libtool
/lyaml-*.rockspec
!/lyaml-git-*.rockspec
/build-aux/config.ld
/lyaml-*.tar.gz
/stamp-h1
GNUmakefile
Makefile.am
m4/
travis.yml.in
/TAGS
48 changes: 4 additions & 44 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@ language: python

sudo: false

addons:
apt:
packages:
- help2man

env:
global:
- _inst=$TRAVIS_BUILD_DIR/_inst
- luadir=$_inst/share/lua
- luaexecdir=$_inst/lib/lua
matrix:
- VLUA="lua=5.3"
- VLUA="lua=5.2"
Expand All @@ -34,14 +27,6 @@ install:
luarocks install --server=http://rocks.moonscript.org/manifests/gvvaughan $rock;
done'

# Fudge timestamps on release branches.
- 'if test -f configure; then
test -f aclocal.m4 && touch aclocal.m4;
sleep 1; touch Makefile.in;
sleep 1; test -f config.h.in && touch config.h.in;
sleep 1; touch configure;
fi'

# 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.
Expand All @@ -53,35 +38,10 @@ install:


script:
# Reconfigure for in-tree test install.
- test -f configure || ./bootstrap --verbose
- 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

# Verify local build.
- make
- make check || make check V=1

# Verify configured installation.
- make install prefix="$_inst" luadir="$luadir" luaexecdir="$luaexecdir"
- LUA_PATH="$luadir/?.lua;$luadir/?/init.lua;;"
LUA_CPATH="$luaexecdir/?.so;;"
make installcheck V=1


# Run sanity checks on CI server, ignoring buggy automakes.
after_success:
- '{ _assign="=";
if grep local-checks-to-skip build-aux/sanity-cfg.mk >/dev/null; then
_assign="+=";
fi;
printf "local-checks-to-skip %s sc_vulnerable_makefile_CVE-2012-3386\n" "$_assign";
} >> build-aux/sanity-cfg.mk'
- 'make syntax-check || : this will usually fail on the release branch'
- build-aux/luke
LUA=`pwd`/here/bin/lua
LUA_INCDIR=`pwd`/here/include
PREFIX="$_inst" all install

notifications:
slack: aspirinc:JyWeNrIdS0J5nf2Pn2BS1cih
4 changes: 0 additions & 4 deletions .x-update-copyright

This file was deleted.

14 changes: 4 additions & 10 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
lyaml Contributors
==================
lyaml is the work of several authors (see git history for
contributors).

This file list contributors to lyaml. If you think you should be in
this list, please file an issue on github (run `./configure --help`
for the URL).
There is an earlier C LibYAML binding

* Andrew Danforth <[email protected]>:
Designed and implemented the C LibYAML binding.
* Gary V. Vaughan <[email protected]>:
Lua 5.2 and 5.3 compatibility, build system, luarock packaging,
lymal Lua code, release.
Copyright Andrew Danforth <[email protected]>
File renamed without changes.
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Noteworthy changes in release ?.? (????-??-??) [?]

### New Features

- Builds and installs with `luke` instead of Autotools.


## Noteworthy changes in release 6.1 (2016-10-08) [stable]

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ To install without [LuaRocks], clone the sources from the

```sh
cd lyaml
./bootstrap
./configure --prefix=INSTALLATION-ROOT-DIRECTORY
make all check install
build-aux/luke LYAML_DIR=LIBYAML-INSTALL-PREFIX
sudo build-aux/luke PREFIX=LYAML-INSTALL-PREFIX install
specl -v1freport specs/*_spec.yaml
```

The dependencies are listed in the dependencies entry of the file
[rockspec.conf][L10]. You will also need [Autoconf], [Automake]
[rockspec][L15]. You will also need [Autoconf], [Automake]
and [Libtool].

See [INSTALL] for instructions for `configure`.
Expand All @@ -193,7 +193,7 @@ See [INSTALL] for instructions for `configure`.
[lua]: http://www.lua.org
[luarocks]: http://www.luarocks.org
[lyaml]: http://github.com/gvvaughan/lyaml
[L10]: http://github.com/gvvaughan/lyaml/blob/master/rockspec.conf#L10
[L15]: http://github.com/gvvaughan/lyaml/blob/master/lyaml-git-1.rockspec#L15
[yaml.h]: http://pyyaml.org/browser/libyaml/branches/stable/include/yaml.h
[yaml]: http://yaml.org
[yaml11]: http://yaml.org/spec/1.1/
Loading

0 comments on commit ba078ae

Please sign in to comment.