From: Oleksandr Hnatiuk Date: Thu, 29 Aug 2024 04:20:04 +0000 (-0700) Subject: vapi: remove directory name from include guards X-Git-Tag: v25.06-rc0~84 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F41499%2F3;p=vpp.git vapi: remove directory name from include guards Script vapi_c_gen.py uses full paths to source files to generate include guards in files with `.vapi.h` extension. This makes the content of header files depend on build directory which causes reproducibility issues (cannot get identical build output when building in a different directory). Commit 4c64b6edc86f7 fixes this for .hpp files, but seems to forget about .h files. Use its fix for these as well. Type: fix Change-Id: Ida638c7b4630fac1f6d968a9203a409648bef55c Signed-off-by: Oleksandr Hnatiuk --- diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py index 9d1efb5e438..709063f164d 100755 --- a/src/vpp-api/vapi/vapi_c_gen.py +++ b/src/vpp-api/vapi/vapi_c_gen.py @@ -891,7 +891,7 @@ def gen_json_unified_header(parser, logger, j, io, name): orig_stdout = sys.stdout sys.stdout = io include_guard = "__included_%s" % ( - j.replace(".", "_") + f.replace(".", "_") .replace("/", "_") .replace("-", "_") .replace("+", "_")