diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-02-12 19:16:42 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-02-12 19:16:42 -0800 |
| commit | d5b076ae291b2e4aa361ddfc1dd551d611c802f3 (patch) | |
| tree | d3f9a20a96e125e948b946b61562aef20c177052 | |
| parent | 32647c8580cf82a07f48306307a3015db2c61182 (diff) | |
improving makefile for Windows
| -rw-r--r-- | templates/vsprojects/vs2013/Grpc.mak.template (renamed from templates/vsprojects/vs2013/GrpcTests.mak.template) | 6 | ||||
| -rw-r--r-- | vsprojects/vs2013/Grpc.mak (renamed from vsprojects/vs2013/GrpcTests.mak) | 3 | ||||
| -rw-r--r-- | vsprojects/vs2013/make.bat | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/templates/vsprojects/vs2013/GrpcTests.mak.template b/templates/vsprojects/vs2013/Grpc.mak.template index d239801c7d..9bea79b3d6 100644 --- a/templates/vsprojects/vs2013/GrpcTests.mak.template +++ b/templates/vsprojects/vs2013/Grpc.mak.template @@ -4,9 +4,11 @@ <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\ <% allowed_dependencies = set(['gpr', 'grpc', 'gpr_test_util', 'grpc_test_util']) - test_targets = [ target for target in targets if target.name.endswith('_test') and set(target.deps).issubset(allowed_dependencies)] + allowed_targets = [ target for target in targets if set(target.deps).issubset(allowed_dependencies) ] + test_targets = [ target for target in allowed_targets if target.name.endswith('_test') ] %>\ -# NMake file to build grpc tests on Windows. +# NMake file to build secondary gRPC targets on Windows. +# Use grpc.sln to solution to build the gRPC libraries. OUT_DIR=test_bin diff --git a/vsprojects/vs2013/GrpcTests.mak b/vsprojects/vs2013/Grpc.mak index 2398f32381..2f9c27f2b6 100644 --- a/vsprojects/vs2013/GrpcTests.mak +++ b/vsprojects/vs2013/Grpc.mak @@ -1,4 +1,5 @@ -# NMake file to build grpc tests on Windows. +# NMake file to build secondary gRPC targets on Windows. +# Use grpc.sln to solution to build the gRPC libraries. OUT_DIR=test_bin diff --git a/vsprojects/vs2013/make.bat b/vsprojects/vs2013/make.bat index 3315302173..5d924fef8b 100644 --- a/vsprojects/vs2013/make.bat +++ b/vsprojects/vs2013/make.bat @@ -1,7 +1,7 @@ -@rem Convenience wrapper that run specified gRPC target using Nmake +@rem Convenience wrapper that runs specified gRPC target using Nmake @rem Usage: make.bat TARGET_NAME @rem Set VS variables @call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86 -nmake.exe /f GrpcTests.mak %1
\ No newline at end of file +nmake.exe /f Grpc.mak %1
\ No newline at end of file |