diff --git a/build.json b/build.json index 0a50080db6e526cf9dcbe1f3d31325f7fefd26e1..97e19d52acab244950d49df3fcd6513ffe630963 100644 --- a/build.json +++ b/build.json @@ -11,88 +11,6 @@ "filegroups": [ { "name": "grpc_base", - "src": [ - "src/core/channel/call_op_string.c", - "src/core/channel/census_filter.c", - "src/core/channel/channel_args.c", - "src/core/channel/channel_stack.c", - "src/core/channel/child_channel.c", - "src/core/channel/client_channel.c", - "src/core/channel/client_setup.c", - "src/core/channel/connected_channel.c", - "src/core/channel/http_client_filter.c", - "src/core/channel/http_filter.c", - "src/core/channel/http_server_filter.c", - "src/core/channel/metadata_buffer.c", - "src/core/channel/noop_filter.c", - "src/core/compression/algorithm.c", - "src/core/compression/message_compress.c", - "src/core/httpcli/format_request.c", - "src/core/httpcli/httpcli.c", - "src/core/httpcli/httpcli_security_context.c", - "src/core/httpcli/parser.c", - "src/core/iomgr/alarm.c", - "src/core/iomgr/alarm_heap.c", - "src/core/iomgr/endpoint.c", - "src/core/iomgr/endpoint_pair_posix.c", - "src/core/iomgr/fd_posix.c", - "src/core/iomgr/iomgr.c", - "src/core/iomgr/iomgr_posix.c", - "src/core/iomgr/pollset_kick_posix.c", - "src/core/iomgr/pollset_multipoller_with_poll_posix.c", - "src/core/iomgr/pollset_posix.c", - "src/core/iomgr/resolve_address_posix.c", - "src/core/iomgr/sockaddr_utils.c", - "src/core/iomgr/socket_utils_common_posix.c", - "src/core/iomgr/socket_utils_linux.c", - "src/core/iomgr/socket_utils_posix.c", - "src/core/iomgr/tcp_client_posix.c", - "src/core/iomgr/tcp_posix.c", - "src/core/iomgr/tcp_server_posix.c", - "src/core/iomgr/time_averaged_stats.c", - "src/core/statistics/census_init.c", - "src/core/statistics/census_log.c", - "src/core/statistics/census_rpc_stats.c", - "src/core/statistics/census_tracing.c", - "src/core/statistics/hash_table.c", - "src/core/statistics/window_stats.c", - "src/core/surface/byte_buffer.c", - "src/core/surface/byte_buffer_reader.c", - "src/core/surface/call.c", - "src/core/surface/channel.c", - "src/core/surface/channel_create.c", - "src/core/surface/client.c", - "src/core/surface/completion_queue.c", - "src/core/surface/event_string.c", - "src/core/surface/init.c", - "src/core/surface/lame_client.c", - "src/core/surface/secure_channel_create.c", - "src/core/surface/secure_server_create.c", - "src/core/surface/server.c", - "src/core/surface/server_chttp2.c", - "src/core/surface/server_create.c", - "src/core/transport/chttp2/alpn.c", - "src/core/transport/chttp2/bin_encoder.c", - "src/core/transport/chttp2/frame_data.c", - "src/core/transport/chttp2/frame_goaway.c", - "src/core/transport/chttp2/frame_ping.c", - "src/core/transport/chttp2/frame_rst_stream.c", - "src/core/transport/chttp2/frame_settings.c", - "src/core/transport/chttp2/frame_window_update.c", - "src/core/transport/chttp2/hpack_parser.c", - "src/core/transport/chttp2/hpack_table.c", - "src/core/transport/chttp2/huffsyms.c", - "src/core/transport/chttp2/status_conversion.c", - "src/core/transport/chttp2/stream_encoder.c", - "src/core/transport/chttp2/stream_map.c", - "src/core/transport/chttp2/timeout_encoding.c", - "src/core/transport/chttp2/varint.c", - "src/core/transport/chttp2_transport.c", - "src/core/transport/metadata.c", - "src/core/transport/stream_op.c", - "src/core/transport/transport.c", - "third_party/cJSON/cJSON.c" - ], "public_headers": [ "include/grpc/byte_buffer.h", "include/grpc/byte_buffer_reader.h", @@ -127,9 +45,9 @@ "src/core/iomgr/iomgr.h", "src/core/iomgr/iomgr_internal.h", "src/core/iomgr/iomgr_posix.h", + "src/core/iomgr/pollset.h", "src/core/iomgr/pollset_kick.h", "src/core/iomgr/pollset_kick_posix.h", - "src/core/iomgr/pollset.h", "src/core/iomgr/pollset_posix.h", "src/core/iomgr/resolve_address.h", "src/core/iomgr/sockaddr.h", @@ -177,6 +95,88 @@ "src/core/transport/stream_op.h", "src/core/transport/transport.h", "src/core/transport/transport_impl.h" + ], + "src": [ + "src/core/channel/call_op_string.c", + "src/core/channel/census_filter.c", + "src/core/channel/channel_args.c", + "src/core/channel/channel_stack.c", + "src/core/channel/child_channel.c", + "src/core/channel/client_channel.c", + "src/core/channel/client_setup.c", + "src/core/channel/connected_channel.c", + "src/core/channel/http_client_filter.c", + "src/core/channel/http_filter.c", + "src/core/channel/http_server_filter.c", + "src/core/channel/metadata_buffer.c", + "src/core/channel/noop_filter.c", + "src/core/compression/algorithm.c", + "src/core/compression/message_compress.c", + "src/core/httpcli/format_request.c", + "src/core/httpcli/httpcli.c", + "src/core/httpcli/httpcli_security_context.c", + "src/core/httpcli/parser.c", + "src/core/iomgr/alarm.c", + "src/core/iomgr/alarm_heap.c", + "src/core/iomgr/endpoint.c", + "src/core/iomgr/endpoint_pair_posix.c", + "src/core/iomgr/fd_posix.c", + "src/core/iomgr/iomgr.c", + "src/core/iomgr/iomgr_posix.c", + "src/core/iomgr/pollset_kick_posix.c", + "src/core/iomgr/pollset_multipoller_with_poll_posix.c", + "src/core/iomgr/pollset_posix.c", + "src/core/iomgr/resolve_address_posix.c", + "src/core/iomgr/sockaddr_utils.c", + "src/core/iomgr/socket_utils_common_posix.c", + "src/core/iomgr/socket_utils_linux.c", + "src/core/iomgr/socket_utils_posix.c", + "src/core/iomgr/tcp_client_posix.c", + "src/core/iomgr/tcp_posix.c", + "src/core/iomgr/tcp_server_posix.c", + "src/core/iomgr/time_averaged_stats.c", + "src/core/statistics/census_init.c", + "src/core/statistics/census_log.c", + "src/core/statistics/census_rpc_stats.c", + "src/core/statistics/census_tracing.c", + "src/core/statistics/hash_table.c", + "src/core/statistics/window_stats.c", + "src/core/surface/byte_buffer.c", + "src/core/surface/byte_buffer_reader.c", + "src/core/surface/call.c", + "src/core/surface/channel.c", + "src/core/surface/channel_create.c", + "src/core/surface/client.c", + "src/core/surface/completion_queue.c", + "src/core/surface/event_string.c", + "src/core/surface/init.c", + "src/core/surface/lame_client.c", + "src/core/surface/secure_channel_create.c", + "src/core/surface/secure_server_create.c", + "src/core/surface/server.c", + "src/core/surface/server_chttp2.c", + "src/core/surface/server_create.c", + "src/core/transport/chttp2/alpn.c", + "src/core/transport/chttp2/bin_encoder.c", + "src/core/transport/chttp2/frame_data.c", + "src/core/transport/chttp2/frame_goaway.c", + "src/core/transport/chttp2/frame_ping.c", + "src/core/transport/chttp2/frame_rst_stream.c", + "src/core/transport/chttp2/frame_settings.c", + "src/core/transport/chttp2/frame_window_update.c", + "src/core/transport/chttp2/hpack_parser.c", + "src/core/transport/chttp2/hpack_table.c", + "src/core/transport/chttp2/huffsyms.c", + "src/core/transport/chttp2/status_conversion.c", + "src/core/transport/chttp2/stream_encoder.c", + "src/core/transport/chttp2/stream_map.c", + "src/core/transport/chttp2/timeout_encoding.c", + "src/core/transport/chttp2/varint.c", + "src/core/transport/chttp2_transport.c", + "src/core/transport/metadata.c", + "src/core/transport/stream_op.c", + "src/core/transport/transport.c", + "third_party/cJSON/cJSON.c" ] } ], @@ -184,41 +184,11 @@ { "name": "gpr", "build": "all", - "secure": false, - "vs_project_guid": "{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}", - "src": [ - "src/core/support/alloc.c", - "src/core/support/cancellable.c", - "src/core/support/cmdline.c", - "src/core/support/cpu_linux.c", - "src/core/support/cpu_posix.c", - "src/core/support/histogram.c", - "src/core/support/host_port.c", - "src/core/support/log_android.c", - "src/core/support/log.c", - "src/core/support/log_linux.c", - "src/core/support/log_posix.c", - "src/core/support/log_win32.c", - "src/core/support/murmur_hash.c", - "src/core/support/slice_buffer.c", - "src/core/support/slice.c", - "src/core/support/string.c", - "src/core/support/string_posix.c", - "src/core/support/string_win32.c", - "src/core/support/sync.c", - "src/core/support/sync_posix.c", - "src/core/support/sync_win32.c", - "src/core/support/thd_posix.c", - "src/core/support/thd_win32.c", - "src/core/support/time.c", - "src/core/support/time_posix.c", - "src/core/support/time_win32.c" - ], "public_headers": [ "include/grpc/support/alloc.h", + "include/grpc/support/atm.h", "include/grpc/support/atm_gcc_atomic.h", "include/grpc/support/atm_gcc_sync.h", - "include/grpc/support/atm.h", "include/grpc/support/atm_win32.h", "include/grpc/support/cancellable_platform.h", "include/grpc/support/cmdline.h", @@ -226,11 +196,11 @@ "include/grpc/support/host_port.h", "include/grpc/support/log.h", "include/grpc/support/port_platform.h", - "include/grpc/support/slice_buffer.h", "include/grpc/support/slice.h", + "include/grpc/support/slice_buffer.h", "include/grpc/support/string.h", - "include/grpc/support/sync_generic.h", "include/grpc/support/sync.h", + "include/grpc/support/sync_generic.h", "include/grpc/support/sync_posix.h", "include/grpc/support/sync_win32.h", "include/grpc/support/thd.h", @@ -245,32 +215,49 @@ "src/core/support/cpu.h", "src/core/support/murmur_hash.h", "src/core/support/thd_internal.h" - ] + ], + "src": [ + "src/core/support/alloc.c", + "src/core/support/cancellable.c", + "src/core/support/cmdline.c", + "src/core/support/cpu_linux.c", + "src/core/support/cpu_posix.c", + "src/core/support/histogram.c", + "src/core/support/host_port.c", + "src/core/support/log.c", + "src/core/support/log_android.c", + "src/core/support/log_linux.c", + "src/core/support/log_posix.c", + "src/core/support/log_win32.c", + "src/core/support/murmur_hash.c", + "src/core/support/slice.c", + "src/core/support/slice_buffer.c", + "src/core/support/string.c", + "src/core/support/string_posix.c", + "src/core/support/string_win32.c", + "src/core/support/sync.c", + "src/core/support/sync_posix.c", + "src/core/support/sync_win32.c", + "src/core/support/thd_posix.c", + "src/core/support/thd_win32.c", + "src/core/support/time.c", + "src/core/support/time_posix.c", + "src/core/support/time_win32.c" + ], + "secure": false, + "vs_project_guid": "{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}" }, { - "name": "grpc", - "build": "all", - "secure": true, - "vs_project_guid": "{29D16885-7228-4C31-81ED-5F9187C7F2A9}", - "baselib": true, - "filegroups": [ - "grpc_base" - ], + "name": "gpr_test_util", + "build": "private", "src": [ - "src/core/security/auth.c", - "src/core/security/base64.c", - "src/core/security/credentials.c", - "src/core/security/factories.c", - "src/core/security/google_root_certs.c", - "src/core/security/json_token.c", - "src/core/security/secure_endpoint.c", - "src/core/security/secure_transport_setup.c", - "src/core/security/security_context.c", - "src/core/security/server_secure_chttp2.c", - "src/core/tsi/fake_transport_security.c", - "src/core/tsi/ssl_transport_security.c", - "src/core/tsi/transport_security.c" + "test/core/util/test_config.c" ], + "vs_project_guid": "{EAB0A629-17A9-44DB-B5FF-E91A721FE037}" + }, + { + "name": "grpc", + "build": "all", "public_headers": [ "include/grpc/grpc_security.h" ], @@ -287,81 +274,37 @@ "src/core/tsi/transport_security.h", "src/core/tsi/transport_security_interface.h" ], + "src": [ + "src/core/security/auth.c", + "src/core/security/base64.c", + "src/core/security/credentials.c", + "src/core/security/factories.c", + "src/core/security/google_root_certs.c", + "src/core/security/json_token.c", + "src/core/security/secure_endpoint.c", + "src/core/security/secure_transport_setup.c", + "src/core/security/security_context.c", + "src/core/security/server_secure_chttp2.c", + "src/core/tsi/fake_transport_security.c", + "src/core/tsi/ssl_transport_security.c", + "src/core/tsi/transport_security.c" + ], + "baselib": true, "deps": [ "gpr" - ] - }, - { - "name": "grpc_unsecure", - "build": "all", - "secure": false, - "vs_project_guid": "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}", - "baselib": true, + ], "filegroups": [ "grpc_base" ], - "deps": [ - "gpr" - ] - }, - { - "name": "gpr_test_util", - "build": "private", - "vs_project_guid": "{EAB0A629-17A9-44DB-B5FF-E91A721FE037}", - "src": [ - "test/core/util/test_config.c" - ] - }, - { - "name": "grpc_test_util", - "build": "private", - "vs_project_guid": "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}", - "src": [ - "test/core/end2end/cq_verifier.c", - "test/core/end2end/data/test_root_cert.c", - "test/core/end2end/data/prod_roots_certs.c", - "test/core/end2end/data/server1_cert.c", - "test/core/end2end/data/server1_key.c", - "test/core/iomgr/endpoint_tests.c", - "test/core/statistics/census_log_tests.c", - "test/core/transport/transport_end2end_tests.c", - "test/core/util/grpc_profiler.c", - "test/core/util/port_posix.c", - "test/core/util/parse_hexstring.c", - "test/core/util/slice_splitter.c" - ] + "secure": true, + "vs_project_guid": "{29D16885-7228-4C31-81ED-5F9187C7F2A9}" }, { "name": "grpc++", "build": "all", - "c++": true, - "secure": true, - "vs_project_guid": "{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}", - "src": [ - "src/cpp/client/channel.cc", - "src/cpp/client/channel_arguments.cc", - "src/cpp/client/client_context.cc", - "src/cpp/client/create_channel.cc", - "src/cpp/client/credentials.cc", - "src/cpp/client/internal_stub.cc", - "src/cpp/proto/proto_utils.cc", - "src/cpp/common/rpc_method.cc", - "src/cpp/server/async_server.cc", - "src/cpp/server/async_server_context.cc", - "src/cpp/server/completion_queue.cc", - "src/cpp/server/server_builder.cc", - "src/cpp/server/server_context_impl.cc", - "src/cpp/server/server.cc", - "src/cpp/server/server_rpc_handler.cc", - "src/cpp/server/server_credentials.cc", - "src/cpp/server/thread_pool.cc", - "src/cpp/stream/stream_context.cc", - "src/cpp/util/status.cc", - "src/cpp/util/time.cc" - ], "public_headers": [ - "include/grpc++/async_server_context.h", "include/grpc++/async_server.h", + "include/grpc++/async_server_context.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", "include/grpc++/client_context.h", @@ -372,13 +315,13 @@ "include/grpc++/impl/internal_stub.h", "include/grpc++/impl/rpc_method.h", "include/grpc++/impl/rpc_service_method.h", + "include/grpc++/server.h", "include/grpc++/server_builder.h", "include/grpc++/server_context.h", "include/grpc++/server_credentials.h", - "include/grpc++/server.h", "include/grpc++/status.h", - "include/grpc++/stream_context_interface.h", - "include/grpc++/stream.h" + "include/grpc++/stream.h", + "include/grpc++/stream_context_interface.h" ], "headers": [ "src/cpp/client/channel.h", @@ -388,74 +331,86 @@ "src/cpp/stream/stream_context.h", "src/cpp/util/time.h" ], + "src": [ + "src/cpp/client/channel.cc", + "src/cpp/client/channel_arguments.cc", + "src/cpp/client/client_context.cc", + "src/cpp/client/create_channel.cc", + "src/cpp/client/credentials.cc", + "src/cpp/client/internal_stub.cc", + "src/cpp/common/rpc_method.cc", + "src/cpp/proto/proto_utils.cc", + "src/cpp/server/async_server.cc", + "src/cpp/server/async_server_context.cc", + "src/cpp/server/completion_queue.cc", + "src/cpp/server/server.cc", + "src/cpp/server/server_builder.cc", + "src/cpp/server/server_context_impl.cc", + "src/cpp/server/server_credentials.cc", + "src/cpp/server/server_rpc_handler.cc", + "src/cpp/server/thread_pool.cc", + "src/cpp/stream/stream_context.cc", + "src/cpp/util/status.cc", + "src/cpp/util/time.cc" + ], + "c++": true, "deps": [ "grpc" - ] + ], + "secure": true, + "vs_project_guid": "{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}" }, { "name": "grpc++_test_util", "build": "private", "src": [ - "test/cpp/util/messages.proto", "test/cpp/util/echo.proto", "test/cpp/util/echo_duplicate.proto", - "test/cpp/util/create_test_channel.cc", - "test/cpp/end2end/async_test_server.cc" + "test/cpp/util/messages.proto", + "test/cpp/end2end/async_test_server.cc", + "test/cpp/util/create_test_channel.cc" ], "c++": true - } - ], - "targets": [ - { - "name": "gen_hpack_tables", - "build": "tool", - "src": [ - "src/core/transport/chttp2/gen_hpack_tables.c" - ], - "deps": [ - "grpc_test_util", - "gpr", - "grpc" - ] - }, - - { - "name": "cpp_plugin", - "build": "protoc", - "c++": true, - "secure": false, - "src": [ - "src/compiler/cpp_plugin.cc", - "src/compiler/cpp_generator.cc" - ], - "headers": [ - "src/compiler/cpp_generator.h", - "src/compiler/cpp_generator_helpers.h" - ], - "deps": [] }, { - "name": "ruby_plugin", - "build": "protoc", - "c++": true, - "secure": false, + "name": "grpc_test_util", + "build": "private", "src": [ - "src/compiler/ruby_plugin.cc", - "src/compiler/ruby_generator.cc" - ], - "headers": [ - "src/compiler/cpp_generator.h", - "src/compiler/cpp_generator_helpers-inl.h", - "src/compiler/cpp_generator_map-inl.h", - "src/compiler/cpp_generator_string-inl.h" + "test/core/end2end/cq_verifier.c", + "test/core/end2end/data/prod_roots_certs.c", + "test/core/end2end/data/server1_cert.c", + "test/core/end2end/data/server1_key.c", + "test/core/end2end/data/test_root_cert.c", + "test/core/iomgr/endpoint_tests.c", + "test/core/statistics/census_log_tests.c", + "test/core/transport/transport_end2end_tests.c", + "test/core/util/grpc_profiler.c", + "test/core/util/parse_hexstring.c", + "test/core/util/port_posix.c", + "test/core/util/slice_splitter.c" ], - "deps": [] + "vs_project_guid": "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}" }, { - "name": "grpc_byte_buffer_reader_test", + "name": "grpc_unsecure", + "build": "all", + "baselib": true, + "deps": [ + "gpr" + ], + "filegroups": [ + "grpc_base" + ], + "secure": false, + "vs_project_guid": "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}" + } + ], + "targets": [ + { + "name": "alarm_heap_test", "build": "test", "src": [ - "test/core/surface/byte_buffer_reader_test.c" + "test/core/iomgr/alarm_heap_test.c" ], "deps": [ "grpc_test_util", @@ -465,153 +420,179 @@ ] }, { - "name": "gpr_cancellable_test", + "name": "alarm_list_test", "build": "test", "src": [ - "test/core/support/cancellable_test.c" + "test/core/iomgr/alarm_list_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_log_test", + "name": "alarm_test", "build": "test", "src": [ - "test/core/support/log_test.c" + "test/core/iomgr/alarm_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_useful_test", + "name": "alpn_test", "build": "test", "src": [ - "test/core/support/useful_test.c" + "test/core/transport/chttp2/alpn_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_cmdline_test", + "name": "bin_encoder_test", "build": "test", "src": [ - "test/core/support/cmdline_test.c" + "test/core/transport/chttp2/bin_encoder_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_histogram_test", + "name": "census_hash_table_test", "build": "test", "src": [ - "test/core/support/histogram_test.c" + "test/core/statistics/hash_table_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_host_port_test", + "name": "census_statistics_multiple_writers_circular_buffer_test", "build": "test", "src": [ - "test/core/support/host_port_test.c" + "test/core/statistics/multiple_writers_circular_buffer_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_slice_buffer_test", + "name": "census_statistics_multiple_writers_test", "build": "test", "src": [ - "test/core/support/slice_buffer_test.c" + "test/core/statistics/multiple_writers_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_slice_test", + "name": "census_statistics_performance_test", "build": "test", "src": [ - "test/core/support/slice_test.c" + "test/core/statistics/performance_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_string_test", + "name": "census_statistics_quick_test", "build": "test", "src": [ - "test/core/support/string_test.c" + "test/core/statistics/quick_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_sync_test", + "name": "census_statistics_small_log_test", "build": "test", "src": [ - "test/core/support/sync_test.c" + "test/core/statistics/small_log_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_thd_test", - "build": "test", + "name": "census_stats_store_test", + "build": "executable", "src": [ - "test/core/support/thd_test.c" + "test/core/statistics/rpc_stats_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "gpr_time_test", + "name": "census_stub_test", "build": "test", "src": [ - "test/core/support/time_test.c" + "test/core/statistics/census_stub_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "murmur_hash_test", - "build": "test", + "name": "census_trace_store_test", + "build": "executable", "src": [ - "test/core/support/murmur_hash_test.c" + "test/core/statistics/trace_test.c" ], "deps": [ + "grpc_test_util", + "grpc", "gpr_test_util", "gpr" ] }, { - "name": "grpc_stream_op_test", + "name": "census_window_stats_test", "build": "test", "src": [ - "test/core/transport/stream_op_test.c" + "test/core/statistics/window_stats_test.c" ], "deps": [ "grpc_test_util", @@ -621,23 +602,23 @@ ] }, { - "name": "alpn_test", + "name": "channel_arguments_test", "build": "test", "src": [ - "test/core/transport/chttp2/alpn_test.c" + "test/cpp/client/channel_arguments_test.cc" ], + "c++": true, "deps": [ - "grpc_test_util", + "grpc++", "grpc", - "gpr_test_util", "gpr" ] }, { - "name": "time_averaged_stats_test", + "name": "chttp2_status_conversion_test", "build": "test", "src": [ - "test/core/iomgr/time_averaged_stats_test.c" + "test/core/transport/chttp2/status_conversion_test.c" ], "deps": [ "grpc_test_util", @@ -660,10 +641,10 @@ ] }, { - "name": "hpack_table_test", + "name": "chttp2_stream_map_test", "build": "test", "src": [ - "test/core/transport/chttp2/hpack_table_test.c" + "test/core/transport/chttp2/stream_map_test.c" ], "deps": [ "grpc_test_util", @@ -673,10 +654,10 @@ ] }, { - "name": "chttp2_stream_map_test", + "name": "chttp2_transport_end2end_test", "build": "test", "src": [ - "test/core/transport/chttp2/stream_map_test.c" + "test/core/transport/chttp2_transport_end2end_test.c" ], "deps": [ "grpc_test_util", @@ -686,23 +667,38 @@ ] }, { - "name": "hpack_parser_test", + "name": "cpp_plugin", + "build": "protoc", + "headers": [ + "src/compiler/cpp_generator.h", + "src/compiler/cpp_generator_helpers.h" + ], + "src": [ + "src/compiler/cpp_generator.cc", + "src/compiler/cpp_plugin.cc" + ], + "c++": true, + "deps": [], + "secure": false + }, + { + "name": "credentials_test", "build": "test", "src": [ - "test/core/transport/chttp2/hpack_parser_test.c" + "test/cpp/client/credentials_test.cc" ], + "c++": true, "deps": [ - "grpc_test_util", + "grpc++", "grpc", - "gpr_test_util", "gpr" ] }, { - "name": "transport_metadata_test", + "name": "dualstack_socket_test", "build": "test", "src": [ - "test/core/transport/metadata_test.c" + "test/core/end2end/dualstack_socket_test.c" ], "deps": [ "grpc_test_util", @@ -712,36 +708,38 @@ ] }, { - "name": "chttp2_status_conversion_test", + "name": "echo_client", "build": "test", "src": [ - "test/core/transport/chttp2/status_conversion_test.c" + "test/core/echo/client.c" ], "deps": [ "grpc_test_util", "grpc", "gpr_test_util", "gpr" - ] + ], + "run": false }, { - "name": "chttp2_transport_end2end_test", + "name": "echo_server", "build": "test", "src": [ - "test/core/transport/chttp2_transport_end2end_test.c" + "test/core/echo/server.c" ], "deps": [ "grpc_test_util", "grpc", "gpr_test_util", "gpr" - ] + ], + "run": false }, { - "name": "tcp_posix_test", + "name": "echo_test", "build": "test", "src": [ - "test/core/iomgr/tcp_posix_test.c" + "test/core/echo/echo_test.c" ], "deps": [ "grpc_test_util", @@ -751,23 +749,26 @@ ] }, { - "name": "dualstack_socket_test", + "name": "end2end_test", "build": "test", "src": [ - "test/core/end2end/dualstack_socket_test.c" + "test/cpp/end2end/end2end_test.cc" ], + "c++": true, "deps": [ + "grpc++_test_util", "grpc_test_util", + "grpc++", "grpc", "gpr_test_util", "gpr" ] }, { - "name": "no_server_test", + "name": "fd_posix_test", "build": "test", "src": [ - "test/core/end2end/no_server_test.c" + "test/core/iomgr/fd_posix_test.c" ], "deps": [ "grpc_test_util", @@ -777,36 +778,38 @@ ] }, { - "name": "resolve_address_test", + "name": "fling_client", "build": "test", "src": [ - "test/core/iomgr/resolve_address_test.c" + "test/core/fling/client.c" ], "deps": [ "grpc_test_util", "grpc", "gpr_test_util", "gpr" - ] + ], + "run": false }, { - "name": "sockaddr_utils_test", + "name": "fling_server", "build": "test", "src": [ - "test/core/iomgr/sockaddr_utils_test.c" + "test/core/fling/server.c" ], "deps": [ "grpc_test_util", "grpc", "gpr_test_util", "gpr" - ] + ], + "run": false }, { - "name": "tcp_server_posix_test", + "name": "fling_stream_test", "build": "test", "src": [ - "test/core/iomgr/tcp_server_posix_test.c" + "test/core/fling/fling_stream_test.c" ], "deps": [ "grpc_test_util", @@ -816,10 +819,10 @@ ] }, { - "name": "tcp_client_posix_test", + "name": "fling_test", "build": "test", "src": [ - "test/core/iomgr/tcp_client_posix_test.c" + "test/core/fling/fling_test.c" ], "deps": [ "grpc_test_util", @@ -829,179 +832,154 @@ ] }, { - "name": "grpc_channel_stack_test", - "build": "test", + "name": "gen_hpack_tables", + "build": "tool", "src": [ - "test/core/channel/channel_stack_test.c" + "src/core/transport/chttp2/gen_hpack_tables.c" ], "deps": [ "grpc_test_util", - "grpc", - "gpr_test_util", - "gpr" + "gpr", + "grpc" ] }, { - "name": "metadata_buffer_test", + "name": "gpr_cancellable_test", "build": "test", "src": [ - "test/core/channel/metadata_buffer_test.c" + "test/core/support/cancellable_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "grpc_completion_queue_test", + "name": "gpr_cmdline_test", "build": "test", "src": [ - "test/core/surface/completion_queue_test.c" + "test/core/support/cmdline_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "grpc_completion_queue_benchmark", - "build": "benchmark", + "name": "gpr_histogram_test", + "build": "test", "src": [ - "test/core/surface/completion_queue_benchmark.c" + "test/core/support/histogram_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_trace_store_test", - "build": "executable", + "name": "gpr_host_port_test", + "build": "test", "src": [ - "test/core/statistics/trace_test.c" + "test/core/support/host_port_test.c" ], - "deps": [ - "grpc_test_util", - "grpc", + "deps": [ "gpr_test_util", "gpr" ] }, { - "name": "census_stats_store_test", - "build": "executable", + "name": "gpr_log_test", + "build": "test", "src": [ - "test/core/statistics/rpc_stats_test.c" + "test/core/support/log_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_window_stats_test", + "name": "gpr_slice_buffer_test", "build": "test", "src": [ - "test/core/statistics/window_stats_test.c" + "test/core/support/slice_buffer_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_statistics_quick_test", + "name": "gpr_slice_test", "build": "test", "src": [ - "test/core/statistics/quick_test.c" + "test/core/support/slice_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_statistics_small_log_test", + "name": "gpr_string_test", "build": "test", "src": [ - "test/core/statistics/small_log_test.c" + "test/core/support/string_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_statistics_performance_test", + "name": "gpr_sync_test", "build": "test", "src": [ - "test/core/statistics/performance_test.c" + "test/core/support/sync_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_statistics_multiple_writers_test", + "name": "gpr_thd_test", "build": "test", "src": [ - "test/core/statistics/multiple_writers_test.c" + "test/core/support/thd_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_statistics_multiple_writers_circular_buffer_test", + "name": "gpr_time_test", "build": "test", "src": [ - "test/core/statistics/multiple_writers_circular_buffer_test.c" + "test/core/support/time_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_stub_test", + "name": "gpr_useful_test", "build": "test", "src": [ - "test/core/statistics/census_stub_test.c" + "test/core/support/useful_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "census_hash_table_test", + "name": "grpc_base64_test", "build": "test", "src": [ - "test/core/statistics/hash_table_test.c" + "test/core/security/base64_test.c" ], "deps": [ "grpc_test_util", @@ -1011,11 +989,10 @@ ] }, { - "name": "fling_server", + "name": "grpc_byte_buffer_reader_test", "build": "test", - "run": false, "src": [ - "test/core/fling/server.c" + "test/core/surface/byte_buffer_reader_test.c" ], "deps": [ "grpc_test_util", @@ -1025,11 +1002,10 @@ ] }, { - "name": "fling_client", + "name": "grpc_channel_stack_test", "build": "test", - "run": false, "src": [ - "test/core/fling/client.c" + "test/core/channel/channel_stack_test.c" ], "deps": [ "grpc_test_util", @@ -1039,10 +1015,10 @@ ] }, { - "name": "fling_test", - "build": "test", + "name": "grpc_completion_queue_benchmark", + "build": "benchmark", "src": [ - "test/core/fling/fling_test.c" + "test/core/surface/completion_queue_benchmark.c" ], "deps": [ "grpc_test_util", @@ -1052,11 +1028,10 @@ ] }, { - "name": "echo_server", + "name": "grpc_completion_queue_test", "build": "test", - "run": false, "src": [ - "test/core/echo/server.c" + "test/core/surface/completion_queue_test.c" ], "deps": [ "grpc_test_util", @@ -1066,11 +1041,10 @@ ] }, { - "name": "echo_client", + "name": "grpc_credentials_test", "build": "test", - "run": false, "src": [ - "test/core/echo/client.c" + "test/core/security/credentials_test.c" ], "deps": [ "grpc_test_util", @@ -1080,10 +1054,10 @@ ] }, { - "name": "echo_test", - "build": "test", + "name": "grpc_fetch_oauth2", + "build": "tool", "src": [ - "test/core/echo/echo_test.c" + "test/core/security/fetch_oauth2.c" ], "deps": [ "grpc_test_util", @@ -1093,10 +1067,10 @@ ] }, { - "name": "low_level_ping_pong_benchmark", - "build": "benchmark", + "name": "grpc_json_token_test", + "build": "test", "src": [ - "test/core/network_benchmarks/low_level_ping_pong.c" + "test/core/security/json_token_test.c" ], "deps": [ "grpc_test_util", @@ -1106,10 +1080,10 @@ ] }, { - "name": "message_compress_test", + "name": "grpc_stream_op_test", "build": "test", "src": [ - "test/core/compression/message_compress_test.c" + "test/core/transport/stream_op_test.c" ], "deps": [ "grpc_test_util", @@ -1119,10 +1093,10 @@ ] }, { - "name": "bin_encoder_test", + "name": "hpack_parser_test", "build": "test", "src": [ - "test/core/transport/chttp2/bin_encoder_test.c" + "test/core/transport/chttp2/hpack_parser_test.c" ], "deps": [ "grpc_test_util", @@ -1132,10 +1106,10 @@ ] }, { - "name": "secure_endpoint_test", + "name": "hpack_table_test", "build": "test", "src": [ - "test/core/security/secure_endpoint_test.c" + "test/core/transport/chttp2/hpack_table_test.c" ], "deps": [ "grpc_test_util", @@ -1184,36 +1158,50 @@ ] }, { - "name": "grpc_credentials_test", + "name": "interop_client", "build": "test", "src": [ - "test/core/security/credentials_test.c" + "test/cpp/interop/empty.proto", + "test/cpp/interop/messages.proto", + "test/cpp/interop/test.proto", + "test/cpp/interop/client.cc" ], + "c++": true, "deps": [ + "grpc++_test_util", "grpc_test_util", + "grpc++", "grpc", "gpr_test_util", "gpr" - ] + ], + "run": false }, { - "name": "grpc_fetch_oauth2", - "build": "tool", + "name": "interop_server", + "build": "test", "src": [ - "test/core/security/fetch_oauth2.c" + "test/cpp/interop/empty.proto", + "test/cpp/interop/messages.proto", + "test/cpp/interop/test.proto", + "test/cpp/interop/server.cc" ], + "c++": true, "deps": [ + "grpc++_test_util", "grpc_test_util", + "grpc++", "grpc", "gpr_test_util", "gpr" - ] + ], + "run": false }, { - "name": "grpc_base64_test", + "name": "lame_client_test", "build": "test", "src": [ - "test/core/security/base64_test.c" + "test/core/surface/lame_client_test.c" ], "deps": [ "grpc_test_util", @@ -1223,10 +1211,10 @@ ] }, { - "name": "grpc_json_token_test", - "build": "test", + "name": "low_level_ping_pong_benchmark", + "build": "benchmark", "src": [ - "test/core/security/json_token_test.c" + "test/core/network_benchmarks/low_level_ping_pong.c" ], "deps": [ "grpc_test_util", @@ -1236,10 +1224,10 @@ ] }, { - "name": "timeout_encoding_test", + "name": "message_compress_test", "build": "test", "src": [ - "test/core/transport/chttp2/timeout_encoding_test.c" + "test/core/compression/message_compress_test.c" ], "deps": [ "grpc_test_util", @@ -1249,10 +1237,10 @@ ] }, { - "name": "fd_posix_test", + "name": "metadata_buffer_test", "build": "test", "src": [ - "test/core/iomgr/fd_posix_test.c" + "test/core/channel/metadata_buffer_test.c" ], "deps": [ "grpc_test_util", @@ -1262,23 +1250,21 @@ ] }, { - "name": "fling_stream_test", + "name": "murmur_hash_test", "build": "test", "src": [ - "test/core/fling/fling_stream_test.c" + "test/core/support/murmur_hash_test.c" ], "deps": [ - "grpc_test_util", - "grpc", "gpr_test_util", "gpr" ] }, { - "name": "lame_client_test", + "name": "no_server_test", "build": "test", "src": [ - "test/core/surface/lame_client_test.c" + "test/core/end2end/no_server_test.c" ], "deps": [ "grpc_test_util", @@ -1288,28 +1274,28 @@ ] }, { - "name": "thread_pool_test", + "name": "poll_kick_test", "build": "test", - "c++": true, "src": [ - "test/cpp/server/thread_pool_test.cc" + "test/core/iomgr/poll_kick_test.c" ], "deps": [ "grpc_test_util", - "grpc++", "grpc", "gpr_test_util", "gpr" ] }, { - "name": "status_test", + "name": "qps_client", "build": "test", - "c++": true, "src": [ - "test/cpp/util/status_test.cc" + "test/cpp/qps/qpstest.proto", + "test/cpp/qps/client.cc" ], + "c++": true, "deps": [ + "grpc++_test_util", "grpc_test_util", "grpc++", "grpc", @@ -1318,12 +1304,13 @@ ] }, { - "name": "sync_client_async_server_test", + "name": "qps_server", "build": "test", - "c++": true, "src": [ - "test/cpp/end2end/sync_client_async_server_test.cc" + "test/cpp/qps/qpstest.proto", + "test/cpp/qps/server.cc" ], + "c++": true, "deps": [ "grpc++_test_util", "grpc_test_util", @@ -1334,72 +1321,69 @@ ] }, { - "name": "qps_client", + "name": "resolve_address_test", "build": "test", - "c++": true, "src": [ - "test/cpp/qps/qpstest.proto", - "test/cpp/qps/client.cc" + "test/core/iomgr/resolve_address_test.c" ], "deps": [ - "grpc++_test_util", "grpc_test_util", - "grpc++", "grpc", "gpr_test_util", "gpr" ] }, { - "name": "qps_server", - "build": "test", + "name": "ruby_plugin", + "build": "protoc", + "headers": [ + "src/compiler/cpp_generator.h", + "src/compiler/cpp_generator_helpers-inl.h", + "src/compiler/cpp_generator_map-inl.h", + "src/compiler/cpp_generator_string-inl.h" + ], + "src": [ + "src/compiler/ruby_generator.cc", + "src/compiler/ruby_plugin.cc" + ], "c++": true, + "deps": [], + "secure": false + }, + { + "name": "secure_endpoint_test", + "build": "test", "src": [ - "test/cpp/qps/qpstest.proto", - "test/cpp/qps/server.cc" + "test/core/security/secure_endpoint_test.c" ], "deps": [ - "grpc++_test_util", "grpc_test_util", - "grpc++", "grpc", "gpr_test_util", "gpr" ] }, { - "name": "interop_server", + "name": "sockaddr_utils_test", "build": "test", - "run": false, - "c++": true, "src": [ - "test/cpp/interop/empty.proto", - "test/cpp/interop/messages.proto", - "test/cpp/interop/test.proto", - "test/cpp/interop/server.cc" + "test/core/iomgr/sockaddr_utils_test.c" ], "deps": [ - "grpc++_test_util", "grpc_test_util", - "grpc++", "grpc", "gpr_test_util", "gpr" ] }, { - "name": "interop_client", + "name": "status_test", "build": "test", - "run": false, - "c++": true, "src": [ - "test/cpp/interop/empty.proto", - "test/cpp/interop/messages.proto", - "test/cpp/interop/test.proto", - "test/cpp/interop/client.cc" + "test/cpp/util/status_test.cc" ], + "c++": true, "deps": [ - "grpc++_test_util", "grpc_test_util", "grpc++", "grpc", @@ -1408,12 +1392,12 @@ ] }, { - "name": "end2end_test", + "name": "sync_client_async_server_test", "build": "test", - "c++": true, "src": [ - "test/cpp/end2end/end2end_test.cc" + "test/cpp/end2end/sync_client_async_server_test.cc" ], + "c++": true, "deps": [ "grpc++_test_util", "grpc_test_util", @@ -1424,36 +1408,36 @@ ] }, { - "name": "channel_arguments_test", + "name": "tcp_client_posix_test", "build": "test", - "c++": true, "src": [ - "test/cpp/client/channel_arguments_test.cc" + "test/core/iomgr/tcp_client_posix_test.c" ], "deps": [ - "grpc++", + "grpc_test_util", "grpc", + "gpr_test_util", "gpr" ] }, { - "name": "credentials_test", + "name": "tcp_posix_test", "build": "test", - "c++": true, "src": [ - "test/cpp/client/credentials_test.cc" + "test/core/iomgr/tcp_posix_test.c" ], "deps": [ - "grpc++", + "grpc_test_util", "grpc", + "gpr_test_util", "gpr" ] }, { - "name": "alarm_test", + "name": "tcp_server_posix_test", "build": "test", "src": [ - "test/core/iomgr/alarm_test.c" + "test/core/iomgr/tcp_server_posix_test.c" ], "deps": [ "grpc_test_util", @@ -1463,23 +1447,25 @@ ] }, { - "name": "alarm_list_test", + "name": "thread_pool_test", "build": "test", "src": [ - "test/core/iomgr/alarm_list_test.c" + "test/cpp/server/thread_pool_test.cc" ], + "c++": true, "deps": [ "grpc_test_util", + "grpc++", "grpc", "gpr_test_util", "gpr" ] }, { - "name": "alarm_heap_test", + "name": "time_averaged_stats_test", "build": "test", "src": [ - "test/core/iomgr/alarm_heap_test.c" + "test/core/iomgr/time_averaged_stats_test.c" ], "deps": [ "grpc_test_util", @@ -1502,10 +1488,23 @@ ] }, { - "name": "poll_kick_test", + "name": "timeout_encoding_test", "build": "test", "src": [ - "test/core/iomgr/poll_kick_test.c" + "test/core/transport/chttp2/timeout_encoding_test.c" + ], + "deps": [ + "grpc_test_util", + "grpc", + "gpr_test_util", + "gpr" + ] + }, + { + "name": "transport_metadata_test", + "build": "test", + "src": [ + "test/core/transport/metadata_test.c" ], "deps": [ "grpc_test_util", diff --git a/tools/build-cleaner/build-cleaner.py b/tools/build-cleaner/build-cleaner.py new file mode 100755 index 0000000000000000000000000000000000000000..66ee99773e715ca8c27b2925ba70d6c888bf1fa6 --- /dev/null +++ b/tools/build-cleaner/build-cleaner.py @@ -0,0 +1,56 @@ +#!/usr/bin/python +# produces cleaner build.json files + +import collections +import json +import os +import sys + +_TOP_LEVEL_KEYS = ['settings', 'filegroups', 'libs', 'targets'] +_VERSION_KEYS = ['major', 'minor', 'micro', 'build'] +_ELEM_KEYS = [ + 'name', + 'build', + 'language', + 'public_headers', + 'headers', + 'src', + 'deps'] + +def rebuild_as_ordered_dict(indict, special_keys): + outdict = collections.OrderedDict() + for key in special_keys: + if key in indict: + outdict[key] = indict[key] + for key in sorted(indict.keys()): + if key in special_keys: continue + outdict[key] = indict[key] + return outdict + +def clean_elem(indict): + for name in ['public_headers', 'headers', 'src']: + if name not in indict: continue + inlist = indict[name] + protos = set(x for x in inlist if os.path.splitext(x)[1] == '.proto') + others = set(x for x in inlist if x not in protos) + indict[name] = sorted(protos) + sorted(others) + return rebuild_as_ordered_dict(indict, _ELEM_KEYS) + +for filename in sys.argv[1:]: + with open(filename) as f: + js = json.load(f) + js = rebuild_as_ordered_dict(js, _TOP_LEVEL_KEYS) + js['settings']['version'] = rebuild_as_ordered_dict( + js['settings']['version'], _VERSION_KEYS) + for grp in ['filegroups', 'libs', 'targets']: + if grp not in js: continue + js[grp] = sorted([clean_elem(x) for x in js[grp]], + key=lambda x: x['name']) + output = json.dumps(js, indent = 2) + # massage out trailing whitespace + lines = [] + for line in output.splitlines(): + lines.append(line.rstrip() + '\n') + with open(filename, 'w') as f: + f.write(''.join(lines)) +