[master] f5aab9bf2 build: Make vmodtool args extensible per VMOD

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Jan 7 14:16:07 UTC 2021 

commit f5aab9bf215de1dd40dc3baf0a85306a4cbfcafb
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Jan 5 17:33:03 2021 +0100

    build: Make vmodtool args extensible per VMOD
    
    In practice, we only tweak vmod_debug's build for coverage purposes.
    
    Another option could be to have a VTC running vmodtool.py with various
    VCC inputs but we currently don't have test coverage for our python
    scripts.

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index ad58a3c7d..b84f3464b 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -59,7 +59,7 @@ AM_CPPFLAGS = \\
 \t-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o PFX
+vmodtoolargs_XXX ?= --strict --boilerplate -o PFX
 
 vmod_LTLIBRARIES = libvmod_XXX.la
 
@@ -81,7 +81,7 @@ $(libvmod_XXX_la_OBJECTS): PFX.h
 PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
 
 PFX.c: $(vmodtool) $(srcdir)/VCC
-\t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/VCC
+\t at PYTHON@ $(vmodtool) $(vmodtoolargs_XXX) $(srcdir)/VCC
 
 EXTRA_DIST = $(srcdir)/VCC automake_boilerplate_XXX.am
 
diff --git a/lib/libvmod_blob/automake_boilerplate_blob.am b/lib/libvmod_blob/automake_boilerplate_blob.am
index 19db88cba..86c9a71a9 100644
--- a/lib/libvmod_blob/automake_boilerplate_blob.am
+++ b/lib/libvmod_blob/automake_boilerplate_blob.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_blob_if
+vmodtoolargs_blob ?= --strict --boilerplate -o vcc_blob_if
 
 vmod_LTLIBRARIES = libvmod_blob.la
 
@@ -30,7 +30,7 @@ $(libvmod_blob_la_OBJECTS): vcc_blob_if.h
 vcc_blob_if.h vmod_blob.rst vmod_blob.man.rst: vcc_blob_if.c
 
 vcc_blob_if.c: $(vmodtool) $(srcdir)/vmod_blob.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_blob.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_blob) $(srcdir)/vmod_blob.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_blob.vcc automake_boilerplate_blob.am
 
diff --git a/lib/libvmod_cookie/automake_boilerplate_cookie.am b/lib/libvmod_cookie/automake_boilerplate_cookie.am
index aa6867d7e..007a19199 100644
--- a/lib/libvmod_cookie/automake_boilerplate_cookie.am
+++ b/lib/libvmod_cookie/automake_boilerplate_cookie.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_cookie_if
+vmodtoolargs_cookie ?= --strict --boilerplate -o vcc_cookie_if
 
 vmod_LTLIBRARIES = libvmod_cookie.la
 
@@ -30,7 +30,7 @@ $(libvmod_cookie_la_OBJECTS): vcc_cookie_if.h
 vcc_cookie_if.h vmod_cookie.rst vmod_cookie.man.rst: vcc_cookie_if.c
 
 vcc_cookie_if.c: $(vmodtool) $(srcdir)/vmod_cookie.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_cookie.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_cookie) $(srcdir)/vmod_cookie.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_cookie.vcc automake_boilerplate_cookie.am
 
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 60b0757eb..bcd29af6f 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -11,7 +11,7 @@ include $(srcdir)/automake_boilerplate_debug.am
 vmod_debug_symbols_regex = 'Vmod_.*_Data'
 
 # not --strict
-vmodtoolargs = --boilerplate -o vcc_debug_if
+vmodtoolargs_debug = --boilerplate -o vcc_debug_if
 
 .vsc.c:
 	$(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $<
diff --git a/lib/libvmod_debug/automake_boilerplate_debug.am b/lib/libvmod_debug/automake_boilerplate_debug.am
index ec97cc5be..e589a1c76 100644
--- a/lib/libvmod_debug/automake_boilerplate_debug.am
+++ b/lib/libvmod_debug/automake_boilerplate_debug.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_debug_if
+vmodtoolargs_debug ?= --strict --boilerplate -o vcc_debug_if
 
 vmod_LTLIBRARIES = libvmod_debug.la
 
@@ -30,7 +30,7 @@ $(libvmod_debug_la_OBJECTS): vcc_debug_if.h
 vcc_debug_if.h vmod_debug.rst vmod_debug.man.rst: vcc_debug_if.c
 
 vcc_debug_if.c: $(vmodtool) $(srcdir)/vmod_debug.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_debug.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_debug) $(srcdir)/vmod_debug.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_debug.vcc automake_boilerplate_debug.am
 
diff --git a/lib/libvmod_directors/automake_boilerplate_directors.am b/lib/libvmod_directors/automake_boilerplate_directors.am
index ae29235f1..2c343a523 100644
--- a/lib/libvmod_directors/automake_boilerplate_directors.am
+++ b/lib/libvmod_directors/automake_boilerplate_directors.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_directors_if
+vmodtoolargs_directors ?= --strict --boilerplate -o vcc_directors_if
 
 vmod_LTLIBRARIES = libvmod_directors.la
 
@@ -30,7 +30,7 @@ $(libvmod_directors_la_OBJECTS): vcc_directors_if.h
 vcc_directors_if.h vmod_directors.rst vmod_directors.man.rst: vcc_directors_if.c
 
 vcc_directors_if.c: $(vmodtool) $(srcdir)/vmod_directors.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_directors.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_directors) $(srcdir)/vmod_directors.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_directors.vcc automake_boilerplate_directors.am
 
diff --git a/lib/libvmod_proxy/automake_boilerplate_proxy.am b/lib/libvmod_proxy/automake_boilerplate_proxy.am
index cad272c9f..066eb68dd 100644
--- a/lib/libvmod_proxy/automake_boilerplate_proxy.am
+++ b/lib/libvmod_proxy/automake_boilerplate_proxy.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_proxy_if
+vmodtoolargs_proxy ?= --strict --boilerplate -o vcc_proxy_if
 
 vmod_LTLIBRARIES = libvmod_proxy.la
 
@@ -30,7 +30,7 @@ $(libvmod_proxy_la_OBJECTS): vcc_proxy_if.h
 vcc_proxy_if.h vmod_proxy.rst vmod_proxy.man.rst: vcc_proxy_if.c
 
 vcc_proxy_if.c: $(vmodtool) $(srcdir)/vmod_proxy.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_proxy.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_proxy) $(srcdir)/vmod_proxy.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_proxy.vcc automake_boilerplate_proxy.am
 
diff --git a/lib/libvmod_purge/automake_boilerplate_purge.am b/lib/libvmod_purge/automake_boilerplate_purge.am
index 9988d5dfa..89aeabb4a 100644
--- a/lib/libvmod_purge/automake_boilerplate_purge.am
+++ b/lib/libvmod_purge/automake_boilerplate_purge.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_purge_if
+vmodtoolargs_purge ?= --strict --boilerplate -o vcc_purge_if
 
 vmod_LTLIBRARIES = libvmod_purge.la
 
@@ -30,7 +30,7 @@ $(libvmod_purge_la_OBJECTS): vcc_purge_if.h
 vcc_purge_if.h vmod_purge.rst vmod_purge.man.rst: vcc_purge_if.c
 
 vcc_purge_if.c: $(vmodtool) $(srcdir)/vmod_purge.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_purge.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_purge) $(srcdir)/vmod_purge.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_purge.vcc automake_boilerplate_purge.am
 
diff --git a/lib/libvmod_std/automake_boilerplate_std.am b/lib/libvmod_std/automake_boilerplate_std.am
index 8201d962b..57dec41a3 100644
--- a/lib/libvmod_std/automake_boilerplate_std.am
+++ b/lib/libvmod_std/automake_boilerplate_std.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_std_if
+vmodtoolargs_std ?= --strict --boilerplate -o vcc_std_if
 
 vmod_LTLIBRARIES = libvmod_std.la
 
@@ -30,7 +30,7 @@ $(libvmod_std_la_OBJECTS): vcc_std_if.h
 vcc_std_if.h vmod_std.rst vmod_std.man.rst: vcc_std_if.c
 
 vcc_std_if.c: $(vmodtool) $(srcdir)/vmod_std.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_std.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_std) $(srcdir)/vmod_std.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_std.vcc automake_boilerplate_std.am
 
diff --git a/lib/libvmod_unix/automake_boilerplate_unix.am b/lib/libvmod_unix/automake_boilerplate_unix.am
index d9a4f9c0e..02cd56b2a 100644
--- a/lib/libvmod_unix/automake_boilerplate_unix.am
+++ b/lib/libvmod_unix/automake_boilerplate_unix.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_unix_if
+vmodtoolargs_unix ?= --strict --boilerplate -o vcc_unix_if
 
 vmod_LTLIBRARIES = libvmod_unix.la
 
@@ -30,7 +30,7 @@ $(libvmod_unix_la_OBJECTS): vcc_unix_if.h
 vcc_unix_if.h vmod_unix.rst vmod_unix.man.rst: vcc_unix_if.c
 
 vcc_unix_if.c: $(vmodtool) $(srcdir)/vmod_unix.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_unix.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_unix) $(srcdir)/vmod_unix.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_unix.vcc automake_boilerplate_unix.am
 
diff --git a/lib/libvmod_vtc/automake_boilerplate_vtc.am b/lib/libvmod_vtc/automake_boilerplate_vtc.am
index 53579929b..620fd9430 100644
--- a/lib/libvmod_vtc/automake_boilerplate_vtc.am
+++ b/lib/libvmod_vtc/automake_boilerplate_vtc.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/include
 
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
-vmodtoolargs ?= --strict --boilerplate -o vcc_vtc_if
+vmodtoolargs_vtc ?= --strict --boilerplate -o vcc_vtc_if
 
 vmod_LTLIBRARIES = libvmod_vtc.la
 
@@ -30,7 +30,7 @@ $(libvmod_vtc_la_OBJECTS): vcc_vtc_if.h
 vcc_vtc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_vtc_if.c
 
 vcc_vtc_if.c: $(vmodtool) $(srcdir)/vmod_vtc.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod_vtc.vcc
+	@PYTHON@ $(vmodtool) $(vmodtoolargs_vtc) $(srcdir)/vmod_vtc.vcc
 
 EXTRA_DIST = $(srcdir)/vmod_vtc.vcc automake_boilerplate_vtc.am

More information about the varnish-commit mailing list