[master] 7ecd8e546 Substitute remaining hardcoded vmod.vcc references

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Apr 14 21:57:11 UTC 2020 

commit 7ecd8e546b86acf666d36da7fb228cd46ee04333
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Apr 14 23:49:33 2020 +0200

    Substitute remaining hardcoded vmod.vcc references
    
    Refs 0c38fc1c38f7

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 8aff20188..87a9ce4b9 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -79,7 +79,7 @@ PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
 PFX.c: $(vmodtool) $(srcdir)/VCC
 \t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/VCC
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/VCC automake_boilerplate.am
 
 CLEANFILES = $(builddir)/PFX.c $(builddir)/PFX.h \\
 \t$(builddir)/vmod_XXX.rst \\
@@ -93,7 +93,7 @@ TESTS = \\
 EXTRA_DIST += $(TESTS)
 
 vtc-refresh-tests:
-\t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+\t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/VCC
 \t at cd $(top_builddir) && ./config.status --file=$(subdir)/Makefile
 
 include $(top_srcdir)/vtc.am
@@ -170,20 +170,20 @@ def fmt_cstruct(fo, a, b):
 #######################################################################
 
 
-def write_file_warning(fo, a, b, c):
+def write_file_warning(fo, a, b, c, s):
     fo.write(a + "\n")
     fo.write(b + " NB:  This file is machine generated, DO NOT EDIT!\n")
     fo.write(b + "\n")
-    fo.write(b + " Edit vmod.vcc and run make instead\n")
+    fo.write(b + " Edit " + s + " and run make instead\n")
     fo.write(c + "\n\n")
 
 
-def write_c_file_warning(fo):
-    write_file_warning(fo, "/*", " *", " */")
+def write_c_file_warning(fo, s):
+    write_file_warning(fo, "/*", " *", " */", s)
 
 
-def write_rst_file_warning(fo):
-    write_file_warning(fo, "..", "..", "..")
+def write_rst_file_warning(fo, s):
+    write_file_warning(fo, "..", "..", "..", s)
 
 
 def write_rst_hdr(fo, s, below="-", above=None):
@@ -960,7 +960,7 @@ class vcc(object):
             fn += ".man"
         fn += ".rst"
         fo = self.openfile(fn)
-        write_rst_file_warning(fo)
+        write_rst_file_warning(fo, self.inputfile)
         if man:
             fo.write(".. role:: ref(emphasis)\n")
         else:
@@ -984,14 +984,16 @@ class vcc(object):
 
     def amboilerplate(self):
         ''' Produce boilplate for autocrap tools '''
+        vcc = os.path.basename(self.inputfile)
         fo = self.openfile("automake_boilerplate.am")
         fo.write(AMBOILERPLATE.replace("XXX", self.modname)
-                 .replace("VCC", os.path.basename(self.inputfile))
+                 .replace("VCC", vcc)
                  .replace("PFX", self.pfx))
         tests = glob.glob("tests/*.vtc")
         if len(tests) > 0:
             tests.sort()
-            fo.write(AMBOILERPLATE_CHECK.replace("VTC", " \\\n\t".join(tests)))
+            fo.write(AMBOILERPLATE_CHECK.replace("VCC", vcc).
+                    replace("VTC", " \\\n\t".join(tests)))
         fo.close()
 
     def mkdefs(self, fo):
@@ -1011,7 +1013,7 @@ class vcc(object):
         ''' Produce vcc_if.h file '''
         fn = self.pfx + ".h"
         fo = self.openfile(fn)
-        write_c_file_warning(fo)
+        write_c_file_warning(fo, self.inputfile)
         fo.write("#ifndef VDEF_H_INCLUDED\n")
         fo.write('#  error "Include vdef.h first"\n')
         fo.write("#endif\n")
@@ -1102,7 +1104,7 @@ class vcc(object):
         fnx = fno + ".tmp2"
         fx = open(fnx, "w")
 
-        write_c_file_warning(fo)
+        write_c_file_warning(fo, self.inputfile)
 
         self.mkdefs(fx);
 
diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate.am
index 0314308ff..0ff3f4f98 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_blob.rst vmod_blob.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_blob.rst \
diff --git a/lib/libvmod_cookie/automake_boilerplate.am b/lib/libvmod_cookie/automake_boilerplate.am
index d9742e7c9..f5333060a 100644
--- a/lib/libvmod_cookie/automake_boilerplate.am
+++ b/lib/libvmod_cookie/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_cookie.rst vmod_cookie.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_cookie.rst \
diff --git a/lib/libvmod_debug/automake_boilerplate.am b/lib/libvmod_debug/automake_boilerplate.am
index 407d5c1ab..f404971ef 100644
--- a/lib/libvmod_debug/automake_boilerplate.am
+++ b/lib/libvmod_debug/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_debug.rst vmod_debug.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_debug.rst \
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate.am
index 1849ef3c2..69287d3d6 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_directors.rst vmod_directors.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_directors.rst \
diff --git a/lib/libvmod_proxy/automake_boilerplate.am b/lib/libvmod_proxy/automake_boilerplate.am
index 09c793bc8..fb295e30c 100644
--- a/lib/libvmod_proxy/automake_boilerplate.am
+++ b/lib/libvmod_proxy/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_proxy.rst vmod_proxy.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_proxy.rst \
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate.am
index 25132b54b..d6d552864 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_purge.rst vmod_purge.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_purge.rst \
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate.am
index 7a82bd382..146a4f1a6 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_std.rst vmod_std.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_std.rst \
diff --git a/lib/libvmod_unix/automake_boilerplate.am b/lib/libvmod_unix/automake_boilerplate.am
index 7a4d0c598..6eaa08742 100644
--- a/lib/libvmod_unix/automake_boilerplate.am
+++ b/lib/libvmod_unix/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_unix.rst vmod_unix.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_unix.rst \
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate.am
index d01e912ea..e330e3821 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -30,7 +30,7 @@ vcc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
-EXTRA_DIST = vmod.vcc automake_boilerplate.am
+EXTRA_DIST = $(srcdir)/vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_vtc.rst \

More information about the varnish-commit mailing list