From 9bb0814c48cb4d4df87ca64c9fabba5d15183cc1 Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Thu, 1 Nov 2018 11:43:30 -0700 Subject: Added missing "upbc" file. --- tools/upbc | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 tools/upbc (limited to 'tools') diff --git a/tools/upbc b/tools/upbc new file mode 100755 index 0000000..bd12250 --- /dev/null +++ b/tools/upbc @@ -0,0 +1,5 @@ +#!/bin/sh +BASE=`dirname "$0"` +export LUA_CPATH="$BASE/../lua/?.so" +export LUA_PATH="$BASE/?.lua;$BASE/../lua/?.lua" +lua $BASE/upbc.lua "$@" -- cgit v1.2.3 From a7ebe54eb1cc09cc50cf97af8436835ead4cbbee Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Sat, 3 Nov 2018 18:18:47 -0700 Subject: Conformance tests work under Bazel. --- BUILD | 79 ++++++++++++++++++++++++---------------- WORKSPACE | 24 ++++++++----- build_defs.bzl | 95 ++++++++++++++++++++++++++++++++++++++++++++----- tests/conformance_upb.c | 4 +-- tools/upbc.lua | 22 +++++++++--- 5 files changed, 170 insertions(+), 54 deletions(-) (limited to 'tools') diff --git a/BUILD b/BUILD index 6f295a0..b636e15 100644 --- a/BUILD +++ b/BUILD @@ -5,7 +5,9 @@ load( "lua_binary", "lua_test", "generated_file_staleness_test", + "make_shell_script", "upb_amalgamation", + "upb_proto_library", ) # C/C++ rules ################################################################## @@ -202,6 +204,43 @@ cc_test( deps = [":upb_json", ":upb_test"], ) +upb_proto_library( + name = "conformance_proto_upb", + deps = [ + "@com_google_protobuf//:conformance_proto", + "@com_google_protobuf//:test_messages_proto3_proto", + ], + upbc = ":upbc", +) + +cc_binary( + name = "conformance_upb", + srcs = [ + "tests/conformance_upb.c", + ], + deps = [ + ":upb", + ":conformance_proto_upb", + ], +) + +make_shell_script( + name = "gen_test_conformance_upb", + out = "test_conformance_upb.sh", + contents = "$(rlocation com_google_protobuf/conformance_test_runner) $(rlocation upb/conformance_upb)", +) + +sh_test( + name = "test_conformance_upb", + srcs = ["test_conformance_upb.sh"], + data = [ + ":conformance_upb", + "@com_google_protobuf//:conformance_test_runner", + "tests/conformance_upb_failures.txt", + "@bazel_tools//tools/bash/runfiles" + ] +) + # Lua libraries. ############################################################### lua_cclibrary( @@ -222,33 +261,21 @@ lua_cclibrary( lua_library( name = "lua/upb", - srcs = [ - "upb/bindings/lua/upb.lua", - ], + srcs = ["upb/bindings/lua/upb.lua"], strip_prefix = "upb/bindings/lua", - luadeps = [ - "lua/upb_c", - ], + luadeps = ["lua/upb_c"], ) lua_cclibrary( name = "lua/upb/table_c", - srcs = [ - "upb/bindings/lua/upb/table.c", - ], - luadeps = [ - "lua/upb_c", - ], - deps = [ - "upb", - ], + srcs = ["upb/bindings/lua/upb/table.c"], + luadeps = ["lua/upb_c"], + deps = ["upb"], ) lua_library( name = "lua/upb/table", - srcs = [ - "upb/bindings/lua/upb/table.lua", - ], + srcs = ["upb/bindings/lua/upb/table.lua"], strip_prefix = "upb/bindings/lua", luadeps = [ "lua/upb", @@ -258,22 +285,14 @@ lua_library( lua_cclibrary( name = "lua/upb/pb_c", - srcs = [ - "upb/bindings/lua/upb/pb.c", - ], - luadeps = [ - "lua/upb_c", - ], - deps = [ - "upb_pb", - ], + srcs = ["upb/bindings/lua/upb/pb.c"], + luadeps = ["lua/upb_c"], + deps = ["upb_pb"], ) lua_library( name = "lua/upb/pb", - srcs = [ - "upb/bindings/lua/upb/pb.lua", - ], + srcs = ["upb/bindings/lua/upb/pb.lua"], strip_prefix = "upb/bindings/lua", luadeps = [ "lua/upb", diff --git a/WORKSPACE b/WORKSPACE index 299bfa7..b4d19c5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,6 +2,7 @@ workspace(name = "upb") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") http_archive( name = "lua", @@ -14,13 +15,12 @@ http_archive( ], ) -http_archive( +git_repository( name = "com_google_protobuf", - sha256 = "d7a221b3d4fb4f05b7473795ccea9e05dab3b8721f6286a95fffbffc2d926f8b", - strip_prefix = "protobuf-3.6.1", - urls = [ - "https://github.com/protocolbuffers/protobuf/archive/v3.6.1.zip" - ], + commit = "25feb59620627b673df76813dfd66e3f565765e7", + #sha256 = "d7a221b3d4fb4f05b7473795ccea9e05dab3b8721f6286a95fffbffc2d926f8b", + remote = "https://github.com/haberman/protobuf.git", + #tag = "conformance-build-tag", ) http_archive( @@ -28,7 +28,13 @@ http_archive( sha256 = "5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f", build_file = "//:ragel.BUILD", strip_prefix = "ragel-6.10", - urls = [ - "http://www.colm.net/files/ragel/ragel-6.10.tar.gz" - ], + urls = ["http://www.colm.net/files/ragel/ragel-6.10.tar.gz"], +) + +# Used by protobuf. +http_archive( + name = "bazel_skylib", + sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d", + strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b", + urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"], ) diff --git a/build_defs.bzl b/build_defs.bzl index f9cadd4..8df5660 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -1,5 +1,5 @@ -shell_find_runfiles = """ +_shell_find_runfiles = """ # --- begin runfiles.bash initialization --- # Copy-pasted from Bazel's Bash runfiles library (tools/bash/runfiles/runfiles.bash). set -euo pipefail @@ -62,6 +62,11 @@ def _remove_prefix(str, prefix): fail("%s doesn't start with %s" % (str, prefix)) return str[len(prefix):] +def _remove_suffix(str, suffix): + if not str.endswith(suffix): + fail("%s doesn't end with %s" % (str, suffix)) + return str[:-len(suffix)] + def lua_library(name, srcs, strip_prefix, luadeps = []): outs = [_remove_prefix(src, strip_prefix + "/") for src in srcs] native.genrule( @@ -76,21 +81,28 @@ def lua_library(name, srcs, strip_prefix, luadeps = []): data = outs + luadeps, ) +def make_shell_script(name, contents, out): + script_contents = (_shell_find_runfiles + contents).replace("$", "$$") + native.genrule( + name = "gen_" + name, + outs = [out], + cmd = "(cat <<'HEREDOC'\n%s\nHEREDOC\n) > $@" % script_contents, + ) + def _lua_binary_or_test(name, luamain, luadeps, rule): script = name + ".sh" - script_contents = (shell_find_runfiles + """ + make_shell_script( + name = "gen_" + name, + out = script, + contents = """ BASE=$(dirname $(rlocation upb/upb_c.so)) export LUA_CPATH="$BASE/?.so" export LUA_PATH="$BASE/?.lua" $(rlocation lua/lua) $(rlocation upb/tools/upbc.lua) "$@" -""").replace("$", "$$") - - native.genrule( - name = "gen_" + name, - outs = [script], - cmd = "(cat <<'HEREDOC'\n%s\nHEREDOC\n) > $@" % script_contents, +""" ) + rule( name = name, srcs = [script], @@ -147,6 +159,8 @@ def generated_file_staleness_test(name, outs, generated_pattern): ], ) +# upb_amalgamation() rule, with file_list aspect. + SrcList = provider( fields = { 'srcs' : 'list of srcs', @@ -192,3 +206,68 @@ upb_amalgamation = rule( "outs": attr.output_list(), } ) + +# upb_proto_library() rule + +def _remove_up(string): + if string.startswith("../"): + string = string[3:] + pos = string.find("/") + string = string[pos + 1:] + + return _remove_suffix(string, ".proto") + +def _upb_proto_library_srcs_impl(ctx): + descriptors = [] + outs = [] + for dep in ctx.attr.deps: + if hasattr(dep, 'proto'): + for desc in dep.proto.transitive_descriptor_sets: + descriptors.append(desc) + for src in dep.proto.transitive_sources: + outs.append(ctx.actions.declare_file(_remove_up(src.short_path) + ".upb.h")) + outs.append(ctx.actions.declare_file(_remove_up(src.short_path) + ".upb.c")) + outdir = _remove_suffix(outs[-1].path, _remove_up(src.short_path) + ".upb.c") + + concatenated = ctx.actions.declare_file(ctx.label.name + "_concatenated_descriptor.bin") + descriptor_paths = [d.path for d in descriptors] + + ctx.actions.run_shell( + inputs = descriptors, + outputs = [concatenated], + progress_message = "Concatenating descriptors", + command = "cat %s > %s" % (" ".join(descriptor_paths), concatenated.path), + ) + ctx.actions.run( + inputs = [concatenated], + outputs = outs, + executable = ctx.executable.upbc, + arguments = ["--outdir", outdir, concatenated.path], + progress_message = "Generating upb protos", + ) + + return [DefaultInfo(files = depset(outs))] + +_upb_proto_library_srcs = rule( + implementation = _upb_proto_library_srcs_impl, + attrs = { + "upbc": attr.label( + executable = True, + cfg = "host", + ), + "deps": attr.label_list(), + } +) + +def upb_proto_library(name, deps, upbc): + srcs_rule = name + "_srcs.cc" + _upb_proto_library_srcs( + name = srcs_rule, + upbc = upbc, + deps = deps, + ) + native.cc_library( + name = name, + srcs = [":" + srcs_rule], + deps = [":upb"], + ) diff --git a/tests/conformance_upb.c b/tests/conformance_upb.c index ccc8a94..e0a7d8c 100644 --- a/tests/conformance_upb.c +++ b/tests/conformance_upb.c @@ -8,8 +8,8 @@ #include #include -#include "conformance.upb.h" -#include "google/protobuf/test_messages_proto3.upb.h" +#include "conformance/conformance.upb.h" +#include "src/google/protobuf/test_messages_proto3.upb.h" int test_count = 0; diff --git a/tools/upbc.lua b/tools/upbc.lua index 8ac4f73..adea373 100644 --- a/tools/upbc.lua +++ b/tools/upbc.lua @@ -13,11 +13,17 @@ local make_c_api = require "make_c_api" local upb = require "upb" local generate_upbdefs = false +local outdir = "." -for _, argument in ipairs(arg) do +i = 1 +while i <= #arg do + argument = arg[i] if argument.sub(argument, 1, 2) == "--" then if argument == "--generate-upbdefs" then generate_upbdefs = true + elseif argument == "--outdir" then + i = i + 1 + outdir = arg[i] else print("Unknown flag: " .. argument) return 1 @@ -29,6 +35,7 @@ for _, argument in ipairs(arg) do end src = argument end + i = i + 1 end if not src then @@ -40,6 +47,11 @@ function strip_proto(filename) return string.gsub(filename, '%.proto$','') end +local function open(filename) + local full_name = outdir .. "/" .. filename + return assert(io.open(full_name, "w"), "couldn't open " .. full_name) +end + -- Open input/output files. local f = assert(io.open(src, "r"), "couldn't open input file " .. src) local descriptor = f:read("*all") @@ -67,8 +79,8 @@ for _, file in ipairs(files) do if generate_upbdefs then -- Legacy generated defs. - local hfile = assert(io.open(hfilename, "w"), "couldn't open " .. hfilename) - local cfile = assert(io.open(cfilename, "w"), "couldn't open " .. cfilename) + local hfile = open(hfilename) + local cfile = open(cfilename) local happend = dump_cinit.file_appender(hfile) local cappend = dump_cinit.file_appender(cfile) @@ -90,8 +102,8 @@ for _, file in ipairs(files) do print(string.format(" cfilename=%s", cfilename)) end - local hfile = assert(io.open(hfilename, "w"), "couldn't open " .. hfilename) - local cfile = assert(io.open(cfilename, "w"), "couldn't open " .. cfilename) + local hfile = open(hfilename) + local cfile = open(cfilename) local happend = dump_cinit.file_appender(hfile) local cappend = dump_cinit.file_appender(cfile) -- cgit v1.2.3 From 23fa64f10c27bdd4b8261c70a81a7721fd71f69f Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Mon, 5 Nov 2018 09:34:05 -0800 Subject: Added script to generate CMake build. Bazel tests it. --- BUILD | 180 ++++++++++++++++------ CMakeLists.txt | 367 +++++++++++++++----------------------------- build_defs.bzl | 2 +- staleness_test.py | 30 ---- staleness_test_lib.py | 158 ------------------- tools/make_cmakelists.py | 234 ++++++++++++++++++++++++++++ tools/staleness_test.py | 30 ++++ tools/staleness_test_lib.py | 158 +++++++++++++++++++ tools/upbc | 5 - 9 files changed, 675 insertions(+), 489 deletions(-) delete mode 100644 staleness_test.py delete mode 100644 staleness_test_lib.py create mode 100755 tools/make_cmakelists.py create mode 100644 tools/staleness_test.py create mode 100644 tools/staleness_test_lib.py delete mode 100755 tools/upbc (limited to 'tools') diff --git a/BUILD b/BUILD index b636e15..458463e 100644 --- a/BUILD +++ b/BUILD @@ -45,7 +45,11 @@ cc_library( "upb/sink.h", "upb/upb.h", ], - copts = ["-std=c89", "-pedantic", "-Wno-long-long"], + copts = [ + "-std=c89", + "-pedantic", + "-Wno-long-long", + ], ) cc_library( @@ -58,8 +62,12 @@ cc_library( "upb/descriptor/descriptor.upbdefs.h", "upb/descriptor/reader.h", ], + copts = [ + "-std=c89", + "-pedantic", + "-Wno-long-long", + ], deps = [":upb"], - copts = ["-std=c89", "-pedantic", "-Wno-long-long"], ) cc_library( @@ -80,11 +88,15 @@ cc_library( "upb/pb/glue.h", "upb/pb/textprinter.h", ], + copts = [ + "-std=c89", + "-pedantic", + "-Wno-long-long", + ], deps = [ ":upb", ":upb_descriptor", ], - copts = ["-std=c89", "-pedantic", "-Wno-long-long"], ) cc_library( @@ -97,8 +109,12 @@ cc_library( "upb/json/parser.h", "upb/json/printer.h", ], + copts = [ + "-std=c89", + "-pedantic", + "-Wno-long-long", + ], deps = [":upb"], - copts = ["-std=c89", "-pedantic", "-Wno-long-long"], ) cc_library( @@ -118,6 +134,10 @@ py_binary( upb_amalgamation( name = "gen_amalgamation", + outs = [ + "upb.c", + "upb.h", + ], amalgamator = ":amalgamate", libs = [ ":upb", @@ -125,92 +145,115 @@ upb_amalgamation( ":upb_pb", ":upb_json", ], - outs = [ - "upb.h", - "upb.c", - ], ) cc_library( name = "amalgamation", - hdrs = ["upb.h"], srcs = ["upb.c"], + hdrs = ["upb.h"], ) # C/C++ tests ################################################################## cc_library( - testonly = 1, name = "upb_test", - hdrs = [ - "tests/upb_test.h", - "tests/test_util.h", - ], + testonly = 1, srcs = [ "tests/testmain.cc", ], + hdrs = [ + "tests/test_util.h", + "tests/upb_test.h", + ], ) cc_test( name = "test_varint", srcs = ["tests/pb/test_varint.c"], - deps = [":upb_pb", ":upb_test"], + deps = [ + ":upb_pb", + ":upb_test", + ], ) cc_test( name = "test_def", srcs = ["tests/test_def.c"], - deps = [":upb_pb", ":upb_test"], + deps = [ + ":upb_pb", + ":upb_test", + ], ) cc_test( name = "test_handlers", srcs = ["tests/test_handlers.c"], - deps = [":upb_pb", ":upb_test"], + deps = [ + ":upb_pb", + ":upb_test", + ], ) cc_test( name = "test_decoder", srcs = ["tests/pb/test_decoder.cc"], - deps = [":upb_pb", ":upb_test"], + deps = [ + ":upb_pb", + ":upb_test", + ], ) cc_test( name = "test_encoder", srcs = ["tests/pb/test_encoder.cc"], - deps = [":upb_pb", ":upb_test", ":upb_cc_bindings"], data = ["upb/descriptor/descriptor.pb"], + deps = [ + ":upb_cc_bindings", + ":upb_pb", + ":upb_test", + ], ) cc_test( name = "test_cpp", srcs = ["tests/test_cpp.cc"], - deps = [":upb_descriptor", ":upb", ":upb_pb", ":upb_test"], + deps = [ + ":upb", + ":upb_descriptor", + ":upb_pb", + ":upb_test", + ], ) cc_test( name = "test_table", srcs = ["tests/test_table.cc"], - deps = [":upb", ":upb_test"], + deps = [ + ":upb", + ":upb_test", + ], ) cc_test( name = "test_json", srcs = [ - "tests/json/test_json.cc", - "tests/json/test.upbdefs.h", "tests/json/test.upbdefs.c", + "tests/json/test.upbdefs.h", + "tests/json/test_json.cc", + ], + deps = [ + ":upb_json", + ":upb_test", ], - deps = [":upb_json", ":upb_test"], ) upb_proto_library( name = "conformance_proto_upb", + upbc = ":upbc", deps = [ "@com_google_protobuf//:conformance_proto", "@com_google_protobuf//:test_messages_proto3_proto", ], - upbc = ":upbc", ) cc_binary( @@ -219,8 +262,8 @@ cc_binary( "tests/conformance_upb.c", ], deps = [ - ":upb", ":conformance_proto_upb", + ":upb", ], ) @@ -234,11 +277,11 @@ sh_test( name = "test_conformance_upb", srcs = ["test_conformance_upb.sh"], data = [ + "tests/conformance_upb_failures.txt", ":conformance_upb", + "@bazel_tools//tools/bash/runfiles", "@com_google_protobuf//:conformance_test_runner", - "tests/conformance_upb_failures.txt", - "@bazel_tools//tools/bash/runfiles" - ] + ], ) # Lua libraries. ############################################################### @@ -262,8 +305,8 @@ lua_cclibrary( lua_library( name = "lua/upb", srcs = ["upb/bindings/lua/upb.lua"], - strip_prefix = "upb/bindings/lua", luadeps = ["lua/upb_c"], + strip_prefix = "upb/bindings/lua", ) lua_cclibrary( @@ -276,11 +319,11 @@ lua_cclibrary( lua_library( name = "lua/upb/table", srcs = ["upb/bindings/lua/upb/table.lua"], - strip_prefix = "upb/bindings/lua", luadeps = [ "lua/upb", "lua/upb/table_c", ], + strip_prefix = "upb/bindings/lua", ) lua_cclibrary( @@ -293,11 +336,11 @@ lua_cclibrary( lua_library( name = "lua/upb/pb", srcs = ["upb/bindings/lua/upb/pb.lua"], - strip_prefix = "upb/bindings/lua", luadeps = [ "lua/upb", "lua/upb/pb_c", ], + strip_prefix = "upb/bindings/lua", ) lua_library( @@ -306,25 +349,25 @@ lua_library( "tools/dump_cinit.lua", "tools/make_c_api.lua", ], - strip_prefix = "tools", luadeps = [ "lua/upb", "lua/upb/table", ], + strip_prefix = "tools", ) # Lua tests. ################################################################### lua_test( name = "lua/test_upb", - luamain = "tests/bindings/lua/test_upb.lua", luadeps = ["lua/upb"], + luamain = "tests/bindings/lua/test_upb.lua", ) lua_test( name = "lua/test_upb_pb", - luamain = "tests/bindings/lua/test_upb.pb.lua", luadeps = ["lua/upb/pb"], + luamain = "tests/bindings/lua/test_upb.pb.lua", ) # upb compiler ################################################################# @@ -337,14 +380,35 @@ lua_binary( luamain = "tools/upbc.lua", ) +# Test the CMake build ######################################################### + +make_shell_script( + name = "gen_run_cmake_build", + out = "run_cmake_build.sh", + contents = "mkdir build && cd build && cmake .. && make -j8" +) + +sh_test( + name = "cmake_build", + srcs = ["run_cmake_build.sh"], + data = glob([ + "CMakeLists.txt", + "google/**/*", + "upb/**/*", + "tests/**/*", + ]) + [ + "@bazel_tools//tools/bash/runfiles", + ], +) + # Generated files ############################################################## -exports_files(["staleness_test.py"]) +exports_files(["tools/staleness_test.py"]) py_library( name = "staleness_test_lib", testonly = 1, - srcs = ["staleness_test_lib.py"], + srcs = ["tools/staleness_test_lib.py"], ) genrule( @@ -363,51 +427,64 @@ genrule( proto_library( name = "upb_descriptor_proto", srcs = [ - "upb/descriptor/descriptor.proto" + "upb/descriptor/descriptor.proto", ], ) +py_binary( + name = "make_cmakelists", + srcs = ["tools/make_cmakelists.py"], +) + +genrule( + name = "gen_cmakelists", + outs = ["generated/CMakeLists.txt"], + srcs = ["BUILD", "WORKSPACE"], + tools = [":make_cmakelists"], + cmd = "$(location :make_cmakelists) $@" +) + genrule( name = "copy_upb_descriptor_pb", - outs = ["generated/upb/descriptor/descriptor.pb"], srcs = [":upb_descriptor_proto"], + outs = ["generated/upb/descriptor/descriptor.pb"], cmd = "cp $< $@", ) genrule( name = "generate_old_upbdefs", srcs = ["generated/upb/descriptor/descriptor.pb"], - tools = [":upbc"], outs = [ "generated/upb/descriptor/descriptor.upbdefs.h", "generated/upb/descriptor/descriptor.upbdefs.c", ], cmd = "UPBC=$$PWD/$(location :upbc); INFILE=$$PWD/$<; cd $(GENDIR)/generated && $$UPBC --generate-upbdefs $$INFILE", + tools = [":upbc"], ) proto_library( name = "google_descriptor_proto", srcs = [ - "google/protobuf/descriptor.proto" + "google/protobuf/descriptor.proto", ], ) genrule( name = "copy_google_descriptor_pb", - outs = ["generated/google/protobuf/descriptor.pb"], srcs = [":google_descriptor_proto"], + outs = ["generated/google/protobuf/descriptor.pb"], cmd = "cp $< $@", ) genrule( name = "generate_descriptor_c", srcs = ["generated/google/protobuf/descriptor.pb"], - tools = [":upbc"], outs = [ "generated/google/protobuf/descriptor.upb.h", "generated/google/protobuf/descriptor.upb.c", ], cmd = "UPBC=$$PWD/$(location :upbc); INFILE=$$PWD/$<; cd $(GENDIR)/generated && $$UPBC $$INFILE", + tools = [":upbc"], ) proto_library( @@ -425,35 +502,36 @@ genrule( genrule( name = "generated_json_test_proto_upbdefs", srcs = ["generated/tests/json/test.proto.pb"], - tools = [":upbc"], outs = [ "generated/tests/json/test.upbdefs.h", "generated/tests/json/test.upbdefs.c", ], cmd = "UPBC=$$PWD/$(location :upbc); INFILE=$$PWD/$<; cd $(GENDIR)/generated && $$UPBC --generate-upbdefs $$INFILE", + tools = [":upbc"], ) genrule( name = "generate_json_ragel", srcs = ["upb/json/parser.rl"], outs = ["generated/upb/json/parser.c"], - tools = ["@ragel//:ragel"], cmd = "$(location @ragel//:ragel) -C -o upb/json/parser.c $< && mv upb/json/parser.c $@", + tools = ["@ragel"], ) generated_file_staleness_test( name = "test_generated_files", outs = [ - "google/protobuf/descriptor.upb.h", + "CMakeLists.txt", "google/protobuf/descriptor.upb.c", - "upb/pb/compile_decoder_x64.h", - "upb/descriptor/descriptor.upbdefs.c", + "google/protobuf/descriptor.upb.h", + "tests/json/test.proto.pb", + "tests/json/test.upbdefs.c", + "tests/json/test.upbdefs.h", "upb/descriptor/descriptor.pb", + "upb/descriptor/descriptor.upbdefs.c", "upb/descriptor/descriptor.upbdefs.h", "upb/json/parser.c", - "tests/json/test.upbdefs.c", - "tests/json/test.upbdefs.h", - "tests/json/test.proto.pb", + "upb/pb/compile_decoder_x64.h", ], generated_pattern = "generated/%s", ) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba572fa..5c6d5fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +# This file was generated from BUILD using tools/make_cmakelists.py. cmake_minimum_required(VERSION 3.1) @@ -9,16 +10,14 @@ endif() cmake_minimum_required (VERSION 3.0) cmake_policy(SET CMP0048 NEW) -project (upb) + +project(upb) + # Prevent CMake from setting -rdynamic on Linux (!!). SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") -# Options we define for users. -option(UPB_ENABLE_ASAN "Enable address sanitizer." OFF) -option(UPB_ENABLE_UBSAN "Enable undefined behavior sanitizer." OFF) - # Set default build type. if(NOT CMAKE_BUILD_TYPE) message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.") @@ -51,8 +50,6 @@ endif() include_directories(.) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -set(CMAKE_CXX_FLAGS "-std=c++11 -W -Wall -Wno-sign-compare") -set(CMAKE_C_FLAGS "-std=c89 -W -Wall -Wno-sign-compare") if(APPLE) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -flat_namespace") @@ -60,250 +57,132 @@ elseif(UNIX) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") endif() -FIND_PACKAGE(Lua) -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/third_party/protobuf/Makefile.am") - set(PROTOBUF_FOUND TRUE) -endif() -find_program(RAGEL NAMES ragel) - -if(LUA_FOUND) - include_directories(${LUA_INCLUDE_DIR}) - - add_library(upb_c SHARED - upb/bindings/lua/upb.c - upb/bindings/lua/def.c - upb/bindings/lua/msg.c - ) - target_link_libraries(upb_c LINK_PRIVATE - upbpb_pic - upbdef_pic - upbhandlers_pic upb_pic ) - - add_library(table_c SHARED - upb/bindings/lua/upb/table.c - ) - target_link_libraries(table_c LINK_PRIVATE upb_c upb_pic) - - add_library(pb_c SHARED - upb/bindings/lua/upb/pb.c - ) - target_link_libraries(pb_c LINK_PRIVATE upb_c upbpb_pic) - - set_target_properties(upb_c - PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "lua" - PREFIX "" - SUFFIX ".so") - set_target_properties(table_c pb_c - PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "lua/upb" - PREFIX "" - SUFFIX ".so") - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tools/upbc - DEPENDS ${CMAKE_SOURCE_DIR}/tools/upbc - ${CMAKE_SOURCE_DIR}/tools/upbc.lua - ${CMAKE_SOURCE_DIR}/tools/dump_cinit.lua - ${CMAKE_SOURCE_DIR}/tools/make_c_api.lua - ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb.lua - ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/table.lua - ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/pb.lua - upb_c - table_c - pb_c - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/tools/upbc - ${CMAKE_SOURCE_DIR}/tools/upbc.lua - ${CMAKE_SOURCE_DIR}/tools/dump_cinit.lua - ${CMAKE_SOURCE_DIR}/tools/make_c_api.lua - ${CMAKE_CURRENT_BINARY_DIR}/tools) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lua/upb.lua - DEPENDS ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb.lua - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb.lua - ${CMAKE_CURRENT_BINARY_DIR}/lua) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lua/upb/table.lua - ${CMAKE_CURRENT_BINARY_DIR}/lua/upb/pb.lua - DEPENDS ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/table.lua - ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/pb.lua - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/table.lua - ${CMAKE_SOURCE_DIR}/upb/bindings/lua/upb/pb.lua - ${CMAKE_CURRENT_BINARY_DIR}/lua/upb) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/upb/pb/compile_decoder_x64.h - DEPENDS upb/pb/compile_decoder_x64.dasc - COMMAND - cd ${CMAKE_CURRENT_SOURCE_DIR} && - lua third_party/dynasm/dynasm.lua - -c upb/pb/compile_decoder_x64.dasc - > ${CMAKE_CURRENT_BINARY_DIR}/upb/pb/compile_decoder_x64.h - ) - - add_custom_target( - upbc ALL - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tools/make_c_api.lua - ${CMAKE_CURRENT_SOURCE_DIR}/tools/upbc.lua - ${CMAKE_CURRENT_BINARY_DIR}/tools/upbc - ${CMAKE_CURRENT_BINARY_DIR}/lua/upb.lua - ${CMAKE_CURRENT_BINARY_DIR}/lua/upb/pb.lua - ) - - add_custom_target( - genfiles2 ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/upb/pb/compile_decoder_x64.h - ) - - add_test( - NAME testlua - COMMAND lua ${CMAKE_SOURCE_DIR}/tests/bindings/lua/test_upb.lua - ${CMAKE_SOURCE_DIR}/tests/bindings/lua/test_upb.pb.lua - ) - set_property(TEST testlua PROPERTY ENVIRONMENT - LUA_PATH=${CMAKE_SOURCE_DIR}/third_party/lunit/?.lua$${CMAKE_SOURCE_DIR}/upb/bindings/lua/?.lua - LUA_CPATH=${CMAKE_BINARY_DIR}/upb/bindings/lua/?.so - ) - set_tests_properties(testlua - PROPERTIES - DEPENDS "upb_c;pb_c" - ) - enable_testing() -endif() - -if(LUA_FOUND AND PROTOBUF_FOUND) - set(protobuf_BUILD_TESTS OFF CACHE BOOL "enable tests for proto2" FORCE) - set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "enable shared libs for proto2" FORCE) - set(protobuf_BUILD_CONFORMANCE ON CACHE BOOL "Build conformance tests" FORCE) - add_subdirectory(third_party/protobuf/cmake) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/conformance.upb.h - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/test_messages_proto3.upb.h - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/test_messages_proto3.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/any.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/duration.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/field_mask.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/struct.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/timestamp.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/wrappers.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/conformance.upb.c - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tools/upbc - ${CMAKE_CURRENT_SOURCE_DIR}/third_party/protobuf/conformance/conformance.proto - COMMAND protoc --include_imports - ${CMAKE_CURRENT_SOURCE_DIR}/third_party/protobuf/conformance/conformance.proto - ${CMAKE_CURRENT_SOURCE_DIR}/third_party/protobuf/src/google/protobuf/test_messages_proto3.proto - -I${CMAKE_CURRENT_SOURCE_DIR}/third_party/protobuf/conformance - -I${CMAKE_CURRENT_SOURCE_DIR}/third_party/protobuf/src - -o${CMAKE_CURRENT_BINARY_DIR}/conformance.pb && - tools/upbc ${CMAKE_CURRENT_BINARY_DIR}/conformance.pb - ) - - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.h - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.c - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tools/upbc - ${CMAKE_CURRENT_SOURCE_DIR}/google/protobuf/descriptor.proto - COMMAND protoc - ${CMAKE_CURRENT_SOURCE_DIR}/google/protobuf/descriptor.proto - -I${CMAKE_CURRENT_SOURCE_DIR} - -o${CMAKE_CURRENT_BINARY_DIR}/descriptor.pb && - tools/upbc ${CMAKE_CURRENT_BINARY_DIR}/descriptor.pb - ) - - add_custom_target( - genfiles ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/conformance.upb.h - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.h - ) - - add_executable(conformance_upb - tests/conformance_upb.c - ${CMAKE_CURRENT_BINARY_DIR}/conformance.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/test_messages_proto3.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/any.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/duration.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/field_mask.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/struct.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/timestamp.upb.c - ${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/wrappers.upb.c - ) - target_link_libraries(conformance_upb LINK_PRIVATE - upb - ) - - add_custom_target( - conformance - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/conformance_upb - ${CMAKE_CURRENT_BINARY_DIR}/third_party/protobuf/cmake/conformance_test_runner - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/third_party/protobuf/cmake/conformance_test_runner ${CMAKE_CURRENT_BINARY_DIR}/conformance_upb - ) - -endif() - -if (RAGEL) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/upb/json/parser.c - DEPENDS upb/json/parser.rl - COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && RAGEL -C -o ${CMAKE_CURRENT_BINARY_DIR}/upb/json/parser.c upb/json/parser.rl - ) -endif() - -configure_file(tools/copy_genfiles.sh.in tools/copy_genfiles.sh) - -set(UPB_SRCS - upb/decode.c - upb/encode.c - upb/msg.c - upb/table.c - upb/upb.c -) - -set (UPBDEF_SRCS - upb/descriptor/descriptor.upbdefs.c - upb/descriptor/reader.c - upb/def.c - upb/msgfactory.c - upb/refcounted.c -) - -set(UPBHANDLERS_SRCS - upb/sink.c - upb/handlers.c -) - -set(UPBPB_SRCS +enable_testing() + +add_library(upb + google/protobuf/descriptor.upb.c + upb/decode.c + upb/def.c + upb/encode.c + upb/handlers.c + upb/handlers-inl.h + upb/msg.c + upb/msgfactory.c + upb/port_def.inc + upb/port_undef.inc + upb/refcounted.c + upb/sink.c + upb/structdefs.int.h + upb/structs.int.h + upb/table.c + upb/table.int.h + upb/upb.c + google/protobuf/descriptor.upb.h + upb/decode.h + upb/def.h + upb/encode.h + upb/handlers.h + upb/msg.h + upb/msgfactory.h + upb/refcounted.h + upb/sink.h + upb/upb.h) +add_library(upb_descriptor + upb/descriptor/descriptor.upbdefs.c + upb/descriptor/reader.c + upb/descriptor/descriptor.upbdefs.h + upb/descriptor/reader.h) +target_link_libraries(upb_descriptor + upb) +add_library(upb_pb upb/pb/compile_decoder.c upb/pb/decoder.c + upb/pb/decoder.int.h upb/pb/encoder.c upb/pb/glue.c upb/pb/textprinter.c upb/pb/varint.c -) - -set(UPBJSON_SRCS + upb/pb/varint.int.h + upb/pb/decoder.h + upb/pb/encoder.h + upb/pb/glue.h + upb/pb/textprinter.h) +target_link_libraries(upb_pb + upb + upb_descriptor) +add_library(upb_json upb/json/parser.c upb/json/printer.c -) - -add_library(upb ${UPB_SRCS}) -add_library(upbdef ${UPBDEF_SRCS}) -add_library(upbhandlers ${UPBHANDLERS_SRCS}) -add_library(upbpb ${UPBPB_SRCS}) -add_library(upbjson ${UPBJSON_SRCS}) - -add_library(upb_pic ${UPB_SRCS}) -add_library(upbdef_pic ${UPBDEF_SRCS}) -add_library(upbhandlers_pic ${UPBHANDLERS_SRCS}) -add_library(upbpb_pic ${UPBPB_SRCS}) -add_library(upbjson_pic ${UPBJSON_SRCS}) + upb/json/parser.h + upb/json/printer.h) +target_link_libraries(upb_json + upb) +add_library(upb_cc_bindings + upb/bindings/stdc++/string.h) +target_link_libraries(upb_cc_bindings + upb) +set_target_properties(upb_cc_bindings PROPERTIES LINKER_LANGUAGE CXX) +add_library(upb_test + tests/testmain.cc + tests/test_util.h + tests/upb_test.h) +add_executable(test_varint + tests/pb/test_varint.c) +add_test(NAME test_varint COMMAND test_varint) +target_link_libraries(test_varint + upb_pb + upb_test) +add_executable(test_def + tests/test_def.c) +add_test(NAME test_def COMMAND test_def) +target_link_libraries(test_def + upb_pb + upb_test) +add_executable(test_handlers + tests/test_handlers.c) +add_test(NAME test_handlers COMMAND test_handlers) +target_link_libraries(test_handlers + upb_pb + upb_test) +add_executable(test_decoder + tests/pb/test_decoder.cc) +add_test(NAME test_decoder COMMAND test_decoder) +target_link_libraries(test_decoder + upb_pb + upb_test) +add_executable(test_encoder + tests/pb/test_encoder.cc) +add_test(NAME test_encoder COMMAND test_encoder) +add_custom_command( + TARGET test_encoder POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/upb/descriptor/descriptor.pb + ${CMAKE_CURRENT_BINARY_DIR}/upb/descriptor/descriptor.pb) +target_link_libraries(test_encoder + upb_cc_bindings + upb_pb + upb_test) +add_executable(test_cpp + tests/test_cpp.cc) +add_test(NAME test_cpp COMMAND test_cpp) +target_link_libraries(test_cpp + upb + upb_descriptor + upb_pb + upb_test) +add_executable(test_table + tests/test_table.cc) +add_test(NAME test_table COMMAND test_table) +target_link_libraries(test_table + upb + upb_test) +add_executable(test_json + tests/json/test.upbdefs.c + tests/json/test.upbdefs.h + tests/json/test_json.cc) +add_test(NAME test_json COMMAND test_json) +target_link_libraries(test_json + upb_json + upb_test) -set_property(TARGET upb_pic PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET upbdef_pic PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET upbhandlers_pic PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET upbpb_pic PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET upbjson_pic PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/build_defs.bzl b/build_defs.bzl index 8df5660..0e58bbb 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -131,7 +131,7 @@ def generated_file_staleness_test(name, outs, generated_pattern): """ script_name = name + ".py" - script_src = "//:staleness_test.py" + script_src = "//:tools/staleness_test.py" # Filter out non-existing rules so Blaze doesn't error out before we even # run the test. diff --git a/staleness_test.py b/staleness_test.py deleted file mode 100644 index 43176cf..0000000 --- a/staleness_test.py +++ /dev/null @@ -1,30 +0,0 @@ -"""The py_test() script for generated_file_staleness_test() rules. - -Note that this file is preprocessed! The INSERT_<...> text below is replaced -with the actual list of files before we actually run the script. -""" - -from __future__ import absolute_import - -import staleness_test_lib -import unittest -import sys - -file_list = """ - INSERT_FILE_LIST_HERE -""".split() - -config = staleness_test_lib.Config(file_list) - - -class TestFilesMatch(unittest.TestCase): - - def testFilesMatch(self): - errors = staleness_test_lib.CheckFilesMatch(config) - self.assertFalse(errors, errors) - - -if len(sys.argv) > 1 and sys.argv[1] == "--fix": - staleness_test_lib.FixFiles(config) -else: - unittest.main() diff --git a/staleness_test_lib.py b/staleness_test_lib.py deleted file mode 100644 index 6d5c3d3..0000000 --- a/staleness_test_lib.py +++ /dev/null @@ -1,158 +0,0 @@ -"""Shared code for validating generated_file_staleness_test() rules. - -This code is used by test scripts generated from -generated_file_staleness_test() rules. -""" - -from __future__ import absolute_import -from __future__ import print_function - -import os -from shutil import copyfile - - -class _FilePair(object): - """Represents a single (target, generated) file pair.""" - - def __init__(self, target, generated): - self.target = target - self.generated = generated - - -class Config(object): - """Represents the configuration for a single staleness test target.""" - - def __init__(self, file_list): - # Duplicate to avoid modifying our arguments. - file_list = list(file_list) - - # The file list contains a few other bits of information at the end. - # This is packed by the code in build_defs.bzl. - self.target_name = file_list.pop() - self.package_name = file_list.pop() - self.pattern = file_list.pop() - - self.file_list = file_list - - -def _GetFilePairs(config): - """Generates the list of file pairs. - - Args: - config: a Config object representing this target's config. - - Returns: - A list of _FilePair objects. - """ - - ret = [] - - has_bazel_genfiles = os.path.exists("bazel-genfiles") - - for filename in config.file_list: - target = os.path.join(config.package_name, filename) - generated = os.path.join(config.package_name, config.pattern % filename) - if has_bazel_genfiles: - generated = os.path.join("bazel-genfiles", generated) - - # Generated files should always exist. Blaze should guarantee this before - # we are run. - if not os.path.isfile(generated): - print("Generated file '%s' does not exist." % generated) - print("Please run this command to generate it:") - print(" bazel build %s:%s" % (config.package_name, config.target_name)) - ret.append(_FilePair(target, generated)) - - return ret - - -def _GetMissingAndStaleFiles(file_pairs): - """Generates lists of missing and stale files. - - Args: - file_pairs: a list of _FilePair objects. - - Returns: - missing_files: a list of _FilePair objects representing missing files. - These target files do not exist at all. - stale_files: a list of _FilePair objects representing stale files. - These target files exist but have stale contents. - """ - - missing_files = [] - stale_files = [] - - for pair in file_pairs: - if not os.path.isfile(pair.target): - missing_files.append(pair) - continue - - generated = open(pair.generated).read() - target = open(pair.target).read() - if generated != target: - stale_files.append(pair) - - return missing_files, stale_files - - -def _CopyFiles(file_pairs): - """Copies all generated files to the corresponding target file. - - The target files must be writable already. - - Args: - file_pairs: a list of _FilePair objects that we want to copy. - """ - - for pair in file_pairs: - target_dir = os.path.dirname(pair.target) - if not os.path.isdir(target_dir): - os.makedirs(target_dir) - copyfile(pair.generated, pair.target) - - -def FixFiles(config): - """Implements the --fix option: overwrites missing or out-of-date files. - - Args: - config: the Config object for this test. - """ - - file_pairs = _GetFilePairs(config) - missing_files, stale_files = _GetMissingAndStaleFiles(file_pairs) - - _CopyFiles(stale_files + missing_files) - - -def CheckFilesMatch(config): - """Checks whether each target file matches the corresponding generated file. - - Args: - config: the Config object for this test. - - Returns: - None if everything matches, otherwise a string error message. - """ - - diff_errors = [] - - file_pairs = _GetFilePairs(config) - missing_files, stale_files = _GetMissingAndStaleFiles(file_pairs) - - for pair in missing_files: - diff_errors.append("File %s does not exist" % pair.target) - continue - - for pair in stale_files: - diff_errors.append("File %s is out of date" % pair.target) - - if diff_errors: - error_msg = "Files out of date!\n\n" - error_msg += "To fix run THIS command:\n" - error_msg += " bazel-bin/%s/%s --fix\n\n" % (config.package_name, - config.target_name) - error_msg += "Errors:\n" - error_msg += " " + "\n ".join(diff_errors) - return error_msg - else: - return None diff --git a/tools/make_cmakelists.py b/tools/make_cmakelists.py new file mode 100755 index 0000000..30e1b93 --- /dev/null +++ b/tools/make_cmakelists.py @@ -0,0 +1,234 @@ +#!/usr/bin/env python + +"""TODO(haberman): DO NOT SUBMIT without one-line documentation for make_cmakelists. + +TODO(haberman): DO NOT SUBMIT without a detailed description of make_cmakelists. +""" + +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function + +import sys +import textwrap + +def StripColons(deps): + return map(lambda x: x[1:], deps) + +def IsSourceFile(name): + return name.endswith(".c") or name.endswith(".cc") + +class BuildFileFunctions(object): + def __init__(self, converter): + self.converter = converter + + def _add_deps(self, kwargs): + if "deps" not in kwargs: + return + self.converter.toplevel += "target_link_libraries(%s\n %s)\n" % ( + kwargs["name"], + "\n ".join(StripColons(kwargs["deps"])) + ) + + def load(self, *args): + pass + + def cc_library(self, **kwargs): + if kwargs["name"] == "amalgamation": + return + files = kwargs.get("srcs", []) + kwargs.get("hdrs", []) + self.converter.toplevel += "add_library(%s\n %s)\n" % ( + kwargs["name"], + "\n ".join(files) + ) + self._add_deps(kwargs) + + # CMake wants to know if each library is C or C++. + # If there are only .h files, it can't infer. Assume C++. + if not filter(IsSourceFile, files): + line = "set_target_properties(%s PROPERTIES LINKER_LANGUAGE CXX)\n" + self.converter.toplevel += line % (kwargs["name"]) + + def cc_binary(self, **kwargs): + pass + + def cc_test(self, **kwargs): + self.converter.toplevel += "add_executable(%s\n %s)\n" % ( + kwargs["name"], + "\n ".join(kwargs["srcs"]) + ) + self.converter.toplevel += "add_test(NAME %s COMMAND %s)\n" % ( + kwargs["name"], + kwargs["name"], + ) + + if "data" in kwargs: + for data_dep in kwargs["data"]: + self.converter.toplevel += textwrap.dedent("""\ + add_custom_command( + TARGET %s POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/%s + ${CMAKE_CURRENT_BINARY_DIR}/%s)\n""" % ( + kwargs["name"], data_dep, data_dep + )) + + self._add_deps(kwargs) + + def py_library(self, **kwargs): + pass + + def py_binary(self, **kwargs): + pass + + def lua_cclibrary(self, **kwargs): + pass + + def lua_library(self, **kwargs): + pass + + def lua_binary(self, **kwargs): + pass + + def lua_test(self, **kwargs): + pass + + def sh_test(self, **kwargs): + pass + + def make_shell_script(self, **kwargs): + pass + + def exports_files(self, files, **kwargs): + pass + + def proto_library(self, **kwargs): + pass + + def generated_file_staleness_test(self, **kwargs): + pass + + def upb_amalgamation(self, **kwargs): + pass + + def upb_proto_library(self, **kwargs): + pass + + def genrule(self, **kwargs): + pass + + def glob(*args): + return [] + + +class WorkspaceFileFunctions(object): + def __init__(self, converter): + self.converter = converter + + def load(self, *args): + pass + + def workspace(self, **kwargs): + self.converter.prelude += "project(%s)\n" % (kwargs["name"]) + + def http_archive(self, **kwargs): + pass + + def git_repository(self, **kwargs): + pass + + +class Converter(object): + def __init__(self): + self.prelude = "" + self.toplevel = "" + self.if_lua = "" + + def convert(self): + return self.template % { + "prelude": converter.prelude, + "toplevel": converter.toplevel, + } + + template = textwrap.dedent("""\ + # This file was generated from BUILD using tools/make_cmakelists.py. + + cmake_minimum_required(VERSION 3.1) + + if(${CMAKE_VERSION} VERSION_LESS 3.12) + cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) + else() + cmake_policy(VERSION 3.12) + endif() + + cmake_minimum_required (VERSION 3.0) + cmake_policy(SET CMP0048 NEW) + + %(prelude)s + + # Prevent CMake from setting -rdynamic on Linux (!!). + SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") + SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") + + # Set default build type. + if(NOT CMAKE_BUILD_TYPE) + message(STATUS "Setting build type to 'RelWithDebInfo' as none was specified.") + set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING + "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." + FORCE) + endif() + + # When using Ninja, compiler output won't be colorized without this. + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG(-fdiagnostics-color=always SUPPORTS_COLOR_ALWAYS) + if(SUPPORTS_COLOR_ALWAYS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") + endif() + + # Implement ASAN/UBSAN options + if(UPB_ENABLE_ASAN) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address") + endif() + + if(UPB_ENABLE_UBSAN) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address") + endif() + + include_directories(.) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + if(APPLE) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup -flat_namespace") + elseif(UNIX) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") + endif() + + enable_testing() + + %(toplevel)s + + """) + +data = {} +converter = Converter() + +def GetDict(obj): + ret = {} + for k in dir(obj): + if not k.startswith("_"): + ret[k] = getattr(obj, k); + return ret + +globs = GetDict(converter) + +execfile("WORKSPACE", GetDict(WorkspaceFileFunctions(converter))) +execfile("BUILD", GetDict(BuildFileFunctions(converter))) + +with open(sys.argv[1], "w") as f: + f.write(converter.convert()) diff --git a/tools/staleness_test.py b/tools/staleness_test.py new file mode 100644 index 0000000..045cd1a --- /dev/null +++ b/tools/staleness_test.py @@ -0,0 +1,30 @@ +"""The py_test() script for generated_file_staleness_test() rules. + +Note that this file is preprocessed! The INSERT_<...> text below is replaced +with the actual list of files before we actually run the script. +""" + +from __future__ import absolute_import + +from tools import staleness_test_lib +import unittest +import sys + +file_list = """ + INSERT_FILE_LIST_HERE +""".split() + +config = staleness_test_lib.Config(file_list) + + +class TestFilesMatch(unittest.TestCase): + + def testFilesMatch(self): + errors = staleness_test_lib.CheckFilesMatch(config) + self.assertFalse(errors, errors) + + +if len(sys.argv) > 1 and sys.argv[1] == "--fix": + staleness_test_lib.FixFiles(config) +else: + unittest.main() diff --git a/tools/staleness_test_lib.py b/tools/staleness_test_lib.py new file mode 100644 index 0000000..6d5c3d3 --- /dev/null +++ b/tools/staleness_test_lib.py @@ -0,0 +1,158 @@ +"""Shared code for validating generated_file_staleness_test() rules. + +This code is used by test scripts generated from +generated_file_staleness_test() rules. +""" + +from __future__ import absolute_import +from __future__ import print_function + +import os +from shutil import copyfile + + +class _FilePair(object): + """Represents a single (target, generated) file pair.""" + + def __init__(self, target, generated): + self.target = target + self.generated = generated + + +class Config(object): + """Represents the configuration for a single staleness test target.""" + + def __init__(self, file_list): + # Duplicate to avoid modifying our arguments. + file_list = list(file_list) + + # The file list contains a few other bits of information at the end. + # This is packed by the code in build_defs.bzl. + self.target_name = file_list.pop() + self.package_name = file_list.pop() + self.pattern = file_list.pop() + + self.file_list = file_list + + +def _GetFilePairs(config): + """Generates the list of file pairs. + + Args: + config: a Config object representing this target's config. + + Returns: + A list of _FilePair objects. + """ + + ret = [] + + has_bazel_genfiles = os.path.exists("bazel-genfiles") + + for filename in config.file_list: + target = os.path.join(config.package_name, filename) + generated = os.path.join(config.package_name, config.pattern % filename) + if has_bazel_genfiles: + generated = os.path.join("bazel-genfiles", generated) + + # Generated files should always exist. Blaze should guarantee this before + # we are run. + if not os.path.isfile(generated): + print("Generated file '%s' does not exist." % generated) + print("Please run this command to generate it:") + print(" bazel build %s:%s" % (config.package_name, config.target_name)) + ret.append(_FilePair(target, generated)) + + return ret + + +def _GetMissingAndStaleFiles(file_pairs): + """Generates lists of missing and stale files. + + Args: + file_pairs: a list of _FilePair objects. + + Returns: + missing_files: a list of _FilePair objects representing missing files. + These target files do not exist at all. + stale_files: a list of _FilePair objects representing stale files. + These target files exist but have stale contents. + """ + + missing_files = [] + stale_files = [] + + for pair in file_pairs: + if not os.path.isfile(pair.target): + missing_files.append(pair) + continue + + generated = open(pair.generated).read() + target = open(pair.target).read() + if generated != target: + stale_files.append(pair) + + return missing_files, stale_files + + +def _CopyFiles(file_pairs): + """Copies all generated files to the corresponding target file. + + The target files must be writable already. + + Args: + file_pairs: a list of _FilePair objects that we want to copy. + """ + + for pair in file_pairs: + target_dir = os.path.dirname(pair.target) + if not os.path.isdir(target_dir): + os.makedirs(target_dir) + copyfile(pair.generated, pair.target) + + +def FixFiles(config): + """Implements the --fix option: overwrites missing or out-of-date files. + + Args: + config: the Config object for this test. + """ + + file_pairs = _GetFilePairs(config) + missing_files, stale_files = _GetMissingAndStaleFiles(file_pairs) + + _CopyFiles(stale_files + missing_files) + + +def CheckFilesMatch(config): + """Checks whether each target file matches the corresponding generated file. + + Args: + config: the Config object for this test. + + Returns: + None if everything matches, otherwise a string error message. + """ + + diff_errors = [] + + file_pairs = _GetFilePairs(config) + missing_files, stale_files = _GetMissingAndStaleFiles(file_pairs) + + for pair in missing_files: + diff_errors.append("File %s does not exist" % pair.target) + continue + + for pair in stale_files: + diff_errors.append("File %s is out of date" % pair.target) + + if diff_errors: + error_msg = "Files out of date!\n\n" + error_msg += "To fix run THIS command:\n" + error_msg += " bazel-bin/%s/%s --fix\n\n" % (config.package_name, + config.target_name) + error_msg += "Errors:\n" + error_msg += " " + "\n ".join(diff_errors) + return error_msg + else: + return None diff --git a/tools/upbc b/tools/upbc deleted file mode 100755 index bd12250..0000000 --- a/tools/upbc +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -BASE=`dirname "$0"` -export LUA_CPATH="$BASE/../lua/?.so" -export LUA_PATH="$BASE/?.lua;$BASE/../lua/?.lua" -lua $BASE/upbc.lua "$@" -- cgit v1.2.3 From 9ce4a77f61c134bbed28bfd5be5cd7dc0e80f5e3 Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Wed, 14 Nov 2018 16:46:19 -0800 Subject: Updates to build system for upb C++ compiler. --- BUILD | 42 +++++++++++++++++++++++++++++++++--------- WORKSPACE | 6 ++++++ build_defs.bzl | 28 ++++++++++++++-------------- tools/make_cmakelists.py | 2 +- 4 files changed, 54 insertions(+), 24 deletions(-) (limited to 'tools') diff --git a/BUILD b/BUILD index 458463e..6503ed0 100644 --- a/BUILD +++ b/BUILD @@ -249,7 +249,7 @@ cc_test( upb_proto_library( name = "conformance_proto_upb", - upbc = ":upbc", + upbc = ":protoc-gen-upb", deps = [ "@com_google_protobuf//:conformance_proto", "@com_google_protobuf//:test_messages_proto3_proto", @@ -373,13 +373,33 @@ lua_test( # upb compiler ################################################################# lua_binary( - name = "upbc", + name = "lua_upbc", luadeps = [ "lua/upbc_lib", ], luamain = "tools/upbc.lua", ) +cc_library( + name = "upbc_generator", + hdrs = ["upbc/generator.h"], + srcs = ["upbc/generator.cc", "upbc/message_layout.h", "upbc/message_layout.cc"], + deps = [ + "@com_google_protobuf//:protobuf", + "@com_google_protobuf//:protoc_lib", + "@absl//absl/strings", + ], +) + +cc_binary( + name = "protoc-gen-upb", + srcs = ["upbc/main.cc"], + deps = [ + ":upbc_generator", + "@com_google_protobuf//:protoc_lib", + ], +) + # Test the CMake build ######################################################### make_shell_script( @@ -394,6 +414,7 @@ sh_test( data = glob([ "CMakeLists.txt", "google/**/*", + "upbc/**/*", "upb/**/*", "tests/**/*", ]) + [ @@ -458,8 +479,8 @@ genrule( "generated/upb/descriptor/descriptor.upbdefs.h", "generated/upb/descriptor/descriptor.upbdefs.c", ], - cmd = "UPBC=$$PWD/$(location :upbc); INFILE=$$PWD/$<; cd $(GENDIR)/generated && $$UPBC --generate-upbdefs $$INFILE", - tools = [":upbc"], + cmd = "UPBC=$$PWD/$(location :lua_upbc); INFILE=$$PWD/$<; cd $(GENDIR)/generated && $$UPBC --generate-upbdefs $$INFILE", + tools = [":lua_upbc"], ) proto_library( @@ -478,13 +499,16 @@ genrule( genrule( name = "generate_descriptor_c", - srcs = ["generated/google/protobuf/descriptor.pb"], + srcs = ["google/protobuf/descriptor.proto"], outs = [ "generated/google/protobuf/descriptor.upb.h", "generated/google/protobuf/descriptor.upb.c", ], - cmd = "UPBC=$$PWD/$(location :upbc); INFILE=$$PWD/$<; cd $(GENDIR)/generated && $$UPBC $$INFILE", - tools = [":upbc"], + cmd = "$(location @com_google_protobuf//:protoc) $< --upb_out=$(GENDIR)/generated --plugin=protoc-gen-upb=$(location :protoc-gen-upb)", + tools = [ + "@com_google_protobuf//:protoc", + ":protoc-gen-upb" + ], ) proto_library( @@ -506,8 +530,8 @@ genrule( "generated/tests/json/test.upbdefs.h", "generated/tests/json/test.upbdefs.c", ], - cmd = "UPBC=$$PWD/$(location :upbc); INFILE=$$PWD/$<; cd $(GENDIR)/generated && $$UPBC --generate-upbdefs $$INFILE", - tools = [":upbc"], + cmd = "UPBC=$$PWD/$(location :lua_upbc); INFILE=$$PWD/$<; cd $(GENDIR)/generated && $$UPBC --generate-upbdefs $$INFILE", + tools = [":lua_upbc"], ) genrule( diff --git a/WORKSPACE b/WORKSPACE index b4d19c5..8d20852 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -23,6 +23,12 @@ git_repository( #tag = "conformance-build-tag", ) +git_repository( + name = "absl", + commit = "070f6e47b33a2909d039e620c873204f78809492", + remote = "https://github.com/abseil/abseil-cpp.git", +) + http_archive( name = "ragel", sha256 = "5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f", diff --git a/build_defs.bzl b/build_defs.bzl index 0e58bbb..c1dd422 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -218,31 +218,26 @@ def _remove_up(string): return _remove_suffix(string, ".proto") def _upb_proto_library_srcs_impl(ctx): - descriptors = [] + sources = [] outs = [] + include_dirs = {} for dep in ctx.attr.deps: if hasattr(dep, 'proto'): - for desc in dep.proto.transitive_descriptor_sets: - descriptors.append(desc) for src in dep.proto.transitive_sources: + sources.append(src) + include_dirs[_remove_suffix(src.path, _remove_up(src.short_path) + "." + src.extension)] = True outs.append(ctx.actions.declare_file(_remove_up(src.short_path) + ".upb.h")) outs.append(ctx.actions.declare_file(_remove_up(src.short_path) + ".upb.c")) outdir = _remove_suffix(outs[-1].path, _remove_up(src.short_path) + ".upb.c") - concatenated = ctx.actions.declare_file(ctx.label.name + "_concatenated_descriptor.bin") - descriptor_paths = [d.path for d in descriptors] + source_paths = [d.path for d in sources] + include_args = ["-I" + root for root in include_dirs.keys()] - ctx.actions.run_shell( - inputs = descriptors, - outputs = [concatenated], - progress_message = "Concatenating descriptors", - command = "cat %s > %s" % (" ".join(descriptor_paths), concatenated.path), - ) ctx.actions.run( - inputs = [concatenated], + inputs = [ctx.executable.upbc] + sources, outputs = outs, - executable = ctx.executable.upbc, - arguments = ["--outdir", outdir, concatenated.path], + executable = ctx.executable.protoc, + arguments = ["--upb_out", outdir, "--plugin=protoc-gen-upb=" + ctx.executable.upbc.path] + include_args + source_paths, progress_message = "Generating upb protos", ) @@ -255,6 +250,11 @@ _upb_proto_library_srcs = rule( executable = True, cfg = "host", ), + "protoc": attr.label( + executable = True, + cfg = "host", + default = "@com_google_protobuf//:protoc", + ), "deps": attr.label_list(), } ) diff --git a/tools/make_cmakelists.py b/tools/make_cmakelists.py index 30e1b93..d7996d8 100755 --- a/tools/make_cmakelists.py +++ b/tools/make_cmakelists.py @@ -34,7 +34,7 @@ class BuildFileFunctions(object): pass def cc_library(self, **kwargs): - if kwargs["name"] == "amalgamation": + if kwargs["name"] == "amalgamation" or kwargs["name"] == "upbc_generator": return files = kwargs.get("srcs", []) + kwargs.get("hdrs", []) self.converter.toplevel += "add_library(%s\n %s)\n" % ( -- cgit v1.2.3 From f6c33307c4a708a07994d7ee01ffa1794575861d Mon Sep 17 00:00:00 2001 From: Vishal Powar Date: Tue, 20 Nov 2018 12:21:50 -0800 Subject: Fix tests for generated code --- google/protobuf/descriptor.upb.h | 54 ++++++++++++++++++++-------------------- tools/make_c_api.lua | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'tools') diff --git a/google/protobuf/descriptor.upb.h b/google/protobuf/descriptor.upb.h index 7afa8c5..6289095 100644 --- a/google/protobuf/descriptor.upb.h +++ b/google/protobuf/descriptor.upb.h @@ -128,7 +128,7 @@ typedef enum { extern const upb_msglayout google_protobuf_FileDescriptorSet_msginit; UPB_INLINE google_protobuf_FileDescriptorSet *google_protobuf_FileDescriptorSet_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_FileDescriptorSet_msginit, arena); + return (google_protobuf_FileDescriptorSet *)upb_msg_new(&google_protobuf_FileDescriptorSet_msginit, arena); } UPB_INLINE google_protobuf_FileDescriptorSet *google_protobuf_FileDescriptorSet_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_FileDescriptorSet *ret = google_protobuf_FileDescriptorSet_new(arena); @@ -147,7 +147,7 @@ UPB_INLINE void google_protobuf_FileDescriptorSet_set_file(google_protobuf_FileD extern const upb_msglayout google_protobuf_FileDescriptorProto_msginit; UPB_INLINE google_protobuf_FileDescriptorProto *google_protobuf_FileDescriptorProto_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_FileDescriptorProto_msginit, arena); + return (google_protobuf_FileDescriptorProto *)upb_msg_new(&google_protobuf_FileDescriptorProto_msginit, arena); } UPB_INLINE google_protobuf_FileDescriptorProto *google_protobuf_FileDescriptorProto_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_FileDescriptorProto *ret = google_protobuf_FileDescriptorProto_new(arena); @@ -188,7 +188,7 @@ UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_F extern const upb_msglayout google_protobuf_DescriptorProto_msginit; UPB_INLINE google_protobuf_DescriptorProto *google_protobuf_DescriptorProto_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_DescriptorProto_msginit, arena); + return (google_protobuf_DescriptorProto *)upb_msg_new(&google_protobuf_DescriptorProto_msginit, arena); } UPB_INLINE google_protobuf_DescriptorProto *google_protobuf_DescriptorProto_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_DescriptorProto *ret = google_protobuf_DescriptorProto_new(arena); @@ -225,7 +225,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_set_reserved_name(google_protobu extern const upb_msglayout google_protobuf_DescriptorProto_ExtensionRange_msginit; UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange *google_protobuf_DescriptorProto_ExtensionRange_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_DescriptorProto_ExtensionRange_msginit, arena); + return (google_protobuf_DescriptorProto_ExtensionRange *)upb_msg_new(&google_protobuf_DescriptorProto_ExtensionRange_msginit, arena); } UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange *google_protobuf_DescriptorProto_ExtensionRange_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_DescriptorProto_ExtensionRange *ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena); @@ -248,7 +248,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(googl extern const upb_msglayout google_protobuf_DescriptorProto_ReservedRange_msginit; UPB_INLINE google_protobuf_DescriptorProto_ReservedRange *google_protobuf_DescriptorProto_ReservedRange_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_DescriptorProto_ReservedRange_msginit, arena); + return (google_protobuf_DescriptorProto_ReservedRange *)upb_msg_new(&google_protobuf_DescriptorProto_ReservedRange_msginit, arena); } UPB_INLINE google_protobuf_DescriptorProto_ReservedRange *google_protobuf_DescriptorProto_ReservedRange_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_DescriptorProto_ReservedRange *ret = google_protobuf_DescriptorProto_ReservedRange_new(arena); @@ -269,7 +269,7 @@ UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_pro extern const upb_msglayout google_protobuf_ExtensionRangeOptions_msginit; UPB_INLINE google_protobuf_ExtensionRangeOptions *google_protobuf_ExtensionRangeOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_ExtensionRangeOptions_msginit, arena); + return (google_protobuf_ExtensionRangeOptions *)upb_msg_new(&google_protobuf_ExtensionRangeOptions_msginit, arena); } UPB_INLINE google_protobuf_ExtensionRangeOptions *google_protobuf_ExtensionRangeOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_ExtensionRangeOptions *ret = google_protobuf_ExtensionRangeOptions_new(arena); @@ -288,7 +288,7 @@ UPB_INLINE void google_protobuf_ExtensionRangeOptions_set_uninterpreted_option(g extern const upb_msglayout google_protobuf_FieldDescriptorProto_msginit; UPB_INLINE google_protobuf_FieldDescriptorProto *google_protobuf_FieldDescriptorProto_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_FieldDescriptorProto_msginit, arena); + return (google_protobuf_FieldDescriptorProto *)upb_msg_new(&google_protobuf_FieldDescriptorProto_msginit, arena); } UPB_INLINE google_protobuf_FieldDescriptorProto *google_protobuf_FieldDescriptorProto_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_FieldDescriptorProto *ret = google_protobuf_FieldDescriptorProto_new(arena); @@ -325,7 +325,7 @@ UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protob extern const upb_msglayout google_protobuf_OneofDescriptorProto_msginit; UPB_INLINE google_protobuf_OneofDescriptorProto *google_protobuf_OneofDescriptorProto_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_OneofDescriptorProto_msginit, arena); + return (google_protobuf_OneofDescriptorProto *)upb_msg_new(&google_protobuf_OneofDescriptorProto_msginit, arena); } UPB_INLINE google_protobuf_OneofDescriptorProto *google_protobuf_OneofDescriptorProto_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_OneofDescriptorProto *ret = google_protobuf_OneofDescriptorProto_new(arena); @@ -346,7 +346,7 @@ UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf extern const upb_msglayout google_protobuf_EnumDescriptorProto_msginit; UPB_INLINE google_protobuf_EnumDescriptorProto *google_protobuf_EnumDescriptorProto_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_EnumDescriptorProto_msginit, arena); + return (google_protobuf_EnumDescriptorProto *)upb_msg_new(&google_protobuf_EnumDescriptorProto_msginit, arena); } UPB_INLINE google_protobuf_EnumDescriptorProto *google_protobuf_EnumDescriptorProto_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_EnumDescriptorProto *ret = google_protobuf_EnumDescriptorProto_new(arena); @@ -373,7 +373,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_set_reserved_name(google_pro extern const upb_msglayout google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit; UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange *google_protobuf_EnumDescriptorProto_EnumReservedRange_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena); + return (google_protobuf_EnumDescriptorProto_EnumReservedRange *)upb_msg_new(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena); } UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange *google_protobuf_EnumDescriptorProto_EnumReservedRange_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_EnumDescriptorProto_EnumReservedRange *ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena); @@ -394,7 +394,7 @@ UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(go extern const upb_msglayout google_protobuf_EnumValueDescriptorProto_msginit; UPB_INLINE google_protobuf_EnumValueDescriptorProto *google_protobuf_EnumValueDescriptorProto_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_EnumValueDescriptorProto_msginit, arena); + return (google_protobuf_EnumValueDescriptorProto *)upb_msg_new(&google_protobuf_EnumValueDescriptorProto_msginit, arena); } UPB_INLINE google_protobuf_EnumValueDescriptorProto *google_protobuf_EnumValueDescriptorProto_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_EnumValueDescriptorProto *ret = google_protobuf_EnumValueDescriptorProto_new(arena); @@ -417,7 +417,7 @@ UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_prot extern const upb_msglayout google_protobuf_ServiceDescriptorProto_msginit; UPB_INLINE google_protobuf_ServiceDescriptorProto *google_protobuf_ServiceDescriptorProto_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_ServiceDescriptorProto_msginit, arena); + return (google_protobuf_ServiceDescriptorProto *)upb_msg_new(&google_protobuf_ServiceDescriptorProto_msginit, arena); } UPB_INLINE google_protobuf_ServiceDescriptorProto *google_protobuf_ServiceDescriptorProto_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_ServiceDescriptorProto *ret = google_protobuf_ServiceDescriptorProto_new(arena); @@ -440,7 +440,7 @@ UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protob extern const upb_msglayout google_protobuf_MethodDescriptorProto_msginit; UPB_INLINE google_protobuf_MethodDescriptorProto *google_protobuf_MethodDescriptorProto_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_MethodDescriptorProto_msginit, arena); + return (google_protobuf_MethodDescriptorProto *)upb_msg_new(&google_protobuf_MethodDescriptorProto_msginit, arena); } UPB_INLINE google_protobuf_MethodDescriptorProto *google_protobuf_MethodDescriptorProto_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_MethodDescriptorProto *ret = google_protobuf_MethodDescriptorProto_new(arena); @@ -469,7 +469,7 @@ UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(googl extern const upb_msglayout google_protobuf_FileOptions_msginit; UPB_INLINE google_protobuf_FileOptions *google_protobuf_FileOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_FileOptions_msginit, arena); + return (google_protobuf_FileOptions *)upb_msg_new(&google_protobuf_FileOptions_msginit, arena); } UPB_INLINE google_protobuf_FileOptions *google_protobuf_FileOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_FileOptions *ret = google_protobuf_FileOptions_new(arena); @@ -524,7 +524,7 @@ UPB_INLINE void google_protobuf_FileOptions_set_uninterpreted_option(google_prot extern const upb_msglayout google_protobuf_MessageOptions_msginit; UPB_INLINE google_protobuf_MessageOptions *google_protobuf_MessageOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_MessageOptions_msginit, arena); + return (google_protobuf_MessageOptions *)upb_msg_new(&google_protobuf_MessageOptions_msginit, arena); } UPB_INLINE google_protobuf_MessageOptions *google_protobuf_MessageOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_MessageOptions *ret = google_protobuf_MessageOptions_new(arena); @@ -551,7 +551,7 @@ UPB_INLINE void google_protobuf_MessageOptions_set_uninterpreted_option(google_p extern const upb_msglayout google_protobuf_FieldOptions_msginit; UPB_INLINE google_protobuf_FieldOptions *google_protobuf_FieldOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_FieldOptions_msginit, arena); + return (google_protobuf_FieldOptions *)upb_msg_new(&google_protobuf_FieldOptions_msginit, arena); } UPB_INLINE google_protobuf_FieldOptions *google_protobuf_FieldOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_FieldOptions *ret = google_protobuf_FieldOptions_new(arena); @@ -582,7 +582,7 @@ UPB_INLINE void google_protobuf_FieldOptions_set_uninterpreted_option(google_pro extern const upb_msglayout google_protobuf_OneofOptions_msginit; UPB_INLINE google_protobuf_OneofOptions *google_protobuf_OneofOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_OneofOptions_msginit, arena); + return (google_protobuf_OneofOptions *)upb_msg_new(&google_protobuf_OneofOptions_msginit, arena); } UPB_INLINE google_protobuf_OneofOptions *google_protobuf_OneofOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_OneofOptions *ret = google_protobuf_OneofOptions_new(arena); @@ -601,7 +601,7 @@ UPB_INLINE void google_protobuf_OneofOptions_set_uninterpreted_option(google_pro extern const upb_msglayout google_protobuf_EnumOptions_msginit; UPB_INLINE google_protobuf_EnumOptions *google_protobuf_EnumOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_EnumOptions_msginit, arena); + return (google_protobuf_EnumOptions *)upb_msg_new(&google_protobuf_EnumOptions_msginit, arena); } UPB_INLINE google_protobuf_EnumOptions *google_protobuf_EnumOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_EnumOptions *ret = google_protobuf_EnumOptions_new(arena); @@ -624,7 +624,7 @@ UPB_INLINE void google_protobuf_EnumOptions_set_uninterpreted_option(google_prot extern const upb_msglayout google_protobuf_EnumValueOptions_msginit; UPB_INLINE google_protobuf_EnumValueOptions *google_protobuf_EnumValueOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_EnumValueOptions_msginit, arena); + return (google_protobuf_EnumValueOptions *)upb_msg_new(&google_protobuf_EnumValueOptions_msginit, arena); } UPB_INLINE google_protobuf_EnumValueOptions *google_protobuf_EnumValueOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_EnumValueOptions *ret = google_protobuf_EnumValueOptions_new(arena); @@ -645,7 +645,7 @@ UPB_INLINE void google_protobuf_EnumValueOptions_set_uninterpreted_option(google extern const upb_msglayout google_protobuf_ServiceOptions_msginit; UPB_INLINE google_protobuf_ServiceOptions *google_protobuf_ServiceOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_ServiceOptions_msginit, arena); + return (google_protobuf_ServiceOptions *)upb_msg_new(&google_protobuf_ServiceOptions_msginit, arena); } UPB_INLINE google_protobuf_ServiceOptions *google_protobuf_ServiceOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_ServiceOptions *ret = google_protobuf_ServiceOptions_new(arena); @@ -666,7 +666,7 @@ UPB_INLINE void google_protobuf_ServiceOptions_set_uninterpreted_option(google_p extern const upb_msglayout google_protobuf_MethodOptions_msginit; UPB_INLINE google_protobuf_MethodOptions *google_protobuf_MethodOptions_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_MethodOptions_msginit, arena); + return (google_protobuf_MethodOptions *)upb_msg_new(&google_protobuf_MethodOptions_msginit, arena); } UPB_INLINE google_protobuf_MethodOptions *google_protobuf_MethodOptions_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_MethodOptions *ret = google_protobuf_MethodOptions_new(arena); @@ -689,7 +689,7 @@ UPB_INLINE void google_protobuf_MethodOptions_set_uninterpreted_option(google_pr extern const upb_msglayout google_protobuf_UninterpretedOption_msginit; UPB_INLINE google_protobuf_UninterpretedOption *google_protobuf_UninterpretedOption_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_UninterpretedOption_msginit, arena); + return (google_protobuf_UninterpretedOption *)upb_msg_new(&google_protobuf_UninterpretedOption_msginit, arena); } UPB_INLINE google_protobuf_UninterpretedOption *google_protobuf_UninterpretedOption_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_UninterpretedOption *ret = google_protobuf_UninterpretedOption_new(arena); @@ -720,7 +720,7 @@ UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_p extern const upb_msglayout google_protobuf_UninterpretedOption_NamePart_msginit; UPB_INLINE google_protobuf_UninterpretedOption_NamePart *google_protobuf_UninterpretedOption_NamePart_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_UninterpretedOption_NamePart_msginit, arena); + return (google_protobuf_UninterpretedOption_NamePart *)upb_msg_new(&google_protobuf_UninterpretedOption_NamePart_msginit, arena); } UPB_INLINE google_protobuf_UninterpretedOption_NamePart *google_protobuf_UninterpretedOption_NamePart_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_UninterpretedOption_NamePart *ret = google_protobuf_UninterpretedOption_NamePart_new(arena); @@ -741,7 +741,7 @@ UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(go extern const upb_msglayout google_protobuf_SourceCodeInfo_msginit; UPB_INLINE google_protobuf_SourceCodeInfo *google_protobuf_SourceCodeInfo_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_SourceCodeInfo_msginit, arena); + return (google_protobuf_SourceCodeInfo *)upb_msg_new(&google_protobuf_SourceCodeInfo_msginit, arena); } UPB_INLINE google_protobuf_SourceCodeInfo *google_protobuf_SourceCodeInfo_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_SourceCodeInfo *ret = google_protobuf_SourceCodeInfo_new(arena); @@ -760,7 +760,7 @@ UPB_INLINE void google_protobuf_SourceCodeInfo_set_location(google_protobuf_Sour extern const upb_msglayout google_protobuf_SourceCodeInfo_Location_msginit; UPB_INLINE google_protobuf_SourceCodeInfo_Location *google_protobuf_SourceCodeInfo_Location_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_SourceCodeInfo_Location_msginit, arena); + return (google_protobuf_SourceCodeInfo_Location *)upb_msg_new(&google_protobuf_SourceCodeInfo_Location_msginit, arena); } UPB_INLINE google_protobuf_SourceCodeInfo_Location *google_protobuf_SourceCodeInfo_Location_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_SourceCodeInfo_Location *ret = google_protobuf_SourceCodeInfo_Location_new(arena); @@ -787,7 +787,7 @@ UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_detached_com extern const upb_msglayout google_protobuf_GeneratedCodeInfo_msginit; UPB_INLINE google_protobuf_GeneratedCodeInfo *google_protobuf_GeneratedCodeInfo_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_GeneratedCodeInfo_msginit, arena); + return (google_protobuf_GeneratedCodeInfo *)upb_msg_new(&google_protobuf_GeneratedCodeInfo_msginit, arena); } UPB_INLINE google_protobuf_GeneratedCodeInfo *google_protobuf_GeneratedCodeInfo_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_GeneratedCodeInfo *ret = google_protobuf_GeneratedCodeInfo_new(arena); @@ -806,7 +806,7 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_set_annotation(google_protobuf extern const upb_msglayout google_protobuf_GeneratedCodeInfo_Annotation_msginit; UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation *google_protobuf_GeneratedCodeInfo_Annotation_new(upb_arena *arena) { - return upb_msg_new(&google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena); + return (google_protobuf_GeneratedCodeInfo_Annotation *)upb_msg_new(&google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena); } UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation *google_protobuf_GeneratedCodeInfo_Annotation_parsenew(upb_stringview buf, upb_arena *arena) { google_protobuf_GeneratedCodeInfo_Annotation *ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena); diff --git a/tools/make_c_api.lua b/tools/make_c_api.lua index bf79b26..d9c11b2 100644 --- a/tools/make_c_api.lua +++ b/tools/make_c_api.lua @@ -380,7 +380,7 @@ local function write_h_file(filedef, append) local msgname = to_cident(msg:full_name()) append('extern const upb_msglayout %s_msginit;\n', msgname) append('UPB_INLINE %s *%s_new(upb_arena *arena) {\n', msgname, msgname) - append(' return upb_msg_new(&%s_msginit, arena);\n', msgname) + append(' return (%s *)upb_msg_new(&%s_msginit, arena);\n', msgname, msgname) append('}\n') append('UPB_INLINE %s *%s_parsenew(upb_stringview buf, upb_arena *arena) {\n', msgname, msgname) -- cgit v1.2.3 From 35fa3df8ecc3f451af0512e70a03f89ee407c85c Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Sat, 1 Dec 2018 02:33:16 -0800 Subject: Fixes for macOS build. Also run tests in CMake test. --- BUILD | 2 +- CMakeLists.txt | 6 ++---- build_defs.bzl | 2 +- tools/make_cmakelists.py | 30 ++++++++++++++++++------------ 4 files changed, 22 insertions(+), 18 deletions(-) (limited to 'tools') diff --git a/BUILD b/BUILD index 97380a4..a0eadb3 100644 --- a/BUILD +++ b/BUILD @@ -407,7 +407,7 @@ cc_binary( make_shell_script( name = "gen_run_cmake_build", out = "run_cmake_build.sh", - contents = "mkdir build && cd build && cmake .. && make -j8" + contents = "mkdir build && cd build && cmake .. && make -j8 && make test" ) sh_test( diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c6d5fa..412cdcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,11 +117,9 @@ add_library(upb_json upb/json/printer.h) target_link_libraries(upb_json upb) -add_library(upb_cc_bindings - upb/bindings/stdc++/string.h) -target_link_libraries(upb_cc_bindings +add_library(upb_cc_bindings INTERFACE) +target_link_libraries(upb_cc_bindings INTERFACE upb) -set_target_properties(upb_cc_bindings PROPERTIES LINKER_LANGUAGE CXX) add_library(upb_test tests/testmain.cc tests/test_util.h diff --git a/build_defs.bzl b/build_defs.bzl index 5bbbc4f..362691a 100644 --- a/build_defs.bzl +++ b/build_defs.bzl @@ -147,7 +147,7 @@ def generated_file_staleness_test(name, outs, generated_pattern): srcs = [script_src], testonly = 1, cmd = "cat $(location " + script_src + ") > $@; " + - "sed -i 's|INSERT_FILE_LIST_HERE|" + "\\n ".join(file_list) + "|' $@", + "sed -i '' -e 's|INSERT_FILE_LIST_HERE|" + "\\\n ".join(file_list) + "|' $@", ) native.py_test( diff --git a/tools/make_cmakelists.py b/tools/make_cmakelists.py index d7996d8..b8f46b9 100755 --- a/tools/make_cmakelists.py +++ b/tools/make_cmakelists.py @@ -22,11 +22,12 @@ class BuildFileFunctions(object): def __init__(self, converter): self.converter = converter - def _add_deps(self, kwargs): + def _add_deps(self, kwargs, keyword=""): if "deps" not in kwargs: return - self.converter.toplevel += "target_link_libraries(%s\n %s)\n" % ( + self.converter.toplevel += "target_link_libraries(%s%s\n %s)\n" % ( kwargs["name"], + keyword, "\n ".join(StripColons(kwargs["deps"])) ) @@ -37,17 +38,22 @@ class BuildFileFunctions(object): if kwargs["name"] == "amalgamation" or kwargs["name"] == "upbc_generator": return files = kwargs.get("srcs", []) + kwargs.get("hdrs", []) - self.converter.toplevel += "add_library(%s\n %s)\n" % ( - kwargs["name"], - "\n ".join(files) - ) - self._add_deps(kwargs) - # CMake wants to know if each library is C or C++. - # If there are only .h files, it can't infer. Assume C++. - if not filter(IsSourceFile, files): - line = "set_target_properties(%s PROPERTIES LINKER_LANGUAGE CXX)\n" - self.converter.toplevel += line % (kwargs["name"]) + if filter(IsSourceFile, files): + # Has sources, make this a normal library. + self.converter.toplevel += "add_library(%s\n %s)\n" % ( + kwargs["name"], + "\n ".join(files) + ) + self._add_deps(kwargs) + else: + # Header-only library, have to do a couple things differently. + # For some info, see: + # http://mariobadr.com/creating-a-header-only-library-with-cmake.html + self.converter.toplevel += "add_library(%s INTERFACE)\n" % ( + kwargs["name"] + ) + self._add_deps(kwargs, " INTERFACE") def cc_binary(self, **kwargs): pass -- cgit v1.2.3