From 7d7b6c768b7c7a83c9480ff88586abc3088fb379 Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Sun, 18 Jan 2015 12:03:17 -0800
Subject: [PATCH] Sort by language, then by name
---
build.json | 380 ++++++++++++++++----------------
tools/buildgen/build-cleaner.py | 2 +-
2 files changed, 191 insertions(+), 191 deletions(-)
diff --git a/build.json b/build.json
index c0d96623e8..9a5134ecd6 100644
--- a/build.json
+++ b/build.json
@@ -302,6 +302,40 @@
"secure": true,
"vs_project_guid": "{29D16885-7228-4C31-81ED-5F9187C7F2A9}"
},
+ {
+ "name": "grpc_test_util",
+ "build": "private",
+ "language": "c",
+ "src": [
+ "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"
+ ],
+ "vs_project_guid": "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}"
+ },
+ {
+ "name": "grpc_unsecure",
+ "build": "all",
+ "language": "c",
+ "deps": [
+ "gpr"
+ ],
+ "baselib": true,
+ "filegroups": [
+ "grpc_base"
+ ],
+ "secure": false,
+ "vs_project_guid": "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}"
+ },
{
"name": "grpc++",
"build": "all",
@@ -374,40 +408,6 @@
"test/cpp/end2end/async_test_server.cc",
"test/cpp/util/create_test_channel.cc"
]
- },
- {
- "name": "grpc_test_util",
- "build": "private",
- "language": "c",
- "src": [
- "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"
- ],
- "vs_project_guid": "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}"
- },
- {
- "name": "grpc_unsecure",
- "build": "all",
- "language": "c",
- "deps": [
- "gpr"
- ],
- "baselib": true,
- "filegroups": [
- "grpc_base"
- ],
- "secure": false,
- "vs_project_guid": "{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}"
}
],
"targets": [
@@ -621,19 +621,6 @@
"gpr"
]
},
- {
- "name": "channel_arguments_test",
- "build": "test",
- "language": "c++",
- "src": [
- "test/cpp/client/channel_arguments_test.cc"
- ],
- "deps": [
- "grpc++",
- "grpc",
- "gpr"
- ]
- },
{
"name": "chttp2_status_conversion_test",
"build": "test",
@@ -690,34 +677,6 @@
"gpr"
]
},
- {
- "name": "cpp_plugin",
- "build": "protoc",
- "language": "c++",
- "headers": [
- "src/compiler/cpp_generator.h",
- "src/compiler/cpp_generator_helpers.h"
- ],
- "src": [
- "src/compiler/cpp_generator.cc",
- "src/compiler/cpp_plugin.cc"
- ],
- "deps": [],
- "secure": false
- },
- {
- "name": "credentials_test",
- "build": "test",
- "language": "c++",
- "src": [
- "test/cpp/client/credentials_test.cc"
- ],
- "deps": [
- "grpc++",
- "grpc",
- "gpr"
- ]
- },
{
"name": "dualstack_socket_test",
"build": "test",
@@ -776,22 +735,6 @@
"gpr"
]
},
- {
- "name": "end2end_test",
- "build": "test",
- "language": "c++",
- "src": [
- "test/cpp/end2end/end2end_test.cc"
- ],
- "deps": [
- "grpc++_test_util",
- "grpc_test_util",
- "grpc++",
- "grpc",
- "gpr_test_util",
- "gpr"
- ]
- },
{
"name": "fd_posix_test",
"build": "test",
@@ -1218,51 +1161,53 @@
]
},
{
- "name": "interop_client",
+ "name": "lame_client_test",
"build": "test",
- "language": "c++",
+ "language": "c",
"src": [
- "test/cpp/interop/empty.proto",
- "test/cpp/interop/messages.proto",
- "test/cpp/interop/test.proto",
- "test/cpp/interop/client.cc"
+ "test/core/surface/lame_client_test.c"
],
"deps": [
- "grpc++_test_util",
"grpc_test_util",
- "grpc++",
"grpc",
"gpr_test_util",
"gpr"
+ ]
+ },
+ {
+ "name": "low_level_ping_pong_benchmark",
+ "build": "benchmark",
+ "language": "c",
+ "src": [
+ "test/core/network_benchmarks/low_level_ping_pong.c"
],
- "run": false
+ "deps": [
+ "grpc_test_util",
+ "grpc",
+ "gpr_test_util",
+ "gpr"
+ ]
},
{
- "name": "interop_server",
+ "name": "message_compress_test",
"build": "test",
- "language": "c++",
+ "language": "c",
"src": [
- "test/cpp/interop/empty.proto",
- "test/cpp/interop/messages.proto",
- "test/cpp/interop/test.proto",
- "test/cpp/interop/server.cc"
+ "test/core/compression/message_compress_test.c"
],
"deps": [
- "grpc++_test_util",
"grpc_test_util",
- "grpc++",
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
- "name": "lame_client_test",
+ "name": "metadata_buffer_test",
"build": "test",
"language": "c",
"src": [
- "test/core/surface/lame_client_test.c"
+ "test/core/channel/metadata_buffer_test.c"
],
"deps": [
"grpc_test_util",
@@ -1272,11 +1217,23 @@
]
},
{
- "name": "low_level_ping_pong_benchmark",
- "build": "benchmark",
+ "name": "murmur_hash_test",
+ "build": "test",
"language": "c",
"src": [
- "test/core/network_benchmarks/low_level_ping_pong.c"
+ "test/core/support/murmur_hash_test.c"
+ ],
+ "deps": [
+ "gpr_test_util",
+ "gpr"
+ ]
+ },
+ {
+ "name": "no_server_test",
+ "build": "test",
+ "language": "c",
+ "src": [
+ "test/core/end2end/no_server_test.c"
],
"deps": [
"grpc_test_util",
@@ -1286,11 +1243,11 @@
]
},
{
- "name": "message_compress_test",
+ "name": "poll_kick_test",
"build": "test",
"language": "c",
"src": [
- "test/core/compression/message_compress_test.c"
+ "test/core/iomgr/poll_kick_test.c"
],
"deps": [
"grpc_test_util",
@@ -1300,11 +1257,11 @@
]
},
{
- "name": "metadata_buffer_test",
+ "name": "resolve_address_test",
"build": "test",
"language": "c",
"src": [
- "test/core/channel/metadata_buffer_test.c"
+ "test/core/iomgr/resolve_address_test.c"
],
"deps": [
"grpc_test_util",
@@ -1314,23 +1271,25 @@
]
},
{
- "name": "murmur_hash_test",
+ "name": "secure_endpoint_test",
"build": "test",
"language": "c",
"src": [
- "test/core/support/murmur_hash_test.c"
+ "test/core/security/secure_endpoint_test.c"
],
"deps": [
+ "grpc_test_util",
+ "grpc",
"gpr_test_util",
"gpr"
]
},
{
- "name": "no_server_test",
+ "name": "sockaddr_utils_test",
"build": "test",
"language": "c",
"src": [
- "test/core/end2end/no_server_test.c"
+ "test/core/iomgr/sockaddr_utils_test.c"
],
"deps": [
"grpc_test_util",
@@ -1340,11 +1299,11 @@
]
},
{
- "name": "poll_kick_test",
+ "name": "tcp_client_posix_test",
"build": "test",
"language": "c",
"src": [
- "test/core/iomgr/poll_kick_test.c"
+ "test/core/iomgr/tcp_client_posix_test.c"
],
"deps": [
"grpc_test_util",
@@ -1354,45 +1313,39 @@
]
},
{
- "name": "qps_client",
+ "name": "tcp_posix_test",
"build": "test",
- "language": "c++",
+ "language": "c",
"src": [
- "test/cpp/qps/qpstest.proto",
- "test/cpp/qps/client.cc"
+ "test/core/iomgr/tcp_posix_test.c"
],
"deps": [
- "grpc++_test_util",
"grpc_test_util",
- "grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
},
{
- "name": "qps_server",
+ "name": "tcp_server_posix_test",
"build": "test",
- "language": "c++",
+ "language": "c",
"src": [
- "test/cpp/qps/qpstest.proto",
- "test/cpp/qps/server.cc"
+ "test/core/iomgr/tcp_server_posix_test.c"
],
"deps": [
- "grpc++_test_util",
"grpc_test_util",
- "grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
},
{
- "name": "resolve_address_test",
+ "name": "time_averaged_stats_test",
"build": "test",
"language": "c",
"src": [
- "test/core/iomgr/resolve_address_test.c"
+ "test/core/iomgr/time_averaged_stats_test.c"
],
"deps": [
"grpc_test_util",
@@ -1402,28 +1355,25 @@
]
},
{
- "name": "ruby_plugin",
- "build": "protoc",
- "language": "c++",
- "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"
- ],
+ "name": "time_test",
+ "build": "test",
+ "language": "c",
"src": [
- "src/compiler/ruby_generator.cc",
- "src/compiler/ruby_plugin.cc"
+ "test/core/support/time_test.c"
],
- "deps": [],
- "secure": false
+ "deps": [
+ "grpc_test_util",
+ "grpc",
+ "gpr_test_util",
+ "gpr"
+ ]
},
{
- "name": "secure_endpoint_test",
+ "name": "timeout_encoding_test",
"build": "test",
"language": "c",
"src": [
- "test/core/security/secure_endpoint_test.c"
+ "test/core/transport/chttp2/timeout_encoding_test.c"
],
"deps": [
"grpc_test_util",
@@ -1433,11 +1383,11 @@
]
},
{
- "name": "sockaddr_utils_test",
+ "name": "transport_metadata_test",
"build": "test",
"language": "c",
"src": [
- "test/core/iomgr/sockaddr_utils_test.c"
+ "test/core/transport/metadata_test.c"
],
"deps": [
"grpc_test_util",
@@ -1447,86 +1397,112 @@
]
},
{
- "name": "status_test",
+ "name": "channel_arguments_test",
"build": "test",
"language": "c++",
"src": [
- "test/cpp/util/status_test.cc"
+ "test/cpp/client/channel_arguments_test.cc"
],
"deps": [
- "grpc_test_util",
"grpc++",
"grpc",
- "gpr_test_util",
"gpr"
]
},
{
- "name": "sync_client_async_server_test",
+ "name": "cpp_plugin",
+ "build": "protoc",
+ "language": "c++",
+ "headers": [
+ "src/compiler/cpp_generator.h",
+ "src/compiler/cpp_generator_helpers.h"
+ ],
+ "src": [
+ "src/compiler/cpp_generator.cc",
+ "src/compiler/cpp_plugin.cc"
+ ],
+ "deps": [],
+ "secure": false
+ },
+ {
+ "name": "credentials_test",
"build": "test",
"language": "c++",
"src": [
- "test/cpp/end2end/sync_client_async_server_test.cc"
+ "test/cpp/client/credentials_test.cc"
],
"deps": [
- "grpc++_test_util",
- "grpc_test_util",
"grpc++",
"grpc",
- "gpr_test_util",
"gpr"
]
},
{
- "name": "tcp_client_posix_test",
+ "name": "end2end_test",
"build": "test",
- "language": "c",
+ "language": "c++",
"src": [
- "test/core/iomgr/tcp_client_posix_test.c"
+ "test/cpp/end2end/end2end_test.cc"
],
"deps": [
+ "grpc++_test_util",
"grpc_test_util",
+ "grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
},
{
- "name": "tcp_posix_test",
+ "name": "interop_client",
"build": "test",
- "language": "c",
+ "language": "c++",
"src": [
- "test/core/iomgr/tcp_posix_test.c"
+ "test/cpp/interop/empty.proto",
+ "test/cpp/interop/messages.proto",
+ "test/cpp/interop/test.proto",
+ "test/cpp/interop/client.cc"
],
"deps": [
+ "grpc++_test_util",
"grpc_test_util",
+ "grpc++",
"grpc",
"gpr_test_util",
"gpr"
- ]
+ ],
+ "run": false
},
{
- "name": "tcp_server_posix_test",
+ "name": "interop_server",
"build": "test",
- "language": "c",
+ "language": "c++",
"src": [
- "test/core/iomgr/tcp_server_posix_test.c"
+ "test/cpp/interop/empty.proto",
+ "test/cpp/interop/messages.proto",
+ "test/cpp/interop/test.proto",
+ "test/cpp/interop/server.cc"
],
"deps": [
+ "grpc++_test_util",
"grpc_test_util",
+ "grpc++",
"grpc",
"gpr_test_util",
"gpr"
- ]
+ ],
+ "run": false
},
{
- "name": "thread_pool_test",
+ "name": "qps_client",
"build": "test",
"language": "c++",
"src": [
- "test/cpp/server/thread_pool_test.cc"
+ "test/cpp/qps/qpstest.proto",
+ "test/cpp/qps/client.cc"
],
"deps": [
+ "grpc++_test_util",
"grpc_test_util",
"grpc++",
"grpc",
@@ -1535,56 +1511,80 @@
]
},
{
- "name": "time_averaged_stats_test",
+ "name": "qps_server",
"build": "test",
- "language": "c",
+ "language": "c++",
"src": [
- "test/core/iomgr/time_averaged_stats_test.c"
+ "test/cpp/qps/qpstest.proto",
+ "test/cpp/qps/server.cc"
],
"deps": [
+ "grpc++_test_util",
"grpc_test_util",
+ "grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
},
{
- "name": "time_test",
+ "name": "ruby_plugin",
+ "build": "protoc",
+ "language": "c++",
+ "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"
+ ],
+ "deps": [],
+ "secure": false
+ },
+ {
+ "name": "status_test",
"build": "test",
- "language": "c",
+ "language": "c++",
"src": [
- "test/core/support/time_test.c"
+ "test/cpp/util/status_test.cc"
],
"deps": [
"grpc_test_util",
+ "grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
},
{
- "name": "timeout_encoding_test",
+ "name": "sync_client_async_server_test",
"build": "test",
- "language": "c",
+ "language": "c++",
"src": [
- "test/core/transport/chttp2/timeout_encoding_test.c"
+ "test/cpp/end2end/sync_client_async_server_test.cc"
],
"deps": [
+ "grpc++_test_util",
"grpc_test_util",
+ "grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
},
{
- "name": "transport_metadata_test",
+ "name": "thread_pool_test",
"build": "test",
- "language": "c",
+ "language": "c++",
"src": [
- "test/core/transport/metadata_test.c"
+ "test/cpp/server/thread_pool_test.cc"
],
"deps": [
"grpc_test_util",
+ "grpc++",
"grpc",
"gpr_test_util",
"gpr"
diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py
index 66ee99773e..00821cc9cc 100755
--- a/tools/buildgen/build-cleaner.py
+++ b/tools/buildgen/build-cleaner.py
@@ -45,7 +45,7 @@ for filename in sys.argv[1:]:
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'])
+ key=lambda x: (x.get('language', '_'), x['name']))
output = json.dumps(js, indent = 2)
# massage out trailing whitespace
lines = []
--
GitLab