mirror of https://github.com/grpc/grpc.git
Merge branch 'master' of https://github.com/grpc/grpc into update_ssl_cert
commit
802f6b6724
40 changed files with 308 additions and 218 deletions
@ -1,8 +1,9 @@ |
||||
source 'https://github.com/CocoaPods/Specs.git' |
||||
platform :ios, '8.0' |
||||
|
||||
pod 'Protobuf', :path => "../../../../third_party/protobuf" |
||||
pod 'gRPC', :path => "../../../.." |
||||
pod 'RemoteTest', :path => "../../generated_libraries/RemoteTestClient" |
||||
pod 'RemoteTest', :path => "../RemoteTestClient" |
||||
|
||||
target 'Sample' do |
||||
end |
||||
|
@ -1,31 +0,0 @@ |
||||
Pod::Spec.new do |s| |
||||
s.name = "RouteGuide" |
||||
s.version = "0.0.1" |
||||
s.license = "New BSD" |
||||
|
||||
s.ios.deployment_target = "6.0" |
||||
s.osx.deployment_target = "10.8" |
||||
|
||||
# Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. |
||||
s.prepare_command = <<-CMD |
||||
BINDIR=../../../../bins/$CONFIG |
||||
PROTOC=$BINDIR/protobuf/protoc |
||||
PLUGIN=$BINDIR/grpc_objective_c_plugin |
||||
$PROTOC --plugin=protoc-gen-grpc=$PLUGIN --objc_out=. --grpc_out=. *.proto |
||||
CMD |
||||
|
||||
s.subspec "Messages" do |ms| |
||||
ms.source_files = "*.pbobjc.{h,m}" |
||||
ms.header_mappings_dir = "." |
||||
ms.requires_arc = false |
||||
ms.dependency "Protobuf", "~> 3.0.0-alpha-3" |
||||
end |
||||
|
||||
s.subspec "Services" do |ss| |
||||
ss.source_files = "*.pbrpc.{h,m}" |
||||
ss.header_mappings_dir = "." |
||||
ss.requires_arc = true |
||||
ss.dependency "gRPC", "~> 0.5" |
||||
ss.dependency "#{s.name}/Messages" |
||||
end |
||||
end |
@ -1,120 +0,0 @@ |
||||
// Copyright 2015, Google Inc. |
||||
// All rights reserved. |
||||
// |
||||
// Redistribution and use in source and binary forms, with or without |
||||
// modification, are permitted provided that the following conditions are |
||||
// met: |
||||
// |
||||
// * Redistributions of source code must retain the above copyright |
||||
// notice, this list of conditions and the following disclaimer. |
||||
// * Redistributions in binary form must reproduce the above |
||||
// copyright notice, this list of conditions and the following disclaimer |
||||
// in the documentation and/or other materials provided with the |
||||
// distribution. |
||||
// * Neither the name of Google Inc. nor the names of its |
||||
// contributors may be used to endorse or promote products derived from |
||||
// this software without specific prior written permission. |
||||
// |
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
|
||||
syntax = "proto3"; |
||||
|
||||
package routeguide; |
||||
|
||||
option objc_class_prefix = "RGD"; |
||||
|
||||
// Interface exported by the server. |
||||
service RouteGuide { |
||||
// A simple RPC. |
||||
// |
||||
// Obtains the feature at a given position. |
||||
rpc GetFeature(Point) returns (Feature) {} |
||||
|
||||
// A server-to-client streaming RPC. |
||||
// |
||||
// Obtains the Features available within the given Rectangle. Results are |
||||
// streamed rather than returned at once (e.g. in a response message with a |
||||
// repeated field), as the rectangle may cover a large area and contain a |
||||
// huge number of features. |
||||
rpc ListFeatures(Rectangle) returns (stream Feature) {} |
||||
|
||||
// A client-to-server streaming RPC. |
||||
// |
||||
// Accepts a stream of Points on a route being traversed, returning a |
||||
// RouteSummary when traversal is completed. |
||||
rpc RecordRoute(stream Point) returns (RouteSummary) {} |
||||
|
||||
// A Bidirectional streaming RPC. |
||||
// |
||||
// Accepts a stream of RouteNotes sent while a route is being traversed, |
||||
// while receiving other RouteNotes (e.g. from other users). |
||||
rpc RouteChat(stream RouteNote) returns (stream RouteNote) {} |
||||
} |
||||
|
||||
// Points are represented as latitude-longitude pairs in the E7 representation |
||||
// (degrees multiplied by 10**7 and rounded to the nearest integer). |
||||
// Latitudes should be in the range +/- 90 degrees and longitude should be in |
||||
// the range +/- 180 degrees (inclusive). |
||||
message Point { |
||||
int32 latitude = 1; |
||||
int32 longitude = 2; |
||||
} |
||||
|
||||
// A latitude-longitude rectangle, represented as two diagonally opposite |
||||
// points "lo" and "hi". |
||||
message Rectangle { |
||||
// One corner of the rectangle. |
||||
Point lo = 1; |
||||
|
||||
// The other corner of the rectangle. |
||||
Point hi = 2; |
||||
} |
||||
|
||||
// A feature names something at a given point. |
||||
// |
||||
// If a feature could not be named, the name is empty. |
||||
message Feature { |
||||
// The name of the feature. |
||||
string name = 1; |
||||
|
||||
// The point where the feature is detected. |
||||
Point location = 2; |
||||
} |
||||
|
||||
// A RouteNote is a message sent while at a given point. |
||||
message RouteNote { |
||||
// The location from which the message is sent. |
||||
Point location = 1; |
||||
|
||||
// The message to be sent. |
||||
string message = 2; |
||||
} |
||||
|
||||
// A RouteSummary is received in response to a RecordRoute rpc. |
||||
// |
||||
// It contains the number of individual points received, the number of |
||||
// detected features, and the total distance covered as the cumulative sum of |
||||
// the distance between each point. |
||||
message RouteSummary { |
||||
// The number of points received. |
||||
int32 point_count = 1; |
||||
|
||||
// The number of known features passed while traversing the route. |
||||
int32 feature_count = 2; |
||||
|
||||
// The distance covered in metres. |
||||
int32 distance = 3; |
||||
|
||||
// The duration of the traversal in seconds. |
||||
int32 elapsed_time = 4; |
||||
} |
@ -0,0 +1,63 @@ |
||||
# Copyright 2015, Google Inc. |
||||
# All rights reserved. |
||||
# |
||||
# Redistribution and use in source and binary forms, with or without |
||||
# modification, are permitted provided that the following conditions are |
||||
# met: |
||||
# |
||||
# * Redistributions of source code must retain the above copyright |
||||
# notice, this list of conditions and the following disclaimer. |
||||
# * Redistributions in binary form must reproduce the above |
||||
# copyright notice, this list of conditions and the following disclaimer |
||||
# in the documentation and/or other materials provided with the |
||||
# distribution. |
||||
# * Neither the name of Google Inc. nor the names of its |
||||
# contributors may be used to endorse or promote products derived from |
||||
# this software without specific prior written permission. |
||||
# |
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
|
||||
"""Buildgen transitive dependencies |
||||
|
||||
This takes the list of libs, node_modules, and targets from our |
||||
yaml dictionary, and adds to each the transitive closure |
||||
of the list of dependencies. |
||||
|
||||
""" |
||||
|
||||
def get_lib(libs, name): |
||||
return next(lib for lib in libs if lib['name']==name) |
||||
|
||||
def transitive_deps(lib, libs): |
||||
if 'deps' in lib: |
||||
# Recursively call transitive_deps on each dependency, and take the union |
||||
return set.union(set(lib['deps']), |
||||
*[set(transitive_deps(get_lib(libs, dep), libs)) |
||||
for dep in lib['deps']]) |
||||
else: |
||||
return set() |
||||
|
||||
def mako_plugin(dictionary): |
||||
"""The exported plugin code for transitive_dependencies. |
||||
|
||||
Each item in libs, node_modules, and targets can have a deps list. |
||||
We add a transitive_deps property to each with the transitive closure |
||||
of those dependency lists. |
||||
""" |
||||
libs = dictionary.get('libs') |
||||
node_modules = dictionary.get('node_modules') |
||||
targets = dictionary.get('targets') |
||||
|
||||
for target_list in (libs, node_modules, targets): |
||||
for target in target_list: |
||||
target['transitive_deps'] = transitive_deps(target, libs) |
Loading…
Reference in new issue