Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #193 from nicolasnoble/windows-flags

Browse Source 
Disabling gcc flags for Windows build.
pull/13171/head
Nicolas Noble 6 years ago committed by GitHub
parent a73ae43786 a2013f0fc2
commit 1ee1e36256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 95 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      BUILD
  2. 7
      bazel/upb_proto_library.bzl
  3. 9
      upb/port_def.inc

100
BUILD
Unescape View File

@ -42,6 +42,11 @@ config_setting(
visibility = ["//visibility:public"],
)
config_setting(
name = "windows",
constraint_values = ["@bazel_tools//platforms:windows"],
)
config_setting(
name = "fuzz",
values = {"define": "fuzz=true"},
@ -68,7 +73,10 @@ cc_library(
"upb/encode.h",
"upb/upb.h",
],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
visibility = ["//visibility:public"],
)
@ -84,7 +92,10 @@ cc_library(
"upb/generated_util.h",
"upb/msg.h",
],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
textual_hdrs = [
"upb/port_def.inc",
"upb/port_undef.inc",
@ -109,7 +120,10 @@ cc_library(
"upb/def.h",
"upb/msgfactory.h",
],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
visibility = ["//visibility:public"],
deps = [
":descriptor_upbproto",
@ -134,7 +148,10 @@ cc_library(
"upb/legacy_msg_reflection.c",
],
hdrs = ["upb/legacy_msg_reflection.h"],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
deps = [
":table",
":upb",
@ -152,7 +169,10 @@ cc_library(
"upb/handlers.h",
"upb/sink.h",
],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
deps = [
":reflection",
":table",
@ -176,7 +196,10 @@ cc_library(
"upb/pb/encoder.h",
"upb/pb/textprinter.h",
],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
deps = [
":descriptor_upbproto",
":handlers",
@ -197,7 +220,10 @@ cc_library(
"upb/json/parser.h",
"upb/json/printer.h",
],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
deps = [
":upb",
":upb_pb",
@ -227,7 +253,10 @@ cc_library(
"upbc/message_layout.h",
],
hdrs = ["upbc/generator.h"],
copts = CPPOPTS,
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}),
deps = [
"@absl//absl/base:core_headers",
"@absl//absl/container:flat_hash_map",
@ -240,7 +269,10 @@ cc_library(
cc_binary(
name = "protoc-gen-upb",
srcs = ["upbc/main.cc"],
copts = CPPOPTS,
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}),
visibility = ["//visibility:public"],
deps = [
":upbc_generator",
@ -274,7 +306,10 @@ cc_library(
"tests/test_util.h",
"tests/upb_test.h",
],
copts = CPPOPTS,
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}),
deps = [
":handlers",
":upb",
@ -287,7 +322,10 @@ cc_test(
"tests/pb/test_varint.c",
"upb/pb/varint.int.h",
],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
deps = [
":upb",
":upb_pb",
@ -313,7 +351,10 @@ cc_test(
"tests/pb/test_decoder.cc",
"upb/pb/varint.int.h",
],
copts = CPPOPTS,
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}),
deps = [
":handlers",
":test_decoder_upbproto",
@ -338,7 +379,10 @@ upb_proto_reflection_library(
cc_test(
name = "test_cpp",
srcs = ["tests/test_cpp.cc"],
copts = CPPOPTS,
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}),
deps = [
":handlers",
":reflection",
@ -352,7 +396,10 @@ cc_test(
cc_test(
name = "test_table",
srcs = ["tests/test_table.cc"],
copts = CPPOPTS,
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}),
deps = [
":table",
":upb",
@ -365,7 +412,10 @@ cc_binary(
name = "file_descriptor_parsenew_fuzzer",
testonly = 1,
srcs = ["tests/file_descriptor_parsenew_fuzzer.cc"],
copts = CPPOPTS + select({
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}) + select({
"//conditions:default": [],
":fuzz": ["-fsanitize=fuzzer,address"],
}),
@ -388,7 +438,10 @@ upb_proto_reflection_library(
cc_test(
name = "test_encoder",
srcs = ["tests/pb/test_encoder.cc"],
copts = CPPOPTS,
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}),
deps = [
":descriptor_upbproto",
":descriptor_upbreflection",
@ -430,7 +483,10 @@ cc_test(
srcs = [
"tests/json/test_json.cc",
],
copts = CPPOPTS,
copts = select({
":windows": [],
"//conditions:default": CPPOPTS
}),
deps = [
":test_json_upbproto",
":test_json_upbprotoreflection",
@ -458,7 +514,10 @@ cc_binary(
srcs = [
"tests/conformance_upb.c",
],
copts = COPTS + ["-Ibazel-out/k8-fastbuild/bin"],
copts = select({
":windows": [],
"//conditions:default": COPTS
}) + ["-Ibazel-out/k8-fastbuild/bin"],
deps = [
":conformance_proto_upb",
":test_messages_proto3_proto_upb",
@ -512,7 +571,10 @@ cc_library(
name = "amalgamation",
srcs = ["upb.c"],
hdrs = ["upb.h"],
copts = COPTS,
copts = select({
":windows": [],
"//conditions:default": COPTS
}),
)
# Lua libraries. ###############################################################

7
bazel/upb_proto_library.bzl
Unescape View File

@ -159,7 +159,7 @@ def _compile_upb_protos(ctx, proto_info, proto_sources, ext):
arguments = [
"--upb_out=" + _get_real_root(srcs[0]),
"--plugin=protoc-gen-upb=" + ctx.executable._upbc.path,
"--descriptor_set_in=" + ":".join([f.path for f in transitive_sets]),
"--descriptor_set_in=" + ctx.configuration.host_path_separator.join([f.path for f in transitive_sets]),
] +
[_get_real_short_path(file) for file in proto_sources],
progress_message = "Generating upb protos for :" + ctx.label.name,
@ -175,7 +175,10 @@ def _upb_proto_rule_impl(ctx):
"_WrappedGeneratedSrcsInfo (aspect should have handled this).")
cc_info = dep[_WrappedCcInfo].cc_info
srcs = dep[_WrappedGeneratedSrcsInfo].srcs
lib = cc_info.linking_context.libraries_to_link.to_list()[0]
if (type(cc_info.linking_context.libraries_to_link) == "list"):
lib = cc_info.linking_context.libraries_to_link[0]
else:
lib = cc_info.linking_context.libraries_to_link.to_list()[0]
files = _filter_none([
lib.static_library,
lib.pic_static_library,

9
upb/port_def.inc
Unescape View File

@ -71,6 +71,14 @@
#define UPB_NORETURN
#endif
#if defined(_WIN32) || defined(WIN32)
/* Windows versions */
#include <stdarg.h>
#include <stdio.h>
#define _upb_snprintf _snprintf_s
#define _upb_vsnprintf _vsnprintf_s
#define _upb_va_copy(a, b) va_copy(a, b)
#else
#if __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L
/* C99/C++11 versions. */
#include <stdio.h>
@ -89,6 +97,7 @@
#else
#error Need implementations of [v]snprintf and va_copy
#endif
#endif
#ifdef __cplusplus
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || \

Write Preview
Loading…
Cancel
Save