Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #321 from ctiller/build-cleaner

Browse Source 
Build cleaner updates
pull/344/head
Nicolas Noble 10 years ago
parent a91abc42d3 5350c2e703
commit 9f7bda5652
8 changed files with 264 additions and 264 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 332
      Makefile
  2. 156
      build.json
  3. 4
      tools/buildgen/build-cleaner.py
  4. 24
      tools/run_tests/tests.json
  5. 2
      vsprojects/vs2013/grpc.vcxproj
  6. 4
      vsprojects/vs2013/grpc.vcxproj.filters
  7. 2
      vsprojects/vs2013/grpc_unsecure.vcxproj
  8. 4
      vsprojects/vs2013/grpc_unsecure.vcxproj.filters

332
Makefile
View File

File diff suppressed because one or more lines are too long

156
build.json
Unescape View File

@ -61,8 +61,8 @@
"src/core/iomgr/tcp_posix.h", "src/core/iomgr/tcp_posix.h",
"src/core/iomgr/tcp_server.h", "src/core/iomgr/tcp_server.h",
"src/core/iomgr/time_averaged_stats.h", "src/core/iomgr/time_averaged_stats.h",
"src/core/iomgr/wakeup_fd_posix.h",
"src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_pipe.h",
"src/core/iomgr/wakeup_fd_posix.h",
"src/core/json/json.h", "src/core/json/json.h",
"src/core/json/json_common.h", "src/core/json/json_common.h",
"src/core/json/json_reader.h", "src/core/json/json_reader.h",
@ -1192,6 +1192,48 @@
"gpr" "gpr"
] ]
}, },
{
"name": "json_rewrite",
"build": "test",
"language": "c",
"src": [
"test/core/json/json_rewrite.c"
],
"deps": [
"grpc",
"gpr"
],
"run": false
},
{
"name": "json_rewrite_test",
"build": "test",
"language": "c",
"src": [
"test/core/json/json_rewrite_test.c"
],
"deps": [
"grpc_test_util",
"grpc",
"gpr_test_util",
"gpr"
],
"run": false
},
{
"name": "json_test",
"build": "test",
"language": "c",
"src": [
"test/core/json/json_test.c"
],
"deps": [
"grpc_test_util",
"grpc",
"gpr_test_util",
"gpr"
]
},
{ {
"name": "lame_client_test", "name": "lame_client_test",
"build": "test", "build": "test",
@ -1428,48 +1470,6 @@
"gpr" "gpr"
] ]
}, },
{
"name": "json_test",
"build": "test",
"language": "c",
"src": [
"test/core/json/json_test.c"
],
"deps": [
"grpc_test_util",
"grpc",
"gpr_test_util",
"gpr"
]
},
{
"name": "json_rewrite",
"build": "test",
"language": "c",
"src": [
"test/core/json/json_rewrite.c"
],
"deps": [
"grpc",
"gpr"
],
"run": false
},
{
"name": "json_rewrite_test",
"build": "test",
"language": "c",
"src": [
"test/core/json/json_rewrite_test.c"
],
"deps": [
"grpc_test_util",
"grpc",
"gpr_test_util",
"gpr"
],
"run": false
},
{ {
"name": "channel_arguments_test", "name": "channel_arguments_test",
"build": "test", "build": "test",
@ -1567,41 +1567,6 @@
], ],
"run": false "run": false
}, },
{
"name": "tips_client",
"build": "test",
"run": false,
"language": "c++",
"src": [
"examples/tips/client_main.cc"
],
"deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util",
"grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
},
{
"name": "tips_client_test",
"build": "test",
"language": "c++",
"src": [
"examples/tips/client_test.cc"
],
"deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util",
"grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
},
{ {
"name": "qps_client", "name": "qps_client",
"build": "test", "build": "test",
@ -1698,6 +1663,41 @@
"gpr_test_util", "gpr_test_util",
"gpr" "gpr"
] ]
},
{
"name": "tips_client",
"build": "test",
"language": "c++",
"src": [
"examples/tips/client_main.cc"
],
"deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util",
"grpc++",
"grpc",
"gpr_test_util",
"gpr"
],
"run": false
},
{
"name": "tips_client_test",
"build": "test",
"language": "c++",
"src": [
"examples/tips/client_test.cc"
],
"deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util",
"grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
} }
] ]
} }

4
tools/buildgen/build-cleaner.py
Unescape View File

@ -33,9 +33,9 @@ def clean_elem(indict):
for name in ['public_headers', 'headers', 'src']: for name in ['public_headers', 'headers', 'src']:
if name not in indict: continue if name not in indict: continue
inlist = indict[name] inlist = indict[name]
protos = set(x for x in inlist if os.path.splitext(x)[1] == '.proto') protos = list(x for x in inlist if os.path.splitext(x)[1] == '.proto')
others = set(x for x in inlist if x not in protos) others = set(x for x in inlist if x not in protos)
indict[name] = sorted(protos) + sorted(others) indict[name] = protos + sorted(others)
return rebuild_as_ordered_dict(indict, _ELEM_KEYS) return rebuild_as_ordered_dict(indict, _ELEM_KEYS)
for filename in sys.argv[1:]: for filename in sys.argv[1:]:

24
tools/run_tests/tests.json
Unescape View File

@ -185,6 +185,14 @@
"language": "c", "language": "c",
"name": "httpcli_test" "name": "httpcli_test"
}, },
{
"language": "c",
"name": "json_rewrite_test"
},
{
"language": "c",
"name": "json_test"
},
{ {
"language": "c", "language": "c",
"name": "lame_client_test" "name": "lame_client_test"
@ -249,14 +257,6 @@
"language": "c", "language": "c",
"name": "transport_metadata_test" "name": "transport_metadata_test"
}, },
{
"language": "c",
"name": "json_test"
},
{
"language": "c",
"name": "json_rewrite_test"
},
{ {
"language": "c++", "language": "c++",
"name": "channel_arguments_test" "name": "channel_arguments_test"
@ -269,10 +269,6 @@
"language": "c++", "language": "c++",
"name": "end2end_test" "name": "end2end_test"
}, },
{
"language": "c++",
"name": "tips_client_test"
},
{ {
"language": "c++", "language": "c++",
"name": "status_test" "name": "status_test"
@ -285,6 +281,10 @@
"language": "c++", "language": "c++",
"name": "thread_pool_test" "name": "thread_pool_test"
}, },
{
"language": "c++",
"name": "tips_client_test"
},
{ {
"language": "c", "language": "c",
"name": "chttp2_fake_security_cancel_after_accept_test" "name": "chttp2_fake_security_cancel_after_accept_test"

2
vsprojects/vs2013/grpc.vcxproj
Unescape View File

@ -134,8 +134,8 @@
<ClInclude Include="..\..\src\core\iomgr\tcp_posix.h" /> <ClInclude Include="..\..\src\core\iomgr\tcp_posix.h" />
<ClInclude Include="..\..\src\core\iomgr\tcp_server.h" /> <ClInclude Include="..\..\src\core\iomgr\tcp_server.h" />
<ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h" /> <ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h" />
<ClInclude Include="..\..\src\core\json\json.h" /> <ClInclude Include="..\..\src\core\json\json.h" />
<ClInclude Include="..\..\src\core\json\json_common.h" /> <ClInclude Include="..\..\src\core\json\json_common.h" />
<ClInclude Include="..\..\src\core\json\json_reader.h" /> <ClInclude Include="..\..\src\core\json\json_reader.h" />

4
vsprojects/vs2013/grpc.vcxproj.filters
Unescape View File

@ -485,10 +485,10 @@
<ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h"> <ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h">
<Filter>src\core\iomgr</Filter> <Filter>src\core\iomgr</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h"> <ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h">
<Filter>src\core\iomgr</Filter> <Filter>src\core\iomgr</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h"> <ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h">
<Filter>src\core\iomgr</Filter> <Filter>src\core\iomgr</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\core\json\json.h"> <ClInclude Include="..\..\src\core\json\json.h">

2
vsprojects/vs2013/grpc_unsecure.vcxproj
Unescape View File

@ -134,8 +134,8 @@
<ClInclude Include="..\..\src\core\iomgr\tcp_posix.h" /> <ClInclude Include="..\..\src\core\iomgr\tcp_posix.h" />
<ClInclude Include="..\..\src\core\iomgr\tcp_server.h" /> <ClInclude Include="..\..\src\core\iomgr\tcp_server.h" />
<ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h" /> <ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h" />
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h" />
<ClInclude Include="..\..\src\core\json\json.h" /> <ClInclude Include="..\..\src\core\json\json.h" />
<ClInclude Include="..\..\src\core\json\json_common.h" /> <ClInclude Include="..\..\src\core\json\json_common.h" />
<ClInclude Include="..\..\src\core\json\json_reader.h" /> <ClInclude Include="..\..\src\core\json\json_reader.h" />

4
vsprojects/vs2013/grpc_unsecure.vcxproj.filters
Unescape View File

@ -410,10 +410,10 @@
<ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h"> <ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h">
<Filter>src\core\iomgr</Filter> <Filter>src\core\iomgr</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h"> <ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h">
<Filter>src\core\iomgr</Filter> <Filter>src\core\iomgr</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h"> <ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h">
<Filter>src\core\iomgr</Filter> <Filter>src\core\iomgr</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\core\json\json.h"> <ClInclude Include="..\..\src\core\json\json.h">

Write Preview
Loading…
Cancel
Save