aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYichun Zhang <agentzh@gmail.com>2016-04-11 19:00:46 -0700
committerYichun Zhang <agentzh@gmail.com>2016-04-11 19:00:46 -0700
commitb426217f1a8a2c7083c7bdb4b1180be1ab142112 (patch)
tree9ee632a1d7129d001b86bc4d1694f9c8a40120bd
parente1ebda146f63276093970f1bec36e51f952b3dba (diff)
parent7f0d3ca228e766d7c474a8dc16f23d7a5a636a77 (diff)
downloadlua-cjson-b426217f1a8a2c7083c7bdb4b1180be1ab142112.tar.gz
lua-cjson-b426217f1a8a2c7083c7bdb4b1180be1ab142112.tar.bz2
lua-cjson-b426217f1a8a2c7083c7bdb4b1180be1ab142112.zip
Merge pull request #7 from chipitsine/master
travis-ci integration
-rw-r--r--.travis.yml23
-rw-r--r--Makefile8
2 files changed, 27 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c0e6363
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,23 @@
1sudo: required
2dist: trusty
3
4os: linux
5
6language: c
7
8compiler:
9 - gcc
10 - clang
11
12env:
13 matrix:
14 - LUA=lua5.1-dev LUA_DEV=liblua5.1-dev LUA_INCLUDE_DIR=/usr/include/lua5.1 LUA_CMODULE_DIR=/lib LUALIB=-llua5.1
15 - LUA=libluajit-5.1-dev LUA_DEV=libluajit-5.1-dev LUA_INCLUDE_DIR=/usr/include/luajit-2.0 LUA_CMODULE_DIR=/lib LUALIB=-lluajit-5.1
16
17install:
18 - sudo apt-get update
19 - sudo apt-get install -y $LUA luarocks
20
21script:
22 - make
23 - sh runtests.sh
diff --git a/Makefile b/Makefile
index 538db9a..2361028 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,10 @@ PREFIX = /usr/local
18CFLAGS = -O3 -Wall -pedantic -DNDEBUG 18CFLAGS = -O3 -Wall -pedantic -DNDEBUG
19CJSON_CFLAGS = -fpic 19CJSON_CFLAGS = -fpic
20CJSON_LDFLAGS = -shared 20CJSON_LDFLAGS = -shared
21LUA_INCLUDE_DIR = $(PREFIX)/include 21LUA_INCLUDE_DIR ?= $(PREFIX)/include
22LUA_CMODULE_DIR = $(PREFIX)/lib/lua/$(LUA_VERSION) 22LUA_CMODULE_DIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION)
23LUA_MODULE_DIR = $(PREFIX)/share/lua/$(LUA_VERSION) 23LUA_MODULE_DIR ?= $(PREFIX)/share/lua/$(LUA_VERSION)
24LUA_BIN_DIR = $(PREFIX)/bin 24LUA_BIN_DIR ?= $(PREFIX)/bin
25 25
26##### Platform overrides ##### 26##### Platform overrides #####
27## 27##