From d136a5c44c77bad674bc36f0bed60eca65b8f461 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 11 Sep 2015 12:23:32 -0700
Subject: [PATCH] grpc++.h was not installed
---
BUILD | 2 ++
Makefile | 2 ++
build.yaml | 6 +++---
gRPC.podspec | 10 +++++-----
tools/doxygen/Doxyfile.c++ | 1 +
tools/doxygen/Doxyfile.c++.internal | 1 +
tools/run_tests/sources_and_headers.json | 4 ++++
vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj | 1 +
.../grpc++_unsecure/grpc++_unsecure.vcxproj.filters | 3 +++
vsprojects/vcxproj/grpc++/grpc++.vcxproj | 1 +
vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters | 3 +++
.../vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj | 1 +
.../grpc++_unsecure/grpc++_unsecure.vcxproj.filters | 3 +++
13 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/BUILD b/BUILD
index 7511320a4c..7ee84383b3 100644
--- a/BUILD
+++ b/BUILD
@@ -729,6 +729,7 @@ cc_library(
"include/grpc++/create_channel.h",
"include/grpc++/generic/async_generic_service.h",
"include/grpc++/generic/generic_stub.h",
+ "include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
"include/grpc++/impl/grpc_library.h",
@@ -820,6 +821,7 @@ cc_library(
"include/grpc++/create_channel.h",
"include/grpc++/generic/async_generic_service.h",
"include/grpc++/generic/generic_stub.h",
+ "include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
"include/grpc++/impl/grpc_library.h",
diff --git a/Makefile b/Makefile
index 4359f78104..2986692ec7 100644
--- a/Makefile
+++ b/Makefile
@@ -4597,6 +4597,7 @@ PUBLIC_HEADERS_CXX += \
include/grpc++/create_channel.h \
include/grpc++/generic/async_generic_service.h \
include/grpc++/generic/generic_stub.h \
+ include/grpc++/grpc++.h \
include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \
include/grpc++/impl/grpc_library.h \
@@ -4842,6 +4843,7 @@ PUBLIC_HEADERS_CXX += \
include/grpc++/create_channel.h \
include/grpc++/generic/async_generic_service.h \
include/grpc++/generic/generic_stub.h \
+ include/grpc++/grpc++.h \
include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \
include/grpc++/impl/grpc_library.h \
diff --git a/build.yaml b/build.yaml
index 757ba137af..5eb7b22d9e 100644
--- a/build.yaml
+++ b/build.yaml
@@ -13,9 +13,9 @@ filegroups:
- name: grpc++_base
public_headers: [include/grpc++/channel.h, include/grpc++/client_context.h, include/grpc++/completion_queue.h,
include/grpc++/create_channel.h, include/grpc++/generic/async_generic_service.h,
- include/grpc++/generic/generic_stub.h, include/grpc++/impl/call.h, include/grpc++/impl/client_unary_call.h,
- include/grpc++/impl/grpc_library.h, include/grpc++/impl/proto_utils.h, include/grpc++/impl/rpc_method.h,
- include/grpc++/impl/rpc_service_method.h, include/grpc++/impl/serialization_traits.h,
+ include/grpc++/generic/generic_stub.h, include/grpc++/grpc++.h, include/grpc++/impl/call.h,
+ include/grpc++/impl/client_unary_call.h, include/grpc++/impl/grpc_library.h, include/grpc++/impl/proto_utils.h,
+ include/grpc++/impl/rpc_method.h, include/grpc++/impl/rpc_service_method.h, include/grpc++/impl/serialization_traits.h,
include/grpc++/impl/service_type.h, include/grpc++/impl/sync.h, include/grpc++/impl/sync_cxx11.h,
include/grpc++/impl/sync_no_cxx11.h, include/grpc++/impl/thd.h, include/grpc++/impl/thd_cxx11.h,
include/grpc++/impl/thd_no_cxx11.h, include/grpc++/security/auth_context.h, include/grpc++/security/auth_metadata_processor.h,
diff --git a/gRPC.podspec b/gRPC.podspec
index 4edc3e5dc7..d0e1e2d848 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -36,17 +36,17 @@
Pod::Spec.new do |s|
s.name = 'gRPC'
- s.version = '0.11.0'
+ s.version = '0.7.0'
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'http://www.grpc.io'
s.license = 'New BSD'
s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' }
# s.source = { :git => 'https://github.com/grpc/grpc.git',
- # :tag => 'release-0_11_0-objectivec-0.11.0' }
+ # :tag => 'release-0_10_0-objectivec-0.6.0' }
- s.ios.deployment_target = '7.1'
- s.osx.deployment_target = '10.9'
+ s.ios.deployment_target = '6.0'
+ s.osx.deployment_target = '10.8'
s.requires_arc = true
objc_dir = 'src/objective-c'
@@ -585,6 +585,6 @@ Pod::Spec.new do |s|
ss.dependency 'gRPC/GRPCClient'
ss.dependency 'gRPC/RxLibrary'
- ss.dependency 'Protobuf', '~> 3.0.0-alpha-4'
+ ss.dependency 'Protobuf', '~> 3.0.0-alpha-3'
end
end
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index a352341774..5d592c8e0a 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -766,6 +766,7 @@ include/grpc++/completion_queue.h \
include/grpc++/create_channel.h \
include/grpc++/generic/async_generic_service.h \
include/grpc++/generic/generic_stub.h \
+include/grpc++/grpc++.h \
include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \
include/grpc++/impl/grpc_library.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index dfaeb43ca7..bbd1706fb0 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -766,6 +766,7 @@ include/grpc++/completion_queue.h \
include/grpc++/create_channel.h \
include/grpc++/generic/async_generic_service.h \
include/grpc++/generic/generic_stub.h \
+include/grpc++/grpc++.h \
include/grpc++/impl/call.h \
include/grpc++/impl/client_unary_call.h \
include/grpc++/impl/grpc_library.h \
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 1774e5640c..c8a9c2d608 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -13126,6 +13126,7 @@
"include/grpc++/create_channel.h",
"include/grpc++/generic/async_generic_service.h",
"include/grpc++/generic/generic_stub.h",
+ "include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
"include/grpc++/impl/grpc_library.h",
@@ -13178,6 +13179,7 @@
"include/grpc++/create_channel.h",
"include/grpc++/generic/async_generic_service.h",
"include/grpc++/generic/generic_stub.h",
+ "include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
"include/grpc++/impl/grpc_library.h",
@@ -13308,6 +13310,7 @@
"include/grpc++/create_channel.h",
"include/grpc++/generic/async_generic_service.h",
"include/grpc++/generic/generic_stub.h",
+ "include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
"include/grpc++/impl/grpc_library.h",
@@ -13357,6 +13360,7 @@
"include/grpc++/create_channel.h",
"include/grpc++/generic/async_generic_service.h",
"include/grpc++/generic/generic_stub.h",
+ "include/grpc++/grpc++.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
"include/grpc++/impl/grpc_library.h",
diff --git a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj
index 7e8ed4464d..acb62acefb 100644
--- a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj
@@ -219,6 +219,7 @@
<ClInclude Include="..\..\..\include\grpc++\create_channel.h" />
<ClInclude Include="..\..\..\include\grpc++\generic\async_generic_service.h" />
<ClInclude Include="..\..\..\include\grpc++\generic\generic_stub.h" />
+ <ClInclude Include="..\..\..\include\grpc++\grpc++.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\call.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\client_unary_call.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\grpc_library.h" />
diff --git a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
index 7ef391a86b..96effe2961 100644
--- a/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@@ -102,6 +102,9 @@
<ClInclude Include="..\..\..\include\grpc++\generic\generic_stub.h">
<Filter>include\grpc++\generic</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\include\grpc++\grpc++.h">
+ <Filter>include\grpc++</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\include\grpc++\impl\call.h">
<Filter>include\grpc++\impl</Filter>
</ClInclude>
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
index 8b2d85de91..3a7f559a23 100644
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@@ -219,6 +219,7 @@
<ClInclude Include="..\..\..\include\grpc++\create_channel.h" />
<ClInclude Include="..\..\..\include\grpc++\generic\async_generic_service.h" />
<ClInclude Include="..\..\..\include\grpc++\generic\generic_stub.h" />
+ <ClInclude Include="..\..\..\include\grpc++\grpc++.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\call.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\client_unary_call.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\grpc_library.h" />
diff --git a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
index 74712feeba..7d9cd4769d 100644
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@@ -117,6 +117,9 @@
<ClInclude Include="..\..\..\include\grpc++\generic\generic_stub.h">
<Filter>include\grpc++\generic</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\include\grpc++\grpc++.h">
+ <Filter>include\grpc++</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\include\grpc++\impl\call.h">
<Filter>include\grpc++\impl</Filter>
</ClInclude>
diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
index 7e8ed4464d..acb62acefb 100644
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
@@ -219,6 +219,7 @@
<ClInclude Include="..\..\..\include\grpc++\create_channel.h" />
<ClInclude Include="..\..\..\include\grpc++\generic\async_generic_service.h" />
<ClInclude Include="..\..\..\include\grpc++\generic\generic_stub.h" />
+ <ClInclude Include="..\..\..\include\grpc++\grpc++.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\call.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\client_unary_call.h" />
<ClInclude Include="..\..\..\include\grpc++\impl\grpc_library.h" />
diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
index 7ef391a86b..96effe2961 100644
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@@ -102,6 +102,9 @@
<ClInclude Include="..\..\..\include\grpc++\generic\generic_stub.h">
<Filter>include\grpc++\generic</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\include\grpc++\grpc++.h">
+ <Filter>include\grpc++</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\include\grpc++\impl\call.h">
<Filter>include\grpc++\impl</Filter>
</ClInclude>
--
GitLab