From 480a25cc9a5684a75580af94cc95851eae4f6ade Mon Sep 17 00:00:00 2001 From: nobonobo Date: Wed, 27 Nov 2013 10:04:52 +0900 Subject: [PATCH 1/5] fix travis --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 575d6a1..7b6e68c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,8 @@ language: go go: - - 1.0 - 1.1 - - tip install: make all -script: - - go test ./ +script: go test ./ From 6e94c92a565abc67193b7d77107d44549f6ab861 Mon Sep 17 00:00:00 2001 From: nobonobo Date: Wed, 27 Nov 2013 10:10:34 +0900 Subject: [PATCH 2/5] dependency added --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b6e68c..e48f1df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ language: go go: - 1.1 -install: make all +install: + - go get github.com/r7kamura/gospel + - make all script: go test ./ From e1f8c54a80263a2f4f6e8867c7107cb2f08ff3ec Mon Sep 17 00:00:00 2001 From: nobonobo Date: Thu, 28 Nov 2013 21:08:19 +0900 Subject: [PATCH 3/5] make install add --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0ed71f3..6812cba 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # for GNU make all: libunqlite.a - go build + go install src/unqlite.c: git submodule init From fa5c12c96eac90f8d2c217ac73ce0f13a1cc9339 Mon Sep 17 00:00:00 2001 From: nobonobo Date: Thu, 28 Nov 2013 21:18:59 +0900 Subject: [PATCH 4/5] make test added --- .travis.yml | 6 ++++-- Makefile | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e48f1df..385c280 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,11 @@ language: go go: - 1.1 + - tip install: - go get github.com/r7kamura/gospel - - make all + - make install -script: go test ./ +script: + - make test diff --git a/Makefile b/Makefile index 6812cba..81685f3 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,21 @@ # for GNU make +.PHONY: all build test clean -all: libunqlite.a +all: build + +build: libunqlite.a + go build + +install: go install +clean: + rm -f libunqlite.a + rm -rf src/* + +test: + go test ./ + src/unqlite.c: git submodule init git submodule update From 984f134c021f779f8fae2689fabf2903aa80573c Mon Sep 17 00:00:00 2001 From: nobonobo Date: Thu, 28 Nov 2013 21:24:46 +0900 Subject: [PATCH 5/5] make test added --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 81685f3..3a23a18 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ # for GNU make -.PHONY: all build test clean +.PHONY: all build install test clean all: build build: libunqlite.a go build -install: +install: libunqlite.a go install clean: