diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-08-06 17:02:04 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-08-06 17:02:04 +0300 |
commit | 254fcaaf2677a6db1daffa066e5c74340923f2bb (patch) | |
tree | 2dfd7f69626020c3591b326be2671c95f26c5a9f | |
parent | 5933fc094cf22cb46bf1b7295b5074bbece99b05 (diff) | |
download | vmod-sql-254fcaaf2677a6db1daffa066e5c74340923f2bb.tar.gz vmod-sql-254fcaaf2677a6db1daffa066e5c74340923f2bb.tar.bz2 |
Switch to the new acvmod; remove the --with-varnish-source option; revamp the testsuite
-rw-r--r-- | Makefile.am | 13 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | git2chg.awk | 75 | ||||
-rw-r--r-- | src/Makefile.am | 10 | ||||
-rw-r--r-- | src/vmod-sql.c | 4 |
6 files changed, 9 insertions, 97 deletions
diff --git a/Makefile.am b/Makefile.am index 25d4db4..6704aa5 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -1,3 +1,3 @@ | |||
1 | # This file is part of vmod-sql | 1 | # This file is part of vmod-sql |
2 | # Copyright (C) 2013-2016 Sergey Poznyakoff | 2 | # Copyright (C) 2013-2017 Sergey Poznyakoff |
3 | # | 3 | # |
@@ -19,12 +19,3 @@ SUBDIRS = src doc #tests | |||
19 | 19 | ||
20 | AM_DISTCHECK_CONFIGURE_FLAGS=--without-vmoddir | 20 | include acvmod/top.am |
21 | |||
22 | EXTRA_DIST=git2chg.awk | ||
23 | |||
24 | .PHONY: ChangeLog | ||
25 | ChangeLog: | ||
26 | $(AM_V_GEN)if test -d .git; then \ | ||
27 | git log --pretty='format:%ct %an <%ae>%n%n%s%n%n%b%n' | \ | ||
28 | awk -f $(top_srcdir)/git2chg.awk > ChangeLog; \ | ||
29 | fi | ||
30 | 21 | ||
diff --git a/acvmod b/acvmod | |||
Subproject f064cf4d7aa1ead1f8607b8b72baf883f015ffc | Subproject ba32780019480b89cd9d796b93a76cae6afe99a | ||
diff --git a/configure.ac b/configure.ac index c7188cb..8e4529f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,3 +1,3 @@ | |||
1 | # This file is part of vmod-sql -*- autoconf -*- | 1 | # This file is part of vmod-sql -*- autoconf -*- |
2 | # Copyright (C) 2013-2016 Sergey Poznyakoff | 2 | # Copyright (C) 2013-2017 Sergey Poznyakoff |
3 | # | 3 | # |
@@ -16,3 +16,3 @@ | |||
16 | AC_PREREQ(2.69) | 16 | AC_PREREQ(2.69) |
17 | AC_INIT([vmod-sql], 1.0.90-4.1.0, [gray@gnu.org]) | 17 | AC_INIT([vmod-sql], 1.0.91, [gray@gnu.org]) |
18 | AC_CONFIG_AUX_DIR([build-aux]) | 18 | AC_CONFIG_AUX_DIR([build-aux]) |
diff --git a/git2chg.awk b/git2chg.awk deleted file mode 100644 index 6dad87e..0000000 --- a/git2chg.awk +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | # This file is part of grecs | ||
2 | # Copyright (C) 2007-2014 Sergey Poznyakoff | ||
3 | # | ||
4 | # Grecs is free software; you can redistribute it and/or modify | ||
5 | # it under the terms of the GNU General Public License as published by | ||
6 | # the Free Software Foundation; either version 3, or (at your option) | ||
7 | # any later version. | ||
8 | # | ||
9 | # Grecs is distributed in the hope that it will be useful, | ||
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | # GNU General Public License for more details. | ||
13 | # | ||
14 | # You should have received a copy of the GNU General Public License | ||
15 | # along with Grecs. If not, see <http://www.gnu.org/licenses/>. | ||
16 | |||
17 | BEGIN { | ||
18 | if (since) | ||
19 | split(since,since_a,"-") | ||
20 | } | ||
21 | |||
22 | function timeok(t, a) { | ||
23 | if (!since) | ||
24 | return 1 | ||
25 | split(t,a,"-") | ||
26 | if (a[1] < since_a[1]) | ||
27 | return 0 | ||
28 | if (a[1] > since_a[1]) | ||
29 | return 1 | ||
30 | if (a[2] < since_a[2]) | ||
31 | return 0 | ||
32 | if (a[2] > since_a[2]) | ||
33 | return 1 | ||
34 | return a[3] > since_a[3] | ||
35 | } | ||
36 | |||
37 | /^[0-9]+ .* +<[^>]+>/ { | ||
38 | s = strftime("%F", $1) | ||
39 | if (!timeok(s)) | ||
40 | exit | ||
41 | sub(/^[0-9]+ +/,"") | ||
42 | if (s == datestr && author == $0) | ||
43 | next | ||
44 | datestr = s | ||
45 | author = $0 | ||
46 | if (runlen) { runlen = 0; print "" } | ||
47 | printf("%s %s\n", datestr, author) | ||
48 | next | ||
49 | } | ||
50 | /^Signed-off-by:/ { next } | ||
51 | /^<unknown>$/ { next } | ||
52 | NF==0 { | ||
53 | runlen++ | ||
54 | next | ||
55 | } | ||
56 | { if (runlen) { runlen = 0; print "" } | ||
57 | print "\t" $0 } | ||
58 | |||
59 | END { | ||
60 | if (append) { | ||
61 | print "" | ||
62 | while ((getline < append) > 0) { | ||
63 | if (match($0, /^Local *Variables:/)) | ||
64 | break | ||
65 | |||
66 | } | ||
67 | } | ||
68 | print "\f" | ||
69 | # Make sure Emacs won't recognize this line: | ||
70 | print "Local", "Variables:" | ||
71 | print "mode: change-log" | ||
72 | print "version-control: never" | ||
73 | print "buffer-read-only: t" | ||
74 | print "End:" | ||
75 | } | ||
diff --git a/src/Makefile.am b/src/Makefile.am index 601e8f5..a171c55 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -1,3 +1,3 @@ | |||
1 | # This file is part of vmod-sql | 1 | # This file is part of vmod-sql |
2 | # Copyright (C) 2013-2016 Sergey Poznyakoff | 2 | # Copyright (C) 2013-2017 Sergey Poznyakoff |
3 | # | 3 | # |
@@ -16,6 +16,3 @@ | |||
16 | 16 | ||
17 | AM_CPPFLAGS = \ | 17 | AM_CPPFLAGS = $(VARNISHAPI_CFLAGS) |
18 | -I$(VARNISHSRC)/include\ | ||
19 | -I$(VARNISHSRC)/bin/varnishd\ | ||
20 | -I$(VARNISHSRC) | ||
21 | 18 | ||
@@ -47,3 +44,2 @@ CLEANFILES = vcc_if.c vcc_if.h *.rst | |||
47 | 44 | ||
48 | vmodtool = $(VARNISHSRC)/lib/libvcc/vmodtool.py | ||
49 | vmodtoolargs = --strict | 45 | vmodtoolargs = --strict |
@@ -52,3 +48,3 @@ vccfile = $(top_srcdir)/src/vmod.vcc | |||
52 | vcc_if.c vcc_if.h: $(vmodtool) $(vccfile) | 48 | vcc_if.c vcc_if.h: $(vmodtool) $(vccfile) |
53 | $(AM_V_GEN)$(PYTHON) $(vmodtool) $(vmodtoolargs) $(vccfile) | 49 | $(AM_V_GEN)$(PYTHON) $(VARNISHAPI_VMODTOOL) $(vmodtoolargs) $(vccfile) |
54 | 50 | ||
diff --git a/src/vmod-sql.c b/src/vmod-sql.c index 3dbfe4b..689b0f7 100644 --- a/src/vmod-sql.c +++ b/src/vmod-sql.c | |||
@@ -1,3 +1,3 @@ | |||
1 | /* This file is part of vmod-sql | 1 | /* This file is part of vmod-sql |
2 | Copyright (C) 2013-2014 Sergey Poznyakoff | 2 | Copyright (C) 2013-2017 Sergey Poznyakoff |
3 | 3 | ||
@@ -24,3 +24,3 @@ | |||
24 | 24 | ||
25 | #include "bin/varnishd/cache/cache.h" | 25 | #include "cache/cache.h" |
26 | #define WSPTR(s) ((s)->ws) | 26 | #define WSPTR(s) ((s)->ws) |