diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | build_extra/flatbuffers/BUILD.gn | 122 | ||||
| -rw-r--r-- | build_extra/flatbuffers/flatbuffer.gni (renamed from third_party/flatbuffers/flatbuffer.gni) | 18 | ||||
| -rw-r--r-- | gclient_config.py | 2 | ||||
| -rw-r--r-- | third_party/flatbuffers/BUILD.gn | 120 | ||||
| -rw-r--r-- | third_party/flatbuffers/LICENSE | 202 | ||||
| -rw-r--r-- | third_party/flatbuffers/OWNERS | 3 | ||||
| -rw-r--r-- | third_party/flatbuffers/README.chromium | 14 |
9 files changed, 138 insertions, 347 deletions
diff --git a/.gitignore b/.gitignore index 73b7b0c45..306b0b7fc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ node_modules /third_party/cpplint/ /third_party/zlib/ /third_party/rust_crates/libc/ -/third_party/flatbuffers/src/ +/third_party/flatbuffers/ # gclient files /third_party/.gclient_entries @@ -1,6 +1,6 @@ import("//third_party/v8/gni/v8.gni") import("//third_party/v8/snapshot_toolchain.gni") -import("//third_party/flatbuffers/flatbuffer.gni") +import("//build_extra/flatbuffers/flatbuffer.gni") import("//build_extra/deno.gni") import("//build_extra/rust/rust.gni") diff --git a/build_extra/flatbuffers/BUILD.gn b/build_extra/flatbuffers/BUILD.gn new file mode 100644 index 000000000..0433c5d1d --- /dev/null +++ b/build_extra/flatbuffers/BUILD.gn @@ -0,0 +1,122 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("flatbuffer.gni") + +fb_src = flatbuffers_source_location + +config("flatbuffers_config") { + include_dirs = [ "$fb_src/include" ] + + if (is_clang) { + cflags = [ + "-Wno-exit-time-destructors", + "-Wno-header-hygiene", + ] + } +} + +# The part of FlatBuffers that Chrome is interested in. +source_set("flatbuffers") { + sources = [ + "$fb_src/include/flatbuffers/flatbuffers.h", + ] + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + + public_configs = [ ":flatbuffers_config" ] +} + +# The complete FlatBuffers library, as required to build the flatc compiler and +# some of the tests. +source_set("compiler_files") { + include_dirs = [ "$fb_src/grpc" ] + sources = [ + "$fb_src/grpc/src/compiler/config.h", + "$fb_src/grpc/src/compiler/config.h", + "$fb_src/grpc/src/compiler/cpp_generator.cc", + "$fb_src/grpc/src/compiler/cpp_generator.h", + "$fb_src/grpc/src/compiler/go_generator.cc", + "$fb_src/grpc/src/compiler/go_generator.h", + "$fb_src/grpc/src/compiler/java_generator.cc", + "$fb_src/grpc/src/compiler/java_generator.h", + "$fb_src/grpc/src/compiler/schema_interface.h", + "$fb_src/include/flatbuffers/code_generators.h", + "$fb_src/include/flatbuffers/flatc.h", + "$fb_src/include/flatbuffers/flexbuffers.h", + "$fb_src/include/flatbuffers/grpc.h", + "$fb_src/include/flatbuffers/hash.h", + "$fb_src/include/flatbuffers/idl.h", + "$fb_src/include/flatbuffers/reflection.h", + "$fb_src/include/flatbuffers/reflection_generated.h", + "$fb_src/include/flatbuffers/util.h", + "$fb_src/src/code_generators.cpp", + "$fb_src/src/flatc.cpp", + "$fb_src/src/idl_gen_cpp.cpp", + "$fb_src/src/idl_gen_fbs.cpp", + "$fb_src/src/idl_gen_general.cpp", + "$fb_src/src/idl_gen_go.cpp", + "$fb_src/src/idl_gen_grpc.cpp", + "$fb_src/src/idl_gen_js.cpp", + "$fb_src/src/idl_gen_json_schema.cpp", + "$fb_src/src/idl_gen_php.cpp", + "$fb_src/src/idl_gen_python.cpp", + "$fb_src/src/idl_gen_rust.cpp", + "$fb_src/src/idl_gen_text.cpp", + "$fb_src/src/idl_parser.cpp", + "$fb_src/src/reflection.cpp", + "$fb_src/src/util.cpp", + ] + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + visibility = [ ":*" ] + deps = [ + ":flatbuffers", + ] +} + +executable("flatc") { + sources = [ + "$fb_src/src/flatc_main.cpp", + ] + deps = [ + ":compiler_files", + ":flatbuffers", + ] +} + +# The following is just for testing. + +flatbuffer("flatbuffers_samplebuffer") { + testonly = true + sources = [ + "$fb_src/tests/include_test/include_test1.fbs", + "$fb_src/tests/include_test/sub/include_test2.fbs", + "$fb_src/tests/monster_test.fbs", + "$fb_src/tests/namespace_test/namespace_test1.fbs", + "$fb_src/tests/namespace_test/namespace_test2.fbs", + ] + flatc_include_dirs = [ "$fb_src/tests/include_test" ] +} + +# test("flatbuffers_unittest") { +# sources = [ +# "src/tests/test.cpp", +# ] +# deps = [ +# ":compiler_files", +# ":flatbuffers", +# ":flatbuffers_samplebuffer", +# ] +# data = [ +# "src/tests/", +# ] +# +# if (is_win) { +# # Suppress "object allocated on the heap may not be aligned 16". +# cflags = [ "/wd4316" ] +# } +# defines = [ "FLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE" ] +# } diff --git a/third_party/flatbuffers/flatbuffer.gni b/build_extra/flatbuffers/flatbuffer.gni index 3e34465cd..0bac1802c 100644 --- a/third_party/flatbuffers/flatbuffer.gni +++ b/build_extra/flatbuffers/flatbuffer.gni @@ -4,6 +4,14 @@ import("//build/compiled_action.gni") +declare_args() { + # Location of flatbuffers source code. + flatbuffers_source_location = "//third_party/flatbuffers/" + + # Absolute location flatbuffers BUILD.gn file. + flatbuffers_build_location = "//build_extra/flatbuffers/" +} + # Compile a flatbuffer for C++. # # flatc_out_dir (optional) @@ -64,7 +72,7 @@ template("flatbuffer") { compiled_action_foreach(action_name) { visibility = [ ":$source_set_name" ] - tool = "//third_party/flatbuffers:flatc" + tool = "$flatbuffers_build_location:flatc" sources = invoker.sources deps = [] @@ -122,12 +130,12 @@ template("flatbuffer") { testonly = invoker.testonly } - public_configs = [ "//third_party/flatbuffers:flatbuffers_config" ] + public_configs = [ "$flatbuffers_build_location:flatbuffers_config" ] public_deps = [ # The generated headers reference headers within FlatBuffers, so # dependencies must be able to find those headers too. - "//third_party/flatbuffers", + flatbuffers_build_location, ] deps = [ ":$action_name", @@ -180,12 +188,12 @@ template("ts_flatbuffer") { copy_name = target_name + "_copy" copy(copy_name) { - sources = [ "//third_party/flatbuffers/src/js/flatbuffers.js" ] + sources = [ "$flatbuffers_source_location/js/flatbuffers.js" ] outputs = [ "$target_gen_dir/flatbuffers.js" ] } compiled_action_foreach(target_name) { - tool = "//third_party/flatbuffers:flatc" + tool = "$flatbuffers_build_location:flatc" sources = invoker.sources deps = [ ":" + copy_name ] diff --git a/gclient_config.py b/gclient_config.py index 3113440ba..28c8b8d73 100644 --- a/gclient_config.py +++ b/gclient_config.py @@ -33,7 +33,7 @@ solutions = [{ 'url': 'https://github.com/rw/flatbuffers.git@2018-02--rust', 'name': - 'flatbuffers/src' + 'flatbuffers' }, { 'url': 'https://github.com/rust-lang/libc.git@8a85d662b90c14d458bc4ae9521a05564e20d7ae', diff --git a/third_party/flatbuffers/BUILD.gn b/third_party/flatbuffers/BUILD.gn deleted file mode 100644 index e32ac2126..000000000 --- a/third_party/flatbuffers/BUILD.gn +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# import("//testing/test.gni") -import("//third_party/flatbuffers/flatbuffer.gni") - -config("flatbuffers_config") { - include_dirs = [ "src/include" ] - - if (is_clang) { - cflags = [ - "-Wno-exit-time-destructors", - "-Wno-header-hygiene", - ] - } -} - -# The part of FlatBuffers that Chrome is interested in. -source_set("flatbuffers") { - sources = [ - "src/include/flatbuffers/flatbuffers.h", - ] - - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - - public_configs = [ ":flatbuffers_config" ] -} - -# The complete FlatBuffers library, as required to build the flatc compiler and -# some of the tests. -source_set("compiler_files") { - include_dirs = [ "src/grpc" ] - sources = [ - "src/grpc/src/compiler/config.h", - "src/grpc/src/compiler/config.h", - "src/grpc/src/compiler/cpp_generator.cc", - "src/grpc/src/compiler/cpp_generator.h", - "src/grpc/src/compiler/go_generator.cc", - "src/grpc/src/compiler/go_generator.h", - "src/grpc/src/compiler/java_generator.cc", - "src/grpc/src/compiler/java_generator.h", - "src/grpc/src/compiler/schema_interface.h", - "src/include/flatbuffers/code_generators.h", - "src/include/flatbuffers/flatc.h", - "src/include/flatbuffers/flexbuffers.h", - "src/include/flatbuffers/grpc.h", - "src/include/flatbuffers/hash.h", - "src/include/flatbuffers/idl.h", - "src/include/flatbuffers/reflection.h", - "src/include/flatbuffers/reflection_generated.h", - "src/include/flatbuffers/util.h", - "src/src/code_generators.cpp", - "src/src/flatc.cpp", - "src/src/idl_gen_cpp.cpp", - "src/src/idl_gen_fbs.cpp", - "src/src/idl_gen_general.cpp", - "src/src/idl_gen_go.cpp", - "src/src/idl_gen_grpc.cpp", - "src/src/idl_gen_js.cpp", - "src/src/idl_gen_json_schema.cpp", - "src/src/idl_gen_php.cpp", - "src/src/idl_gen_python.cpp", - "src/src/idl_gen_rust.cpp", - "src/src/idl_gen_text.cpp", - "src/src/idl_parser.cpp", - "src/src/reflection.cpp", - "src/src/util.cpp", - ] - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - visibility = [ ":*" ] - deps = [ - ":flatbuffers", - ] -} - -executable("flatc") { - sources = [ - "src/src/flatc_main.cpp", - ] - deps = [ - ":compiler_files", - ":flatbuffers", - ] -} - -# The following is just for testing. - -flatbuffer("flatbuffers_samplebuffer") { - testonly = true - sources = [ - "src/tests/include_test/include_test1.fbs", - "src/tests/include_test/sub/include_test2.fbs", - "src/tests/monster_test.fbs", - "src/tests/namespace_test/namespace_test1.fbs", - "src/tests/namespace_test/namespace_test2.fbs", - ] - flatc_include_dirs = [ "src/tests/include_test" ] -} -# test("flatbuffers_unittest") { -# sources = [ -# "src/tests/test.cpp", -# ] -# deps = [ -# ":compiler_files", -# ":flatbuffers", -# ":flatbuffers_samplebuffer", -# ] -# data = [ -# "src/tests/", -# ] -# -# if (is_win) { -# # Suppress "object allocated on the heap may not be aligned 16". -# cflags = [ "/wd4316" ] -# } -# defines = [ "FLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE" ] -# } diff --git a/third_party/flatbuffers/LICENSE b/third_party/flatbuffers/LICENSE deleted file mode 100644 index a4c5efd82..000000000 --- a/third_party/flatbuffers/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2014 Google Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/third_party/flatbuffers/OWNERS b/third_party/flatbuffers/OWNERS deleted file mode 100644 index 94966f0a5..000000000 --- a/third_party/flatbuffers/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -battre@chromium.org -csharrison@chromium.org -engedy@chromium.org diff --git a/third_party/flatbuffers/README.chromium b/third_party/flatbuffers/README.chromium deleted file mode 100644 index 1400e04f7..000000000 --- a/third_party/flatbuffers/README.chromium +++ /dev/null @@ -1,14 +0,0 @@ -Name: FlatBuffers -Short Name: flatbuffers -URL: https://github.com/google/flatbuffers -Version: 01c50d57a67a52ee3cddd81b54d4647e9123a290 -Date: 2017-06-05 -License: Apache 2.0 -License File: LICENSE -Security Critical: yes - -Description: -FlatBuffers is an efficient cross platform serialization library for games and -other memory constrained apps. It allows you to directly access serialized data -without unpacking/parsing it first, while still having great forwards/backwards -compatibility. |