diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2016-07-11 14:29:49 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2016-07-11 14:29:49 -0700 |
| commit | cfccf2a149affe78dc5e3cf5f20f418452123feb (patch) | |
| tree | dfb39a6671ca1935a666890ed86fb5de5c6746da /examples | |
| parent | 8f525f9bc5ff0fcae5a6433a411de533e8c93fc5 (diff) | |
| parent | 7126163b92c4b6be0ed8f9954e29fd9965cd7bb6 (diff) | |
Merge master to resolve tests podspec conflict
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/php/README.md | 3 | ||||
| -rw-r--r-- | examples/php/composer.json | 2 | ||||
| -rwxr-xr-x | examples/python/helloworld/run_codegen.sh | 2 | ||||
| -rwxr-xr-x | examples/python/route_guide/run_codegen.sh | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/examples/php/README.md b/examples/php/README.md index e56b017873..6889a6cb7e 100644 --- a/examples/php/README.md +++ b/examples/php/README.md @@ -37,7 +37,8 @@ TRY IT! ``` $ cd examples/node $ npm install - $ nodejs greeter_server.js + $ cd dynamic_codegen or cd static_codegen + $ node greeter_server.js ``` - Run the client diff --git a/examples/php/composer.json b/examples/php/composer.json index c837bf7ac0..950e11367d 100644 --- a/examples/php/composer.json +++ b/examples/php/composer.json @@ -9,6 +9,6 @@ } ], "require": { - "grpc/grpc": "dev-release-0_13" + "grpc/grpc": "v0.15.0" } } diff --git a/examples/python/helloworld/run_codegen.sh b/examples/python/helloworld/run_codegen.sh index 42b58e5021..34224e5c41 100755 --- a/examples/python/helloworld/run_codegen.sh +++ b/examples/python/helloworld/run_codegen.sh @@ -29,4 +29,4 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Runs the protoc with gRPC plugin to generate protocol messages and gRPC stubs. -protoc -I ../../protos --python_out=. --grpc_out=. --plugin=protoc-gen-grpc=`which grpc_python_plugin` ../../protos/helloworld.proto +python -m grpc.tools.protoc -I../../protos --python_out=. --grpc_python_out=. ../../protos/helloworld.proto diff --git a/examples/python/route_guide/run_codegen.sh b/examples/python/route_guide/run_codegen.sh index d9d56c2d7a..a377a1ab40 100755 --- a/examples/python/route_guide/run_codegen.sh +++ b/examples/python/route_guide/run_codegen.sh @@ -29,4 +29,4 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Runs the protoc with gRPC plugin to generate protocol messages and gRPC stubs. -protoc -I ../../protos --python_out=. --grpc_out=. --plugin=protoc-gen-grpc=`which grpc_python_plugin` ../../protos/route_guide.proto +python -m grpc.tools.protoc -I../../protos --python_out=. --grpc_python_out=. ../../protos/route_guide.proto |