[master] 0c38fc1c3 Add a new placeholder for the VCC file in vmodtool

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Apr 14 15:13:06 UTC 2020


commit 0c38fc1c38f79ce30e80227b48432529707aa177
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Apr 14 17:07:44 2020 +0200

    Add a new placeholder for the VCC file in vmodtool
    
    Unlike the PFX that added a -o option to $(vmodtoolargs) this change
    doesn't affect already checked-in boilerplate files.

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 0b674a309..6fd1843ea 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -77,8 +77,8 @@ $(libvmod_XXX_la_OBJECTS): PFX.h
 
 PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
 
-PFX.c: $(vmodtool) $(srcdir)/vmod.vcc
-\t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+PFX.c: $(vmodtool) $(srcdir)/VCC
+\t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/VCC
 
 EXTRA_DIST = vmod.vcc automake_boilerplate.am
 
@@ -987,6 +987,7 @@ class vcc(object):
         ''' Produce boilplate for autocrap tools '''
         fo = self.openfile("automake_boilerplate.am")
         fo.write(AMBOILERPLATE.replace("XXX", self.modname)
+                 .replace("VCC", os.path.basename(self.inputfile))
                  .replace("PFX", self.pfx))
         tests = glob.glob("tests/*.vtc")
         if len(tests) > 0:


More information about the varnish-commit mailing list