diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2019-01-29 08:26:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 08:26:00 -0800 |
| commit | 2b62fbce6734eb672ae6ff6fcf258bfff4267ae8 (patch) | |
| tree | c39dd54ef29a0b6610ebd4794b1646c83c66357a /tools | |
| parent | c7870e0f77d6331babfdb89f8c83e4e0279b5e70 (diff) | |
| parent | 3d931557907307ecc19b74e8f3188301b149e99a (diff) | |
Merge pull request #145 from haberman/arrayapi
Generated code API changes for array and hazzers.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/amalgamate.py | 4 | ||||
| -rw-r--r-- | tools/dump_cinit.lua | 1 | ||||
| -rwxr-xr-x | tools/make_cmakelists.py | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/tools/amalgamate.py b/tools/amalgamate.py index 4739a94..038c83f 100755 --- a/tools/amalgamate.py +++ b/tools/amalgamate.py @@ -16,11 +16,11 @@ class Amalgamator: self.output_h = open(output_path + "upb.h", "w") self.output_c = open(output_path + "upb.c", "w") - self.output_c.write("// Amalgamated source file\n") + self.output_c.write("/* Amalgamated source file */\n") self.output_c.write('#include "upb.h"\n') self.output_c.write(open("upb/port_def.inc").read()) - self.output_h.write("// Amalgamated source file\n") + self.output_h.write("/* Amalgamated source file */\n") self.output_h.write(open("upb/port_def.inc").read()) def finish(self): diff --git a/tools/dump_cinit.lua b/tools/dump_cinit.lua index 34d6ac6..183fef8 100644 --- a/tools/dump_cinit.lua +++ b/tools/dump_cinit.lua @@ -433,7 +433,6 @@ local function dump_defs_c(filedef, append) -- Emit forward declarations. emit_file_warning(filedef, append) append('#include "upb/def.h"\n') - append('#include "upb/structdefs.int.h"\n\n') append("static const upb_msgdef %s;\n", linktab:cdecl(upb.DEF_MSG)) append("static const upb_fielddef %s;\n", linktab:cdecl(upb.DEF_FIELD)) if not linktab:empty(upb.DEF_ENUM) then diff --git a/tools/make_cmakelists.py b/tools/make_cmakelists.py index b8f46b9..d863e7e 100755 --- a/tools/make_cmakelists.py +++ b/tools/make_cmakelists.py @@ -123,9 +123,15 @@ class BuildFileFunctions(object): def genrule(self, **kwargs): pass - def glob(*args): + def glob(self, *args): return [] + def map_dep(self, dep): + return dep + + def licenses(self, *args): + pass + class WorkspaceFileFunctions(object): def __init__(self, converter): |