From 9c308ad281900b8b14da207affc9d06e863bf22b Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Fri, 25 Oct 2024 14:25:32 -0700 Subject: [PATCH] Implement simple annotation bundling Summary: The standard annotation library is essentially a part of the Thrift compiler toolchain and they have to match each other. Unfortunately this is currently not the case and there exist multiple copies of the annotation library that are rarely updated and cause various issues. Reviewed By: aristidisp Differential Revision: D64916919 fbshipit-source-id: 19d95dced4a5c6e54eaf1164bf24d46b52f38575 --- thrift/annotation/build_annotations.cc | 45 +++++++++++++++++++++++++ thrift/annotation/bundled_annotations.h | 25 ++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 thrift/annotation/build_annotations.cc create mode 100644 thrift/annotation/bundled_annotations.h diff --git a/thrift/annotation/build_annotations.cc b/thrift/annotation/build_annotations.cc new file mode 100644 index 000000000..5f9a13224 --- /dev/null +++ b/thrift/annotation/build_annotations.cc @@ -0,0 +1,45 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * 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 +#include "thrift/compiler/source_location.h" + +int main() { + // Print the header. + fmt::print( + "// {}generated\n" + "\n" + "#include \n" + "\n", + '@'); + + // Read the file. + apache::thrift::compiler::source_manager sm; + std::string_view content = sm.get_file("scope.thrift")->text; + content.remove_suffix(1); // Remove trailing NUL. + + // Print the content. + fmt::print( + "namespace apache::thrift::detail {{\n" + "\n" + "const std::string_view bundled_annotations::scope_file_content() {{\n" + " return R\"{0}({1}){0}\";\n" + "}}\n" + "\n" + "}} // namespace apache::thrift::detail\n", + "__FBTHRIFT_TAG__", + content); +} diff --git a/thrift/annotation/bundled_annotations.h b/thrift/annotation/bundled_annotations.h new file mode 100644 index 000000000..447cc1463 --- /dev/null +++ b/thrift/annotation/bundled_annotations.h @@ -0,0 +1,25 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * 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 + +namespace apache::thrift::detail { + +struct bundled_annotations { + static const std::string_view scope_file_content(); +}; + +} // namespace apache::thrift::detail