aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2016-02-10 17:39:45 -0800
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2016-02-10 17:39:45 -0800
commit9c7961a01408d3228dec55a9f39a15129f57b3ed (patch)
tree192947555187a17c69e01576ec654114c2fa6f96 /templates
parent6d74725b052aefd0cfc5bdccc880da882f8d7cc8 (diff)
parentad09598ae5ae01d3b3d431538dddbc096afb54ef (diff)
Merge pull request #5165 from ctiller/bring_back_gpr
Bring back gpr
Diffstat (limited to 'templates')
-rw-r--r--templates/BUILD.template2
-rw-r--r--templates/Makefile.template22
-rw-r--r--templates/gRPC.podspec.template4
-rw-r--r--templates/tools/doxygen/Doxyfile.core.internal.template2
-rw-r--r--templates/tools/doxygen/Doxyfile.core.template2
-rw-r--r--templates/vsprojects/cpptest.props.template2
6 files changed, 15 insertions, 19 deletions
diff --git a/templates/BUILD.template b/templates/BUILD.template
index 49703bb1f7..54dc697125 100644
--- a/templates/BUILD.template
+++ b/templates/BUILD.template
@@ -68,7 +68,7 @@
% endfor
% for lib in libs:
- % if lib.name in ("grpc"):
+ % if lib.name in ("grpc", "gpr"):
${objc_library(lib)}
% endif
% endfor
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 9942514211..218f492837 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -551,26 +551,20 @@
# grpc .pc file
PC_NAME = gRPC
- PC_DESCRIPTION = High performance general RPC framework
- PC_CFLAGS = -pthread
- PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE) -lpthread
+ PC_DESCRIPTION = high performance general RPC framework
+ PC_CFLAGS =
+ PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) $(PC_REQUIRES_SECURE)
PC_LIBS_PRIVATE = $(PC_LIBS_GRPC) $(PC_LIBS_SECURE)
PC_LIB = -lgrpc
- ifneq ($(SYSTEM),Darwin)
- PC_LIBS_PRIVATE += -lrt
- endif
GRPC_PC_FILE := $(PC_TEMPLATE)
- # gprc_unsecure .pc file
+ # grpc_unsecure .pc file
PC_NAME = gRPC unsecure
- PC_DESCRIPTION = High performance general RPC framework without SSL
- PC_CFLAGS = -pthread
- PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC) -lpthread
+ PC_DESCRIPTION = high performance general RPC framework without SSL
+ PC_CFLAGS =
+ PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC)
PC_LIBS_PRIVATE = $(PC_LIBS_GRPC)
PC_LIB = -lgrpc
- ifneq ($(SYSTEM),Darwin)
- PC_LIBS_PRIVATE += -lrt
- endif
GRPC_UNSECURE_PC_FILE := $(PC_TEMPLATE)
# grpc_zookeeper .pc file
@@ -1484,6 +1478,7 @@
% endif
$(LIB${lib.name.upper()}_OBJS) \
% if lib.get('baselib', False):
+ $(LIBGPR_OBJS) \
$(ZLIB_MERGE_OBJS) \
% if lib.get('secure', 'check') == True:
$(OPENSSL_MERGE_OBJS) \
@@ -1495,6 +1490,7 @@
$(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a
$(Q) $(AR) $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS) \
% if lib.get('baselib', False):
+ $(LIBGPR_OBJS) \
$(ZLIB_MERGE_OBJS) \
% if lib.get('secure', 'check') == True:
$(OPENSSL_MERGE_OBJS) \
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template
index 0d94130859..a9948a41df 100644
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@@ -39,7 +39,7 @@
def grpc_files(libs):
out = []
for lib in libs:
- if lib.name in ("grpc"):
+ if lib.name in ("grpc", "gpr"):
out += lib.get('headers', [])
out += lib.get('public_headers', [])
out += lib.get('src', [])
@@ -48,7 +48,7 @@
def grpc_private_headers(libs):
out = []
for lib in libs:
- if lib.name in ("grpc"):
+ if lib.name in ("grpc", "gpr"):
out += lib.get('headers', [])
return out
%>
diff --git a/templates/tools/doxygen/Doxyfile.core.internal.template b/templates/tools/doxygen/Doxyfile.core.internal.template
index ac30e0afc2..05be9d81aa 100644
--- a/templates/tools/doxygen/Doxyfile.core.internal.template
+++ b/templates/tools/doxygen/Doxyfile.core.internal.template
@@ -1,4 +1,4 @@
%YAML 1.2
--- |
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
- ${gen_doxyfile(['grpc'], 'Core', libs, True)}
+ ${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, True)}
diff --git a/templates/tools/doxygen/Doxyfile.core.template b/templates/tools/doxygen/Doxyfile.core.template
index 679069bddc..8004294ec1 100644
--- a/templates/tools/doxygen/Doxyfile.core.template
+++ b/templates/tools/doxygen/Doxyfile.core.template
@@ -1,4 +1,4 @@
%YAML 1.2
--- |
<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
- ${gen_doxyfile(['grpc'], 'Core', libs, False)}
+ ${gen_doxyfile(['grpc', 'gpr'], 'Core', libs, False)}
diff --git a/templates/vsprojects/cpptest.props.template b/templates/vsprojects/cpptest.props.template
index 370b6e7e93..14169d6ddf 100644
--- a/templates/vsprojects/cpptest.props.template
+++ b/templates/vsprojects/cpptest.props.template
@@ -10,7 +10,7 @@
<WarningLevel>EnableAllWarnings</WarningLevel>
</ClCompile>
<Link>
- <AdditionalDependencies>grpc++_test_util.lib;grpc_test_util.lib;gtestd.lib;gflags.lib;shlwapi.lib;grpc.lib;grpc++.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>grpc++_test_util.lib;grpc_test_util.lib;gpr_test_util.lib;gtestd.lib;gflags.lib;shlwapi.lib;gpr.lib;grpc.lib;grpc++.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\..\third_party\gtest\msvc\gtest\Debug;$(SolutionDir)\..\third_party\gflags\lib\Debug;$(SolutionDir)\..\Debug;$(SolutionDir)\..\packages\grpc.dependencies.openssl.${vspackages_dict['grpc.dependencies.openssl'].version}\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>