diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 12:58:55 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-13 14:41:27 -0700 |
| commit | bde4eaf137c5c5ee3f6ffa4288307750d95c6281 (patch) | |
| tree | 6a67c40a8f187055fd0e7e3ffc4f3dee63b1bf93 | |
| parent | 4c70c9cb179099349d2eed8e0c8601399bb562b1 (diff) | |
| download | protobuf-bde4eaf137c5c5ee3f6ffa4288307750d95c6281.tar.gz protobuf-bde4eaf137c5c5ee3f6ffa4288307750d95c6281.tar.bz2 protobuf-bde4eaf137c5c5ee3f6ffa4288307750d95c6281.zip | |
Update build files.
* Fixes https://github.com/google/protobuf/issues/5031
* Fixes https://github.com/google/protobuf/issues/5037
| -rw-r--r-- | BUILD | 8 | ||||
| -rw-r--r-- | cmake/extract_includes.bat.in | 3 | ||||
| -rw-r--r-- | cmake/tests.cmake | 1 | ||||
| -rwxr-xr-x | kokoro/linux/bazel/build.sh | 1 |
4 files changed, 11 insertions, 2 deletions
@@ -111,7 +111,7 @@ cc_library( "src/google/protobuf/stubs/time.cc", "src/google/protobuf/wire_format_lite.cc", ], - hdrs = glob(["src/google/protobuf/**/*.h"]), + hdrs = glob(["src/google/protobuf/**/*.h", "src/google/protobuf/**/*.inc"]), copts = COPTS, includes = ["src/"], linkopts = LINK_OPTS, @@ -178,7 +178,7 @@ cc_library( "src/google/protobuf/wire_format.cc", "src/google/protobuf/wrappers.pb.cc", ], - hdrs = glob(["src/**/*.h"]), + hdrs = glob(["src/**/*.h", "src/**/*.inc"]), copts = COPTS, includes = ["src/"], linkopts = LINK_OPTS, @@ -356,6 +356,7 @@ cc_library( "src/google/protobuf/compiler/plugin.pb.cc", "src/google/protobuf/compiler/python/python_generator.cc", "src/google/protobuf/compiler/ruby/ruby_generator.cc", + "src/google/protobuf/compiler/scc.cc", "src/google/protobuf/compiler/subprocess.cc", "src/google/protobuf/compiler/zip_writer.cc", ], @@ -436,6 +437,7 @@ RELATIVE_TEST_PROTOS = [ "google/protobuf/unittest_optimize_for.proto", "google/protobuf/unittest_preserve_unknown_enum.proto", "google/protobuf/unittest_preserve_unknown_enum2.proto", + "google/protobuf/unittest_proto3.proto", "google/protobuf/unittest_proto3_arena.proto", "google/protobuf/unittest_proto3_arena_lite.proto", "google/protobuf/unittest_proto3_lite.proto", @@ -451,6 +453,7 @@ RELATIVE_TEST_PROTOS = [ "google/protobuf/util/internal/testdata/struct.proto", "google/protobuf/util/internal/testdata/timestamp_duration.proto", "google/protobuf/util/internal/testdata/wrappers.proto", + "google/protobuf/util/json_format.proto", "google/protobuf/util/json_format_proto3.proto", "google/protobuf/util/message_differencer_unittest.proto", ] @@ -545,6 +548,7 @@ cc_test( "src/google/protobuf/proto3_arena_lite_unittest.cc", "src/google/protobuf/proto3_arena_unittest.cc", "src/google/protobuf/proto3_lite_unittest.cc", + "src/google/protobuf/proto3_lite_unittest.inc", "src/google/protobuf/reflection_ops_unittest.cc", "src/google/protobuf/repeated_field_reflection_unittest.cc", "src/google/protobuf/repeated_field_unittest.cc", diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in index 9fd9de0d..3818c4ef 100644 --- a/cmake/extract_includes.bat.in +++ b/cmake/extract_includes.bat.in @@ -72,6 +72,9 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\message.h" include\go copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\message_lite.h" include\google\protobuf\message_lite.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\metadata.h" include\google\protobuf\metadata.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\metadata_lite.h" include\google\protobuf\metadata_lite.h +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port.h" include\google\protobuf\port.h +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port_def.inc" include\google\protobuf\port_def.inc +copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port_undef.inc" include\google\protobuf\port_undef.inc copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\reflection.h" include\google\protobuf\reflection.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\reflection_ops.h" include\google\protobuf\reflection_ops.h copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\repeated_field.h" include\google\protobuf\repeated_field.h diff --git a/cmake/tests.cmake b/cmake/tests.cmake index 001b4200..f4679d1a 100644 --- a/cmake/tests.cmake +++ b/cmake/tests.cmake @@ -168,6 +168,7 @@ set(tests_files ${protobuf_source_dir}/src/google/protobuf/proto3_arena_lite_unittest.cc ${protobuf_source_dir}/src/google/protobuf/proto3_arena_unittest.cc ${protobuf_source_dir}/src/google/protobuf/proto3_lite_unittest.cc + ${protobuf_source_dir}/src/google/protobuf/proto3_lite_unittest.inc ${protobuf_source_dir}/src/google/protobuf/reflection_ops_unittest.cc ${protobuf_source_dir}/src/google/protobuf/repeated_field_reflection_unittest.cc ${protobuf_source_dir}/src/google/protobuf/repeated_field_unittest.cc diff --git a/kokoro/linux/bazel/build.sh b/kokoro/linux/bazel/build.sh index e0c1ee42..1769301d 100755 --- a/kokoro/linux/bazel/build.sh +++ b/kokoro/linux/bazel/build.sh @@ -1,6 +1,7 @@ #!/bin/bash # # Build file to set up and run tests +set -ex # Change to repo root cd $(dirname $0)/../../.. |