summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/import/TARGETS.grpc15
-rw-r--r--etc/import/include/TARGETS.git25
-rw-r--r--etc/import/include/grpc++/TARGETS.grpc24
-rw-r--r--etc/import/include/grpc/TARGETS.grpc38
-rw-r--r--etc/import/include/grpcpp/TARGETS.grpc31
-rw-r--r--etc/import/src/TARGETS.git25
-rw-r--r--etc/import/src/core/ext/upb-generated/TARGETS.grpc50
-rw-r--r--etc/import/src/google/protobuf/TARGETS.protobuf7
-rw-r--r--etc/import/src/include/openssl/TARGETS.boringssl12
-rw-r--r--etc/import/third_party/address_sorting/include/address_sorting/TARGETS.grpc5
-rw-r--r--rules/CC/RULES22
11 files changed, 83 insertions, 131 deletions
diff --git a/etc/import/TARGETS.grpc b/etc/import/TARGETS.grpc
index a498d1a3..990a372c 100644
--- a/etc/import/TARGETS.grpc
+++ b/etc/import/TARGETS.grpc
@@ -1,7 +1,6 @@
{ "grpc++_public_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ ["./", "include/grpc++", "grpc++_public_headers"]
, ["./", "include/grpcpp", "grpcpp_public_headers"]
]
@@ -1427,9 +1426,8 @@
]
}
, "grpc++_sources":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "src/cpp/client/channel_cc.cc"
, "src/cpp/client/client_callback.cc"
, "src/cpp/client/client_context.cc"
@@ -1469,9 +1467,8 @@
]
}
, "grpc++_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "src/cpp/client/create_channel_internal.h"
, "src/cpp/common/channel_filter.h"
, "src/cpp/server/dynamic_thread_pool.h"
diff --git a/etc/import/include/TARGETS.git2 b/etc/import/include/TARGETS.git2
index ffea642e..2a356562 100644
--- a/etc/import/include/TARGETS.git2
+++ b/etc/import/include/TARGETS.git2
@@ -230,9 +230,8 @@
}
}
, "git2_public_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "git2.h"
, "git2/annotated_commit.h"
, "git2/apply.h"
diff --git a/etc/import/include/grpc++/TARGETS.grpc b/etc/import/include/grpc++/TARGETS.grpc
index 51508454..8e3807e0 100644
--- a/etc/import/include/grpc++/TARGETS.grpc
+++ b/etc/import/include/grpc++/TARGETS.grpc
@@ -1,8 +1,6 @@
{ "grpc++_public_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpc++"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "alarm.h"
, "channel.h"
, "client_context.h"
@@ -49,18 +47,16 @@
, "support/sync_stream.h"
, "support/time.h"
]
+ , "stage": ["grpc++"]
}
, "grpc++_config_proto_headers":
- { "type": ["@", "rules", "CC", "header directory"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["impl/codegen/config_protobuf.h"]
, "stage": ["grpc++"]
- , "public stage": ["yes"]
- , "hdrs": ["impl/codegen/config_protobuf.h"]
}
, "grpc++_codegen_base_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpc++"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "impl/codegen/async_stream.h"
, "impl/codegen/async_unary_call.h"
, "impl/codegen/byte_buffer.h"
@@ -92,11 +88,11 @@
, "impl/codegen/sync_stream.h"
, "impl/codegen/time.h"
]
+ , "stage": ["grpc++"]
}
, "grpc++_codegen_proto_headers":
- { "type": ["@", "rules", "CC", "header directory"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["impl/codegen/proto_utils.h"]
, "stage": ["grpc++"]
- , "public stage": ["yes"]
- , "hdrs": ["impl/codegen/proto_utils.h"]
}
}
diff --git a/etc/import/include/grpc/TARGETS.grpc b/etc/import/include/grpc/TARGETS.grpc
index 250b8c48..70c4d302 100644
--- a/etc/import/include/grpc/TARGETS.grpc
+++ b/etc/import/include/grpc/TARGETS.grpc
@@ -1,8 +1,6 @@
{ "gpr_public_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpc"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "support/alloc.h"
, "support/atm.h"
, "support/atm_gcc_atomic.h"
@@ -22,12 +20,11 @@
, "support/thd_id.h"
, "support/time.h"
]
+ , "stage": ["grpc"]
}
, "grpc_public_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpc"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "byte_buffer.h"
, "byte_buffer_reader.h"
, "compression.h"
@@ -41,12 +38,11 @@
, "load_reporting.h"
, "support/workaround_list.h"
]
+ , "stage": ["grpc"]
}
, "gpr_codegen_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpc"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "impl/codegen/atm.h"
, "impl/codegen/atm_gcc_atomic.h"
, "impl/codegen/atm_gcc_sync.h"
@@ -63,14 +59,13 @@
, "impl/codegen/sync_posix.h"
, "impl/codegen/sync_windows.h"
]
+ , "stage": ["grpc"]
}
, "gpr_codegen":
{"type": ["@", "rules", "CC", "library"], "hdrs": ["gpr_codegen_headers"]}
, "grpc_codegen_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpc"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "impl/codegen/byte_buffer.h"
, "impl/codegen/byte_buffer_reader.h"
, "impl/codegen/compression_types.h"
@@ -80,21 +75,20 @@
, "impl/codegen/status.h"
, "impl/codegen/slice.h"
]
+ , "stage": ["grpc"]
}
, "grpc_codegen":
{ "type": ["@", "rules", "CC", "library"]
, "hdrs": ["grpc_codegen_headers", "gpr_codegen_headers"]
}
, "grpc_secure_public_headers":
- { "type": ["@", "rules", "CC", "header directory"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["grpc_security.h"]
, "stage": ["grpc"]
- , "public stage": ["yes"]
- , "hdrs": ["grpc_security.h"]
}
, "census_headers":
- { "type": ["@", "rules", "CC", "header directory"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["census.h"]
, "stage": ["grpc"]
- , "public stage": ["yes"]
- , "hdrs": ["census.h"]
}
}
diff --git a/etc/import/include/grpcpp/TARGETS.grpc b/etc/import/include/grpcpp/TARGETS.grpc
index c42b215f..9f134359 100644
--- a/etc/import/include/grpcpp/TARGETS.grpc
+++ b/etc/import/include/grpcpp/TARGETS.grpc
@@ -1,8 +1,6 @@
{ "grpcpp_public_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpcpp"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "alarm.h"
, "alarm_impl.h"
, "channel.h"
@@ -75,18 +73,16 @@
, "support/time.h"
, "support/validate_service_config.h"
]
+ , "stage": ["grpcpp"]
}
, "grpcpp_config_proto_headers":
- { "type": ["@", "rules", "CC", "header directory"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["impl/codegen/config_protobuf.h"]
, "stage": ["grpcpp"]
- , "public stage": ["yes"]
- , "hdrs": ["impl/codegen/config_protobuf.h"]
}
, "grpcpp_codegen_base_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpcpp"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "impl/codegen/async_generic_service.h"
, "impl/codegen/async_stream.h"
, "impl/codegen/async_stream_impl.h"
@@ -141,22 +137,21 @@
, "impl/codegen/sync_stream_impl.h"
, "impl/codegen/time.h"
]
+ , "stage": ["grpcpp"]
}
, "grpcpp_codegen_proto_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["grpcpp"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "impl/codegen/proto_buffer_reader.h"
, "impl/codegen/proto_buffer_writer.h"
, "impl/codegen/proto_utils.h"
]
+ , "stage": ["grpcpp"]
}
, "grpc++_internal_hdrs_only_headers":
- { "type": ["@", "rules", "CC", "header directory"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["impl/codegen/sync.h"]
, "stage": ["grpcpp"]
- , "public stage": ["yes"]
- , "hdrs": ["impl/codegen/sync.h"]
}
, "grpc++_internal_hdrs_only":
{ "type": ["@", "rules", "CC", "library"]
diff --git a/etc/import/src/TARGETS.git2 b/etc/import/src/TARGETS.git2
index b9c30570..2170d5cf 100644
--- a/etc/import/src/TARGETS.git2
+++ b/etc/import/src/TARGETS.git2
@@ -1,7 +1,6 @@
{ "git2_private_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "alloc.h"
, "annotated_commit.h"
, "apply.h"
diff --git a/etc/import/src/core/ext/upb-generated/TARGETS.grpc b/etc/import/src/core/ext/upb-generated/TARGETS.grpc
index 597dfc6c..ec78b46e 100644
--- a/etc/import/src/core/ext/upb-generated/TARGETS.grpc
+++ b/etc/import/src/core/ext/upb-generated/TARGETS.grpc
@@ -15,9 +15,8 @@
, "deps": [["@", "upb", ".", "upb"]]
}
, "envoy_core_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "envoy/api/v2/core/address.upb.h"
, "envoy/api/v2/core/backoff.upb.h"
, "envoy/api/v2/core/base.upb.h"
@@ -31,18 +30,16 @@
]
}
, "udpa_annotations_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "udpa/annotations/migrate.upb.h"
, "udpa/annotations/sensitive.upb.h"
, "udpa/annotations/status.upb.h"
]
}
, "google_api_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "google/api/annotations.upb.h"
, "google/api/http.upb.h"
, "google/protobuf/any.upb.h"
@@ -56,20 +53,17 @@
]
}
, "proto_gen_validate_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs": ["gogoproto/gogo.upb.h", "validate/validate.upb.h"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["gogoproto/gogo.upb.h", "validate/validate.upb.h"]
}
, "envoy_annotations_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
["envoy/annotations/deprecation.upb.h", "envoy/annotations/resource.upb.h"]
}
, "envoy_type_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "envoy/type/http.upb.h"
, "envoy/type/matcher/regex.upb.h"
, "envoy/type/matcher/string.upb.h"
@@ -81,9 +75,8 @@
]
}
, "envoy_ads_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "envoy/api/v2/auth/cert.upb.h"
, "envoy/api/v2/auth/common.upb.h"
, "envoy/api/v2/auth/secret.upb.h"
@@ -119,18 +112,15 @@
]
}
, "udpa_orca_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs": ["udpa/data/orca/v1/orca_load_report.upb.h"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["udpa/data/orca/v1/orca_load_report.upb.h"]
}
, "grpc_health_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs": ["src/proto/grpc/health/v1/health.upb.h"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["src/proto/grpc/health/v1/health.upb.h"]
}
, "grpc_lb_upb_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "public stage": ["yes"]
- , "hdrs": ["src/proto/grpc/lb/v1/load_balancer.upb.h"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["src/proto/grpc/lb/v1/load_balancer.upb.h"]
}
}
diff --git a/etc/import/src/google/protobuf/TARGETS.protobuf b/etc/import/src/google/protobuf/TARGETS.protobuf
index 47eb5062..5b7a0a1c 100644
--- a/etc/import/src/google/protobuf/TARGETS.protobuf
+++ b/etc/import/src/google/protobuf/TARGETS.protobuf
@@ -1,8 +1,6 @@
{ "protobuf_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["google", "protobuf"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "any.h"
, "any.pb.h"
, "api.pb.h"
@@ -232,6 +230,7 @@
, "wire_format_lite.h"
, "wrappers.pb.h"
]
+ , "stage": ["google", "protobuf"]
}
, "protobuf_lite":
{ "type": ["@", "rules", "CC", "library"]
diff --git a/etc/import/src/include/openssl/TARGETS.boringssl b/etc/import/src/include/openssl/TARGETS.boringssl
index 25495bdd..4b2ae6f8 100644
--- a/etc/import/src/include/openssl/TARGETS.boringssl
+++ b/etc/import/src/include/openssl/TARGETS.boringssl
@@ -1,8 +1,6 @@
{ "crypto_headers":
- { "type": ["@", "rules", "CC", "header directory"]
- , "stage": ["openssl"]
- , "public stage": ["yes"]
- , "hdrs":
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs":
[ "aead.h"
, "aes.h"
, "arm_arch.h"
@@ -75,11 +73,11 @@
, "x509_vfy.h"
, "x509v3.h"
]
+ , "stage": ["openssl"]
}
, "ssl_headers":
- { "type": ["@", "rules", "CC", "header directory"]
+ { "type": ["@", "rules", "data", "staged"]
+ , "srcs": ["dtls1.h", "srtp.h", "ssl.h", "ssl3.h", "tls1.h"]
, "stage": ["openssl"]
- , "public stage": ["yes"]
- , "hdrs": ["dtls1.h", "srtp.h", "ssl.h", "ssl3.h", "tls1.h"]
}
}
diff --git a/etc/import/third_party/address_sorting/include/address_sorting/TARGETS.grpc b/etc/import/third_party/address_sorting/include/address_sorting/TARGETS.grpc
index f7b1d386..065f2436 100644
--- a/etc/import/third_party/address_sorting/include/address_sorting/TARGETS.grpc
+++ b/etc/import/third_party/address_sorting/include/address_sorting/TARGETS.grpc
@@ -1,7 +1,6 @@
{ "address_sorting_headers":
- { "type": ["@", "rules", "CC", "header directory"]
+ { "type": ["@", "rules", "data", "staged"]
, "stage": ["address_sorting"]
- , "public stage": ["yes"]
- , "hdrs": ["address_sorting.h"]
+ , "srcs": ["address_sorting.h"]
}
}
diff --git a/rules/CC/RULES b/rules/CC/RULES
index 81140cb8..d687bf32 100644
--- a/rules/CC/RULES
+++ b/rules/CC/RULES
@@ -107,18 +107,13 @@
, "efficiently by the tool."
]
, "target_fields": ["hdrs"]
- , "string_fields": ["stage", "public stage"]
+ , "string_fields": ["stage"]
, "field_doc":
{ "hdrs": ["The header files to be put into the header directory."]
, "stage":
[ "The location of the header directory."
, "Path segments are joined with \"/\"."
]
- , "public stage":
- [ "If non-empty, no closure for the header directory's stage is created, "
- , "so can be combined with other header directories having the same "
- , "public staging directory."
- ]
}
, "expression":
{ "type": "let*"
@@ -141,18 +136,9 @@
}
]
, [ "dir"
- , { "type": "if"
- , "cond": {"type": "FIELD", "name": "public stage"}
- , "then":
- { "type": "to_subdir"
- , "subdir": {"type": "var", "name": "stage"}
- , "$1": {"type": "var", "name": "hdrs"}
- }
- , "else":
- { "type": "singleton_map"
- , "key": {"type": "var", "name": "stage"}
- , "value": {"type": "TREE", "$1": {"type": "var", "name": "hdrs"}}
- }
+ , { "type": "singleton_map"
+ , "key": {"type": "var", "name": "stage"}
+ , "value": {"type": "TREE", "$1": {"type": "var", "name": "hdrs"}}
}
]
]
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-06 10:57:11 +0000