[master] f6b82e3 Use a skeleton script for flint.sh throughout.
Poul-Henning Kamp
phk at FreeBSD.org
Mon Apr 24 22:16:05 CEST 2017
commit f6b82e38d61cd2995bc63e9c6817a25c54e643a5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Apr 24 20:14:33 2017 +0000
Use a skeleton script for flint.sh throughout.
diff --git a/bin/varnishadm/flint.lnt b/bin/varnishadm/flint.lnt
new file mode 100644
index 0000000..e69de29
diff --git a/bin/varnishadm/flint.sh b/bin/varnishadm/flint.sh
new file mode 100755
index 0000000..5994de7
--- /dev/null
+++ b/bin/varnishadm/flint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+FLOPS='
+ *.c
+ ../../lib/libvarnishapi/*.c
+'
+
+. ../../tools/flint_skel.sh
diff --git a/bin/varnishd/flint.sh b/bin/varnishd/flint.sh
index 50d1c4b..5606dfb 100755
--- a/bin/varnishd/flint.sh
+++ b/bin/varnishd/flint.sh
@@ -1,45 +1,25 @@
#!/bin/sh
-if [ "x$1" = "x-ok" -a -f _.fl ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
- exit 0
-fi
+FLOPS='
+ -I../../lib/libvgz
+ -DVARNISHD_IS_NOT_A_VMOD
+ -DVARNISH_STATE_DIR=\"foo\"
+ -DVARNISH_VMOD_DIR=\"foo\"
+ -DVARNISH_VCL_DIR=\"foo\"
+ cache/*.c
+ common/*.c
+ hash/*.c
+ http1/*.c
+ http2/*.c
+ mgt/*.c
+ proxy/*.c
+ storage/*.c
+ waiter/*.c
+ ../../lib/libvarnish/*.c
+ ../../lib/libvcc/*.c
+ ../../lib/libvmod_std/*.c
+ ../../lib/libvmod_debug/*.c
+ ../../lib/libvmod_directors/*.c
+'
-flexelint \
- ../../flint.lnt \
- ../flint.lnt \
- flint.lnt \
- -I. \
- -I../../include \
- -I../../lib/libvgz \
- -I../.. \
- -I/usr/local/include \
- -DVARNISHD_IS_NOT_A_VMOD \
- -DVARNISH_STATE_DIR=\"foo\" \
- -DVARNISH_VMOD_DIR=\"foo\" \
- -DVARNISH_VCL_DIR=\"foo\" \
- cache/*.c \
- common/*.c \
- hash/*.c \
- http1/*.c \
- http2/*.c \
- mgt/*.c \
- proxy/*.c \
- storage/*.c \
- waiter/*.c \
- ../../lib/libvarnish/*.c \
- ../../lib/libvcc/*.c \
- ../../lib/libvmod_std/*.c \
- ../../lib/libvmod_debug/*.c \
- ../../lib/libvmod_directors/*.c \
- 2>&1 | tee _.fl
-
-if [ -f _.fl.old ] ; then
- diff -u _.fl.old _.fl
-fi
-
-if [ "x$1" = "x-ok" ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
-fi
+. ../../tools/flint_skel.sh
diff --git a/bin/varnishhist/flint.lnt b/bin/varnishhist/flint.lnt
new file mode 100644
index 0000000..e69de29
diff --git a/bin/varnishhist/flint.sh b/bin/varnishhist/flint.sh
new file mode 100755
index 0000000..5994de7
--- /dev/null
+++ b/bin/varnishhist/flint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+FLOPS='
+ *.c
+ ../../lib/libvarnishapi/*.c
+'
+
+. ../../tools/flint_skel.sh
diff --git a/bin/varnishlog/flint.sh b/bin/varnishlog/flint.sh
index 26e0fa3..6f94f89 100755
--- a/bin/varnishlog/flint.sh
+++ b/bin/varnishlog/flint.sh
@@ -1,29 +1,10 @@
#!/bin/sh
-if [ "x$1" = "x-ok" -a -f _.fl ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
- exit 0
-fi
+FLOPS='
+ -DVARNISH_STATE_DIR=\"foo\"
+ *.c
+ ../../lib/libvarnishapi/*.c
+'
-flexelint \
- ../../flint.lnt \
- ../flint.lnt \
- flint.lnt \
- -I. \
- -I../../include \
- -I../.. \
- -I/usr/local/include \
- -DVARNISH_STATE_DIR=\"foo\" \
- *.c \
- ../../lib/libvarnishapi/*.c \
- 2>&1 | tee _.fl
+. ../../tools/flint_skel.sh
-if [ -f _.fl.old ] ; then
- diff -u _.fl.old _.fl
-fi
-
-if [ "x$1" = "x-ok" ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
-fi
diff --git a/bin/varnishncsa/flint.sh b/bin/varnishncsa/flint.sh
index dda2d3a..5994de7 100755
--- a/bin/varnishncsa/flint.sh
+++ b/bin/varnishncsa/flint.sh
@@ -1,26 +1,8 @@
#!/bin/sh
-if [ "x$1" = "x-ok" -a -f _.fl ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
- exit 0
-fi
+FLOPS='
+ *.c
+ ../../lib/libvarnishapi/*.c
+'
-flexelint \
- ../../flint.lnt \
- ../flint.lnt \
- flint.lnt \
- -I. \
- -I../../include \
- -I../.. \
- *.c \
- 2>&1 | tee _.fl
-
-if [ -f _.fl.old ] ; then
- diff -u _.fl.old _.fl
-fi
-
-if [ "x$1" = "x-ok" ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
-fi
+. ../../tools/flint_skel.sh
diff --git a/bin/varnishstat/flint.sh b/bin/varnishstat/flint.sh
index a94710d..5994de7 100755
--- a/bin/varnishstat/flint.sh
+++ b/bin/varnishstat/flint.sh
@@ -1,11 +1,8 @@
#!/bin/sh
-flexelint \
- -I/usr/include \
- -I. \
- -I../../include \
- -I../.. \
- ../flint.lnt \
- flint.lnt \
- *.c \
+FLOPS='
+ *.c
../../lib/libvarnishapi/*.c
+'
+
+. ../../tools/flint_skel.sh
diff --git a/bin/varnishtest/flint.sh b/bin/varnishtest/flint.sh
index 7f9c759..49f5e2d 100755
--- a/bin/varnishtest/flint.sh
+++ b/bin/varnishtest/flint.sh
@@ -1,29 +1,10 @@
#!/bin/sh
-if [ "x$1" = "x-ok" -a -f _.fl ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
- exit 0
-fi
+FLOPS='
+ -DTOP_BUILDDIR="foo"
+ -I../../lib/libvgz
+ *.c
+'
-flexelint \
- -DTOP_BUILDDIR='"foo"' \
- -I/usr/include \
- -I. \
- -I../../include \
- -I../../lib/libvgz \
- -I../.. \
- ../../flint.lnt \
- ../flint.lnt \
- flint.lnt \
- *.c \
- 2>&1 | tee _.fl
+. ../../tools/flint_skel.sh
-if [ -f _.fl.old ] ; then
- diff -u _.fl.old _.fl
-fi
-
-if [ "x$1" = "x-ok" ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
-fi
diff --git a/bin/varnishtop/flint.sh b/bin/varnishtop/flint.sh
index a94710d..5994de7 100755
--- a/bin/varnishtop/flint.sh
+++ b/bin/varnishtop/flint.sh
@@ -1,11 +1,8 @@
#!/bin/sh
-flexelint \
- -I/usr/include \
- -I. \
- -I../../include \
- -I../.. \
- ../flint.lnt \
- flint.lnt \
- *.c \
+FLOPS='
+ *.c
../../lib/libvarnishapi/*.c
+'
+
+. ../../tools/flint_skel.sh
diff --git a/lib/libvarnish/flint.sh b/lib/libvarnish/flint.sh
index 7696210..0964d4c 100755
--- a/lib/libvarnish/flint.sh
+++ b/lib/libvarnish/flint.sh
@@ -1,27 +1,7 @@
#!/bin/sh
-if [ "x$1" = "x-ok" -a -f _.fl ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
- exit 0
-fi
-
-flexelint \
- ../../flint.lnt \
- flint.lnt \
- -I. \
- -I../../include \
- -I../.. \
- -I/usr/local/include \
- *.c \
- 2>&1 | tee _.fl
-
-if [ -f _.fl.old ] ; then
- diff -u _.fl.old _.fl
-fi
-
-if [ "x$1" = "x-ok" ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
-fi
+FLOPS='
+ *.c
+'
+. ../../tools/flint_skel.sh
diff --git a/lib/libvarnishapi/flint.sh b/lib/libvarnishapi/flint.sh
index e324e1f..0964d4c 100755
--- a/lib/libvarnishapi/flint.sh
+++ b/lib/libvarnishapi/flint.sh
@@ -1,28 +1,7 @@
#!/bin/sh
-if [ "x$1" = "x-ok" -a -f _.fl ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
- exit 0
-fi
-
-flexelint \
- ../../flint.lnt \
- ../flint.lnt \
- flint.lnt \
- -I. \
- -I../../include \
- -I../.. \
- -I/usr/local/include \
- *.c \
- 2>&1 | tee _.fl
-
-if [ -f _.fl.old ] ; then
- diff -u _.fl.old _.fl
-fi
-
-if [ "x$1" = "x-ok" ] ; then
- echo "Saved as reference"
- mv _.fl _.fl.old
-fi
+FLOPS='
+ *.c
+'
+. ../../tools/flint_skel.sh
diff --git a/lib/libvcc/flint.sh b/lib/libvcc/flint.sh
index 3bb465a..0964d4c 100755
--- a/lib/libvcc/flint.sh
+++ b/lib/libvcc/flint.sh
@@ -1,10 +1,7 @@
#!/bin/sh
-flexelint \
- -I/usr/include \
- -I. \
- -I../.. \
- -I../../include \
- -I../../contrib/libevent \
- flint.lnt \
+FLOPS='
*.c
+'
+
+. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_debug/flint.lnt b/lib/libvmod_debug/flint.lnt
new file mode 100644
index 0000000..e69de29
diff --git a/lib/libvmod_debug/flint.sh b/lib/libvmod_debug/flint.sh
index b4bc3e7..522e30d 100755
--- a/lib/libvmod_debug/flint.sh
+++ b/lib/libvmod_debug/flint.sh
@@ -1,10 +1,8 @@
#!/bin/sh
-flexelint \
- -u \
- ../../flint.lnt \
- -I. \
- -I../.. \
- -I../../include \
- -I../../bin/varnishd \
+FLOPS='
+ -I../../bin/varnishd
*.c
+'
+
+. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_directors/flint.lnt b/lib/libvmod_directors/flint.lnt
new file mode 100644
index 0000000..e69de29
diff --git a/lib/libvmod_directors/flint.sh b/lib/libvmod_directors/flint.sh
new file mode 100755
index 0000000..522e30d
--- /dev/null
+++ b/lib/libvmod_directors/flint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+FLOPS='
+ -I../../bin/varnishd
+ *.c
+'
+
+. ../../tools/flint_skel.sh
diff --git a/lib/libvmod_std/flint.lnt b/lib/libvmod_std/flint.lnt
new file mode 100644
index 0000000..e69de29
diff --git a/lib/libvmod_std/flint.sh b/lib/libvmod_std/flint.sh
index b4bc3e7..522e30d 100755
--- a/lib/libvmod_std/flint.sh
+++ b/lib/libvmod_std/flint.sh
@@ -1,10 +1,8 @@
#!/bin/sh
-flexelint \
- -u \
- ../../flint.lnt \
- -I. \
- -I../.. \
- -I../../include \
- -I../../bin/varnishd \
+FLOPS='
+ -I../../bin/varnishd
*.c
+'
+
+. ../../tools/flint_skel.sh
diff --git a/tools/flint_skel.sh b/tools/flint_skel.sh
new file mode 100644
index 0000000..557c7aa
--- /dev/null
+++ b/tools/flint_skel.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+if [ "x$1" = "x-ok" -a -f _.fl ] ; then
+ echo "Saved as reference"
+ mv _.fl _.fl.old
+ exit 0
+fi
+
+flexelint \
+ ../../flint.lnt \
+ ../flint.lnt \
+ flint.lnt \
+ -zero \
+ -I. \
+ -I../../include \
+ -I../.. \
+ -I/usr/local/include \
+ $FLOPS \
+ 2>&1 | tee _.fl
+
+if [ -f _.fl.old ] ; then
+ diff -u _.fl.old _.fl
+fi
+
+if [ "x$1" = "x-ok" ] ; then
+ echo "Saved as reference"
+ mv _.fl _.fl.old
+fi
More information about the varnish-commit
mailing list