From d5b076ae291b2e4aa361ddfc1dd551d611c802f3 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 12 Feb 2015 19:16:42 -0800
Subject: improving makefile for Windows

---
 templates/vsprojects/vs2013/Grpc.mak.template      | 66 ++++++++++++++++++++++
 templates/vsprojects/vs2013/GrpcTests.mak.template | 64 ---------------------
 2 files changed, 66 insertions(+), 64 deletions(-)
 create mode 100644 templates/vsprojects/vs2013/Grpc.mak.template
 delete mode 100644 templates/vsprojects/vs2013/GrpcTests.mak.template

(limited to 'templates/vsprojects')

diff --git a/templates/vsprojects/vs2013/Grpc.mak.template b/templates/vsprojects/vs2013/Grpc.mak.template
new file mode 100644
index 0000000000..9bea79b3d6
--- /dev/null
+++ b/templates/vsprojects/vs2013/Grpc.mak.template
@@ -0,0 +1,66 @@
+<%!
+  import re
+%>\
+<%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
+<%
+  allowed_dependencies = set(['gpr', 'grpc', 'gpr_test_util', 'grpc_test_util'])
+  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 secondary gRPC targets on Windows.
+# Use grpc.sln to solution to build the gRPC libraries.
+
+OUT_DIR=test_bin
+
+gpr_test_util:
+	MSBuild.exe gpr_test_util.vcxproj /p:Configuration=Debug
+
+grpc_test_util:
+	MSBuild.exe grpc_test_util.vcxproj /p:Configuration=Debug
+
+$(OUT_DIR):
+	mkdir $(OUT_DIR)
+
+buildtests: \
+% for target in test_targets:
+${target.name}.exe \
+% endfor
+
+	echo All tests built.
+
+test: \
+% for target in test_targets:
+${target.name} \
+% endfor
+
+	echo All tests ran.
+
+test_gpr: \
+% for target in [ tgt for tgt in test_targets if tgt.name.startswith('gpr_')]:
+${target.name} \
+% endfor
+
+	echo All tests ran.
+
+% for target in test_targets:
+${target.name}.exe: grpc_test_util
+	echo Building ${target.name}
+	cl.exe /c /I..\.. /I..\..\include /nologo /Z7 /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:$(OUT_DIR)\ \
+%for source in target.src:
+..\..\${to_windows_path(source)} \
+%endfor
+
+	link.exe /DEBUG /OUT:"$(OUT_DIR)\${target.name}.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 \
+%for dep in target.deps:
+Debug\${dep}.lib \
+%endfor
+%for source in target.src:
+$(OUT_DIR)\${re.search('([^/]+)\.c$', source).group(1)}.obj \
+%endfor
+
+
+${target.name}: ${target.name}.exe
+	echo Running ${target.name}
+	$(OUT_DIR)\${target.name}.exe
+
+% endfor
\ No newline at end of file
diff --git a/templates/vsprojects/vs2013/GrpcTests.mak.template b/templates/vsprojects/vs2013/GrpcTests.mak.template
deleted file mode 100644
index d239801c7d..0000000000
--- a/templates/vsprojects/vs2013/GrpcTests.mak.template
+++ /dev/null
@@ -1,64 +0,0 @@
-<%!
-  import re
-%>\
-<%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)]
-%>\
-# NMake file to build grpc tests on Windows.
-
-OUT_DIR=test_bin
-
-gpr_test_util:
-	MSBuild.exe gpr_test_util.vcxproj /p:Configuration=Debug
-
-grpc_test_util:
-	MSBuild.exe grpc_test_util.vcxproj /p:Configuration=Debug
-
-$(OUT_DIR):
-	mkdir $(OUT_DIR)
-
-buildtests: \
-% for target in test_targets:
-${target.name}.exe \
-% endfor
-
-	echo All tests built.
-
-test: \
-% for target in test_targets:
-${target.name} \
-% endfor
-
-	echo All tests ran.
-
-test_gpr: \
-% for target in [ tgt for tgt in test_targets if tgt.name.startswith('gpr_')]:
-${target.name} \
-% endfor
-
-	echo All tests ran.
-
-% for target in test_targets:
-${target.name}.exe: grpc_test_util
-	echo Building ${target.name}
-	cl.exe /c /I..\.. /I..\..\include /nologo /Z7 /W3 /WX- /sdl /D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze- /Fo:$(OUT_DIR)\ \
-%for source in target.src:
-..\..\${to_windows_path(source)} \
-%endfor
-
-	link.exe /DEBUG /OUT:"$(OUT_DIR)\${target.name}.exe" /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86 \
-%for dep in target.deps:
-Debug\${dep}.lib \
-%endfor
-%for source in target.src:
-$(OUT_DIR)\${re.search('([^/]+)\.c$', source).group(1)}.obj \
-%endfor
-
-
-${target.name}: ${target.name}.exe
-	echo Running ${target.name}
-	$(OUT_DIR)\${target.name}.exe
-
-% endfor
\ No newline at end of file
-- 
cgit v1.2.3