From 7b773e94819d73433a7d2e4b961fade4e37c6814 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 28 Aug 2015 09:53:16 -0700 Subject: [PATCH 1/2] php: update readme; --- src/php/README.md | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/php/README.md b/src/php/README.md index f432935fde3b5..08928161371b0 100644 --- a/src/php/README.md +++ b/src/php/README.md @@ -73,29 +73,24 @@ This will download and run the [gRPC install script][] and compile the gRPC PHP Clone this repository -``` +```sh $ git clone https://github.com/grpc/grpc.git ``` -Build and install the Protocol Buffers compiler (protoc) +Build and install the gRPC C core libraries -``` +```sh $ cd grpc $ git pull --recurse-submodules && git submodule update --init --recursive -$ cd third_party/protobuf -$ ./autogen.sh -$ ./configure $ make -$ make check $ sudo make install ``` -Build and install the gRPC C core libraries +Note: you may encounter a warning about the Protobuf compiler `protoc` 3.0.0+ not being installed. The following might help, and will be useful later on when we need to compile the `protoc-gen-php` tool. ```sh -$ cd grpc -$ make -$ sudo make install +$ cd grpc/third_party/protobuf +$ sudo make install # 'make' should have been run by core grpc ``` Install the gRPC PHP extension From aec4ac8221696447ddca43e223d29a1f2590922e Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 28 Aug 2015 14:48:14 -0700 Subject: [PATCH 2/2] update debian unstable to testing --- INSTALL | 4 ++-- src/node/README.md | 6 +++--- src/php/README.md | 6 +++--- src/python/README.md | 6 +++--- src/ruby/README.md | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/INSTALL b/INSTALL index d183fceb9ae41..de13d65d41394 100644 --- a/INSTALL +++ b/INSTALL @@ -11,12 +11,12 @@ wiki pages: On Linux (Debian): - Note: you will need to add the Debian 'unstable' distribution to your sources + Note: you will need to add the Debian 'testing' distribution to your sources file first. Add the following line to your `/etc/apt/sources.list` file: - deb http://ftp.us.debian.org/debian unstable main contrib non-free + deb http://ftp.us.debian.org/debian testing main contrib non-free Install the gRPC library: diff --git a/src/node/README.md b/src/node/README.md index b6411537c7b7f..c96bc966429dd 100644 --- a/src/node/README.md +++ b/src/node/README.md @@ -11,10 +11,10 @@ Alpha : Ready for early adopters **Linux (Debian):** -Add [Debian unstable][] to your `sources.list` file. Example: +Add [Debian testing][] to your `sources.list` file. Example: ```sh -echo "deb http://ftp.us.debian.org/debian unstable main contrib non-free" | \ +echo "deb http://ftp.us.debian.org/debian testing main contrib non-free" | \ sudo tee -a /etc/apt/sources.list ``` @@ -113,4 +113,4 @@ An object with factory methods for creating credential objects for servers. [homebrew]:http://brew.sh [gRPC install script]:https://raw.githubusercontent.com/grpc/homebrew-grpc/master/scripts/install -[Debian unstable]:https://www.debian.org/releases/sid/ +[Debian testing]:https://www.debian.org/releases/stretch/ diff --git a/src/php/README.md b/src/php/README.md index 08928161371b0..afa09d79a1b84 100644 --- a/src/php/README.md +++ b/src/php/README.md @@ -32,10 +32,10 @@ $ sudo php -d detect_unicode=0 go-pear.phar **Linux (Debian):** -Add [Debian unstable][] to your `sources.list` file. Example: +Add [Debian testing][] to your `sources.list` file. Example: ```sh -echo "deb http://ftp.us.debian.org/debian unstable main contrib non-free" | \ +echo "deb http://ftp.us.debian.org/debian testing main contrib non-free" | \ sudo tee -a /etc/apt/sources.list ``` @@ -167,4 +167,4 @@ $ ./bin/run_gen_code_test.sh [homebrew]:http://brew.sh [gRPC install script]:https://raw.githubusercontent.com/grpc/homebrew-grpc/master/scripts/install [Node]:https://github.com/grpc/grpc/tree/master/src/node/examples -[Debian unstable]:https://www.debian.org/releases/sid/ +[Debian testing]:https://www.debian.org/releases/stretch/ diff --git a/src/python/README.md b/src/python/README.md index affce64884374..a21deb33efa8e 100644 --- a/src/python/README.md +++ b/src/python/README.md @@ -16,10 +16,10 @@ INSTALLATION **Linux (Debian):** -Add [Debian unstable][] to your `sources.list` file. Example: +Add [Debian testing][] to your `sources.list` file. Example: ```sh -echo "deb http://ftp.us.debian.org/debian unstable main contrib non-free" | \ +echo "deb http://ftp.us.debian.org/debian testing main contrib non-free" | \ sudo tee -a /etc/apt/sources.list ``` @@ -92,4 +92,4 @@ $ ../../tools/distrib/python/submit.py [gRPC install script]:https://raw.githubusercontent.com/grpc/homebrew-grpc/master/scripts/install [Quick Start]:http://www.grpc.io/docs/tutorials/basic/python.html [detailed example]:http://www.grpc.io/docs/installation/python.html -[Debian unstable]:https://www.debian.org/releases/sid/ +[Debian testing]:https://www.debian.org/releases/stretch/ diff --git a/src/ruby/README.md b/src/ruby/README.md index f8902e34c5ad6..7f75c0e313dca 100644 --- a/src/ruby/README.md +++ b/src/ruby/README.md @@ -19,10 +19,10 @@ INSTALLATION **Linux (Debian):** -Add [Debian unstable][] to your `sources.list` file. Example: +Add [Debian testing][] to your `sources.list` file. Example: ```sh -echo "deb http://ftp.us.debian.org/debian unstable main contrib non-free" | \ +echo "deb http://ftp.us.debian.org/debian testing main contrib non-free" | \ sudo tee -a /etc/apt/sources.list ``` @@ -99,4 +99,4 @@ Directory structure is the layout for [ruby extensions][] [ruby extensions]:http://guides.rubygems.org/gems-with-extensions/ [rubydoc]: http://www.rubydoc.info/gems/grpc [grpc.io]: http://www.grpc.io/docs/installation/ruby.html -[Debian unstable]:https://www.debian.org/releases/sid/ +[Debian testing]:https://www.debian.org/releases/stretch/