Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
7ecd8e54
Commit
7ecd8e54
authored
Apr 14, 2020
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Substitute remaining hardcoded vmod.vcc references
Refs
0c38fc1c
parent
4a3e805f
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
24 additions
and
22 deletions
+24
-22
vmodtool.py
lib/libvcc/vmodtool.py
+15
-13
automake_boilerplate.am
lib/libvmod_blob/automake_boilerplate.am
+1
-1
automake_boilerplate.am
lib/libvmod_cookie/automake_boilerplate.am
+1
-1
automake_boilerplate.am
lib/libvmod_debug/automake_boilerplate.am
+1
-1
automake_boilerplate.am
lib/libvmod_directors/automake_boilerplate.am
+1
-1
automake_boilerplate.am
lib/libvmod_proxy/automake_boilerplate.am
+1
-1
automake_boilerplate.am
lib/libvmod_purge/automake_boilerplate.am
+1
-1
automake_boilerplate.am
lib/libvmod_std/automake_boilerplate.am
+1
-1
automake_boilerplate.am
lib/libvmod_unix/automake_boilerplate.am
+1
-1
automake_boilerplate.am
lib/libvmod_vtc/automake_boilerplate.am
+1
-1
No files found.
lib/libvcc/vmodtool.py
View file @
7ecd8e54
...
@@ -79,7 +79,7 @@ PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
...
@@ -79,7 +79,7 @@ PFX.h vmod_XXX.rst vmod_XXX.man.rst: PFX.c
PFX.c: $(vmodtool) $(srcdir)/VCC
PFX.c: $(vmodtool) $(srcdir)/VCC
\t
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/VCC
\t
@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
\\
CLEANFILES = $(builddir)/PFX.c $(builddir)/PFX.h
\\
\t
$(builddir)/vmod_XXX.rst
\\
\t
$(builddir)/vmod_XXX.rst
\\
...
@@ -93,7 +93,7 @@ TESTS = \\
...
@@ -93,7 +93,7 @@ TESTS = \\
EXTRA_DIST += $(TESTS)
EXTRA_DIST += $(TESTS)
vtc-refresh-tests:
vtc-refresh-tests:
\t
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/
vmod.vcc
\t
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/
VCC
\t
@cd $(top_builddir) && ./config.status --file=$(subdir)/Makefile
\t
@cd $(top_builddir) && ./config.status --file=$(subdir)/Makefile
include $(top_srcdir)/vtc.am
include $(top_srcdir)/vtc.am
...
@@ -170,20 +170,20 @@ def fmt_cstruct(fo, a, b):
...
@@ -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
(
a
+
"
\n
"
)
fo
.
write
(
b
+
" NB: This file is machine generated, DO NOT EDIT!
\n
"
)
fo
.
write
(
b
+
" NB: This file is machine generated, DO NOT EDIT!
\n
"
)
fo
.
write
(
b
+
"
\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
"
)
fo
.
write
(
c
+
"
\n\n
"
)
def
write_c_file_warning
(
fo
):
def
write_c_file_warning
(
fo
,
s
):
write_file_warning
(
fo
,
"/*"
,
" *"
,
" */"
)
write_file_warning
(
fo
,
"/*"
,
" *"
,
" */"
,
s
)
def
write_rst_file_warning
(
fo
):
def
write_rst_file_warning
(
fo
,
s
):
write_file_warning
(
fo
,
".."
,
".."
,
".."
)
write_file_warning
(
fo
,
".."
,
".."
,
".."
,
s
)
def
write_rst_hdr
(
fo
,
s
,
below
=
"-"
,
above
=
None
):
def
write_rst_hdr
(
fo
,
s
,
below
=
"-"
,
above
=
None
):
...
@@ -960,7 +960,7 @@ class vcc(object):
...
@@ -960,7 +960,7 @@ class vcc(object):
fn
+=
".man"
fn
+=
".man"
fn
+=
".rst"
fn
+=
".rst"
fo
=
self
.
openfile
(
fn
)
fo
=
self
.
openfile
(
fn
)
write_rst_file_warning
(
fo
)
write_rst_file_warning
(
fo
,
self
.
inputfile
)
if
man
:
if
man
:
fo
.
write
(
".. role:: ref(emphasis)
\n
"
)
fo
.
write
(
".. role:: ref(emphasis)
\n
"
)
else
:
else
:
...
@@ -984,14 +984,16 @@ class vcc(object):
...
@@ -984,14 +984,16 @@ class vcc(object):
def
amboilerplate
(
self
):
def
amboilerplate
(
self
):
''' Produce boilplate for autocrap tools '''
''' Produce boilplate for autocrap tools '''
vcc
=
os
.
path
.
basename
(
self
.
inputfile
)
fo
=
self
.
openfile
(
"automake_boilerplate.am"
)
fo
=
self
.
openfile
(
"automake_boilerplate.am"
)
fo
.
write
(
AMBOILERPLATE
.
replace
(
"XXX"
,
self
.
modname
)
fo
.
write
(
AMBOILERPLATE
.
replace
(
"XXX"
,
self
.
modname
)
.
replace
(
"VCC"
,
os
.
path
.
basename
(
self
.
inputfile
)
)
.
replace
(
"VCC"
,
vcc
)
.
replace
(
"PFX"
,
self
.
pfx
))
.
replace
(
"PFX"
,
self
.
pfx
))
tests
=
glob
.
glob
(
"tests/*.vtc"
)
tests
=
glob
.
glob
(
"tests/*.vtc"
)
if
len
(
tests
)
>
0
:
if
len
(
tests
)
>
0
:
tests
.
sort
()
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
()
fo
.
close
()
def
mkdefs
(
self
,
fo
):
def
mkdefs
(
self
,
fo
):
...
@@ -1011,7 +1013,7 @@ class vcc(object):
...
@@ -1011,7 +1013,7 @@ class vcc(object):
''' Produce vcc_if.h file '''
''' Produce vcc_if.h file '''
fn
=
self
.
pfx
+
".h"
fn
=
self
.
pfx
+
".h"
fo
=
self
.
openfile
(
fn
)
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
(
"#ifndef VDEF_H_INCLUDED
\n
"
)
fo
.
write
(
'# error "Include vdef.h first"
\n
'
)
fo
.
write
(
'# error "Include vdef.h first"
\n
'
)
fo
.
write
(
"#endif
\n
"
)
fo
.
write
(
"#endif
\n
"
)
...
@@ -1102,7 +1104,7 @@ class vcc(object):
...
@@ -1102,7 +1104,7 @@ class vcc(object):
fnx
=
fno
+
".tmp2"
fnx
=
fno
+
".tmp2"
fx
=
open
(
fnx
,
"w"
)
fx
=
open
(
fnx
,
"w"
)
write_c_file_warning
(
fo
)
write_c_file_warning
(
fo
,
self
.
inputfile
)
self
.
mkdefs
(
fx
);
self
.
mkdefs
(
fx
);
...
...
lib/libvmod_blob/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_blob.rst vmod_blob.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_blob.rst vmod_blob.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_blob.rst \
$(builddir)/vmod_blob.rst \
...
...
lib/libvmod_cookie/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_cookie.rst vmod_cookie.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_cookie.rst vmod_cookie.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_cookie.rst \
$(builddir)/vmod_cookie.rst \
...
...
lib/libvmod_debug/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_debug.rst vmod_debug.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_debug.rst vmod_debug.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_debug.rst \
$(builddir)/vmod_debug.rst \
...
...
lib/libvmod_directors/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_directors.rst vmod_directors.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_directors.rst vmod_directors.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_directors.rst \
$(builddir)/vmod_directors.rst \
...
...
lib/libvmod_proxy/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_proxy.rst vmod_proxy.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_proxy.rst vmod_proxy.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_proxy.rst \
$(builddir)/vmod_proxy.rst \
...
...
lib/libvmod_purge/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_purge.rst vmod_purge.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_purge.rst vmod_purge.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_purge.rst \
$(builddir)/vmod_purge.rst \
...
...
lib/libvmod_std/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_std.rst vmod_std.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_std.rst vmod_std.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_std.rst \
$(builddir)/vmod_std.rst \
...
...
lib/libvmod_unix/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_unix.rst vmod_unix.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_unix.rst vmod_unix.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_unix.rst \
$(builddir)/vmod_unix.rst \
...
...
lib/libvmod_vtc/automake_boilerplate.am
View file @
7ecd8e54
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_if.c
...
@@ -30,7 +30,7 @@ vcc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_if.c
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
@PYTHON@ $(vmodtool) $(vmodtoolargs) $(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 \
CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
$(builddir)/vmod_vtc.rst \
$(builddir)/vmod_vtc.rst \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment