-
Notifications
You must be signed in to change notification settings - Fork 57
Bazel updates for Harmonic #397
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 19 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
4795e34
Harmonic bazel
cf54236
Fix RE and install path
4fc843f
Fix up generate script
f7db1e1
Minimize diff
8881d33
Fix arg
554b57c
Revert all changes to gz_msgs_generate
35d48cd
Clean up harmonic implementation
6338d74
Add a "lite" factory variant
5138cc5
Add lint support
4e73795
Generate command line files
b4ac4da
Allow dynamic factory to load from descriptor files
4a840f8
Lint
155304a
Remove dead code
8e1d0db
Add iostream header
f02ed90
Change data deps
0ebc366
Lint
8d03c23
Needs .string() on Windows
4ed4226
add docs
e55e4e3
IWYU
a6fab0c
Move generated file location
3df1f83
Merge branch 'mjcarroll/port/9_to_10' into mjcarroll/bazel_harmonic
dbb7688
Add descriptors test
42ff5a2
Merge branch 'gz-msgs10' into mjcarroll/bazel_harmonic
317d704
Differentiate message names
1c36fed
Address reviewer comments
bb61343
Merge branch 'gz-msgs10' into mjcarroll/bazel_harmonic
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,77 +3,75 @@ load( | |
| "GZ_FEATURES", | ||
| "GZ_ROOT", | ||
| "GZ_VISIBILITY", | ||
| "gz_configure_file", | ||
| "gz_configure_header", | ||
| "gz_export_header", | ||
| "gz_include_header", | ||
| ) | ||
| load( | ||
| "@gz//bazel/lint:lint.bzl", | ||
| "add_lint_tests", | ||
| ) | ||
| load( | ||
| "@gz//msgs/tools:gz_msgs_generate.bzl", | ||
| "get_proto_headers", | ||
| "gz_msgs_generate", | ||
| "gz_proto_factory", | ||
| "gz_proto_library", | ||
| ) | ||
| load("@rules_license//rules:license.bzl", "license") | ||
|
|
||
| package( | ||
| default_applicable_licenses = [GZ_ROOT + "msgs:license"], | ||
| default_visibility = GZ_VISIBILITY, | ||
| features = GZ_FEATURES, | ||
| ) | ||
|
|
||
| licenses(["notice"]) # Apache-2.0 | ||
| license( | ||
| name = "license", | ||
| package_name = "gz-msgs", | ||
| ) | ||
|
|
||
| licenses(["notice"]) | ||
|
|
||
| exports_files(["LICENSE"]) | ||
|
|
||
| gz_configure_header( | ||
| name = "msgs_config_hh", | ||
| src = "include/gz/msgs/config.hh.in", | ||
| src = "core/include/gz/msgs/config.hh.in", | ||
| cmakelists = ["CMakeLists.txt"], | ||
| package = "msgs", | ||
| ) | ||
|
|
||
| gz_export_header( | ||
| name = "include/gz/msgs/Export.hh", | ||
| name = "core/include/gz/msgs/Export.hh", | ||
| export_base = "GZ_MSGS", | ||
| lib_name = "gz-msgs", | ||
| visibility = ["//visibility:private"], | ||
| ) | ||
|
|
||
| public_headers_no_gen = glob([ | ||
| "include/gz/msgs/*.hh", | ||
| "include/gz/msgs/detail/*.hh", | ||
| "core/include/gz/msgs/*.hh", | ||
| "core/include/gz/msgs/convert/*.hh", | ||
| "core/include/gz/msgs/detail/*.hh", | ||
| ]) | ||
|
|
||
| protos = glob(["proto/gz/msgs/*.proto"]) | ||
|
|
||
| gz_include_header( | ||
| name = "messagetypes_hh_genrule", | ||
| out = "include/gz/msgs/MessageTypes.hh", | ||
| hdrs = get_proto_headers(protos), | ||
| strip_prefix = ["gz_msgs"], | ||
| ) | ||
|
|
||
| gz_include_header( | ||
| name = "msgs_hh_genrule", | ||
| out = "include/gz/msgs.hh", | ||
| out = "core/include/gz/msgs.hh", | ||
| hdrs = public_headers_no_gen + [ | ||
| "include/gz/msgs/config.hh", | ||
| "include/gz/msgs/Export.hh", | ||
| "include/gz/msgs/MessageTypes.hh", | ||
| "core/include/gz/msgs/config.hh", | ||
| "core/include/gz/msgs/Export.hh", | ||
| ], | ||
| ) | ||
|
|
||
| public_headers = public_headers_no_gen + [ | ||
| "include/gz/msgs/config.hh", | ||
| "include/gz/msgs/Export.hh", | ||
| "include/gz/msgs/MessageTypes.hh", | ||
| "include/gz/msgs.hh", | ||
| ] | ||
|
|
||
| # Custom Gazebo Protoc plugin | ||
| cc_binary( | ||
| name = "gz_msgs_gen", | ||
| srcs = [ | ||
| "src/Generator.cc", | ||
| "src/Generator.hh", | ||
| "src/generator_main.cc", | ||
| "core/generator_lite/Generator.cc", | ||
| "core/generator_lite/Generator.hh", | ||
| "core/generator_lite/generator_main.cc", | ||
| ], | ||
| deps = [ | ||
| "@com_google_protobuf//:protobuf", | ||
|
|
@@ -91,26 +89,46 @@ proto_library( | |
| ], | ||
| ) | ||
|
|
||
| gz_msgs_generate( | ||
| gz_proto_library( | ||
| name = "gzmsgs_cc_proto", | ||
| proto_deps = [":gzmsgs_proto"], | ||
| deps = [ | ||
| ":gzmsgs_proto", | ||
| "@com_google_protobuf//:any_proto", | ||
| "@com_google_protobuf//:protobuf", | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do we need to add @com_google_protobuf//:any_cc_proto to deps?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe it's not a target in this version of protobuf: |
||
| ], | ||
| ) | ||
|
|
||
| gz_proto_factory( | ||
| name = "gzmsgs_proto_factory", | ||
| cc_output = "core/src/RegisterMsgs.cc", | ||
| hh_output = "core/include/gz/msgs/MessageTypes.hh", | ||
| deps = [":gzmsgs_proto"], | ||
| ) | ||
|
|
||
| public_headers = public_headers_no_gen + [ | ||
| "core/include/gz/msgs/config.hh", | ||
| "core/include/gz/msgs/Export.hh", | ||
| "core/include/gz/msgs.hh", | ||
| "core/include/gz/msgs/MessageTypes.hh", | ||
| ] | ||
|
|
||
| cc_library( | ||
| name = "msgs", | ||
| srcs = [ | ||
| "src/Factory.cc", | ||
| "src/Filesystem.cc", | ||
| "src/Utility.cc", | ||
| ":gzmsgs_cc_proto", | ||
| "core/src/DynamicFactory.cc", | ||
| "core/src/DynamicFactory.hh", | ||
| "core/src/Factory.cc", | ||
| "core/src/MessageFactory.cc", | ||
| "core/src/RegisterMsgs.cc", | ||
| "core/src/impl/InstallationDirectories.cc", | ||
| ], | ||
| hdrs = public_headers, | ||
| includes = ["include"], | ||
| includes = [ | ||
mjcarroll marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "core/include", | ||
| "core/src", | ||
| ], | ||
| deps = [ | ||
| ":gzmsgs_cc_proto", | ||
| ":gzmsgs_proto_factory", | ||
| GZ_ROOT + "math", | ||
| "@com_google_protobuf//:protobuf", | ||
| "@tinyxml2", | ||
|
|
@@ -138,3 +156,85 @@ test_sources = glob( | |
| "@gtest//:gtest_main", | ||
| ], | ||
| ) for src in test_sources] | ||
|
|
||
| cc_test( | ||
| name = "INTEGRATION_headers", | ||
| srcs = ["test/integration/headers.cc"], | ||
| deps = [ | ||
| ":gzmsgs_cc_proto", | ||
| "@gtest", | ||
| "@gtest//:gtest_main", | ||
| ], | ||
| ) | ||
|
|
||
| cc_test( | ||
| name = "INTEGRATION_image_msg", | ||
| srcs = ["test/integration/image_msg.cc"], | ||
| deps = [ | ||
| ":gzmsgs_cc_proto", | ||
| "@gtest", | ||
| "@gtest//:gtest_main", | ||
| ], | ||
| ) | ||
|
|
||
| cc_test( | ||
| name = "INTEGRATION_Utility", | ||
| srcs = ["test/integration/Utility_TEST.cc"], | ||
| deps = [ | ||
| ":msgs", | ||
| GZ_ROOT + "common/testing", | ||
| "@gtest", | ||
| "@gtest//:gtest_main", | ||
| ], | ||
| ) | ||
|
|
||
| cc_test( | ||
| name = "INTEGRATION_Factory", | ||
| srcs = ["test/integration/Factory_TEST.cc"], | ||
| data = ["test/desc/stringmsg.desc"], | ||
| defines = [ | ||
| 'GZ_MSGS_TEST_PATH=\\"msgs/test\\"', | ||
| ], | ||
| deps = [ | ||
| ":msgs", | ||
| GZ_ROOT + "common/testing", | ||
| "@gtest", | ||
| "@gtest//:gtest_main", | ||
| ], | ||
| ) | ||
|
|
||
| gz_configure_file( | ||
| name = "msgs_yaml", | ||
| src = "conf/msgs.yaml.in", | ||
| out = "msgs.yaml", | ||
| defines = [ | ||
| "PROJECT_NAME_NO_VERSION_LOWER=msgs", | ||
mjcarroll marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "gz_library_path=msgs/cmdmsgs", | ||
| ], | ||
| package = "msgs", | ||
| ) | ||
|
|
||
| gz_configure_file( | ||
| name = "msgs_rb", | ||
| src = "core/src/cmd/cmdmsgs.rb.in", | ||
| out = "cmdmsgs.rb", | ||
| defines = [ | ||
| "library_location=libgz-msgs.so", | ||
mjcarroll marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ], | ||
| package = "msgs", | ||
| ) | ||
|
|
||
| cc_binary( | ||
| name = "gz-msgs", | ||
| srcs = ["core/src/gz.cc"], | ||
| data = [ | ||
| ":gzmsgs_proto", | ||
| "cmdmsgs.rb", | ||
| "msgs.yaml", | ||
| ], | ||
| linkshared = True, | ||
| linkstatic = True, | ||
| deps = [":msgs"], | ||
| ) | ||
|
|
||
| add_lint_tests() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| /* | ||
| * Copyright 2016 Open Source Robotics Foundation | ||
| * | ||
| * 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. | ||
| * | ||
| */ | ||
|
|
||
| #include <algorithm> | ||
| #include <filesystem> | ||
| #include <iostream> | ||
| #include <fstream> | ||
| #include <map> | ||
| #include <memory> | ||
| #include <sstream> | ||
| #include <string> | ||
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| #ifdef _MSC_VER | ||
| #pragma warning(push) | ||
| #pragma warning(disable: 4100 4512 4127 4068 4244 4267 4251 4146) | ||
| #endif | ||
|
|
||
| #include <google/protobuf/descriptor.h> | ||
| #include <google/protobuf/compiler/code_generator.h> | ||
| #include <google/protobuf/io/printer.h> | ||
| #include <google/protobuf/io/zero_copy_stream.h> | ||
| #include <google/protobuf/descriptor.pb.h> | ||
|
|
||
| #ifdef _MSC_VER | ||
| #pragma warning(pop) | ||
| #endif | ||
|
|
||
| #include "Generator.hh" | ||
|
|
||
| namespace google::protobuf::compiler::cpp { | ||
|
|
||
| ///////////////////////////////////////////////// | ||
| Generator::Generator(const std::string &/*_name*/) | ||
| { | ||
| } | ||
|
|
||
| ///////////////////////////////////////////////// | ||
| Generator::~Generator() = default; | ||
|
|
||
| ///////////////////////////////////////////////// | ||
| bool Generator::Generate(const FileDescriptor *_file, | ||
| const std::string &/*_parameter*/, | ||
| OutputDirectory *_generatorContext, | ||
| std::string * /*_error*/) const | ||
| { | ||
| std::string delim = ".proto"; | ||
| auto headerFilename = _file->name(); | ||
| auto sourceFilename = _file->name(); | ||
|
|
||
| { | ||
| auto pos = headerFilename.rfind(delim); | ||
| headerFilename.replace(pos, delim.size(), ".pb.h"); | ||
| } | ||
| { | ||
| auto pos = sourceFilename.rfind(delim); | ||
| sourceFilename.replace(pos, delim.size(), ".pb.h"); | ||
| } | ||
|
|
||
| { | ||
| auto *output = _generatorContext->OpenForInsert(headerFilename, "includes"); | ||
| auto printer = io::Printer(output, '$'); | ||
| printer.Print("#include <memory>\n", "name", "includes"); | ||
| } | ||
|
|
||
| { | ||
| auto *output = _generatorContext->OpenForInsert( | ||
| headerFilename, "namespace_scope"); | ||
| auto printer = io::Printer(output, '$'); | ||
|
|
||
| for (auto i = 0; i < _file->message_type_count(); ++i) | ||
| { | ||
| const auto *desc = _file->message_type(i); | ||
| std::string ptrTypes; | ||
|
|
||
| // Define std::unique_ptr types for our messages | ||
| ptrTypes += "typedef std::unique_ptr<" | ||
| + desc->name() + "> " | ||
| + desc->name() + "UniquePtr;\n"; | ||
|
|
||
| // Define const std::unique_ptr types for our messages | ||
| ptrTypes += "typedef std::unique_ptr<const " | ||
| + desc->name() + "> Const" | ||
| + desc->name() + "UniquePtr;\n"; | ||
|
|
||
| // Define std::shared_ptr types for our messages | ||
| ptrTypes += "typedef std::shared_ptr<" | ||
| + desc->name() + "> " | ||
| + desc->name() + "SharedPtr;\n"; | ||
|
|
||
| // Define const std::shared_ptr types for our messages | ||
| ptrTypes += "typedef std::shared_ptr<const " | ||
| + desc->name() + "> Const" | ||
| + desc->name() + "SharedPtr;\n"; | ||
|
|
||
| printer.PrintRaw(ptrTypes.c_str()); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
| } // namespace google::protobuf::compiler::cpp |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.