From df1e05ad244efa8a7912aa164d72c132c0e3f442 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Mon, 29 Feb 2016 16:26:57 -0800 Subject: [PATCH 1/2] Simplify PHP installation --- package.xml | 23 ++++++++++++++++++---- src/php/README.md | 36 ---------------------------------- templates/package.xml.template | 23 ++++++++++++++++++---- 3 files changed, 38 insertions(+), 44 deletions(-) diff --git a/package.xml b/package.xml index 42a0361df0a..b6a59040188 100644 --- a/package.xml +++ b/package.xml @@ -10,11 +10,11 @@ grpc-packages@google.com yes - 2016-02-24 + 2016-03-01 - 0.8.0 - 0.8.0 + 0.9.0 + 0.9.0 beta @@ -22,7 +22,7 @@ BSD -- Simplify gRPC PHP installation #4517 +- Increase unit test code coverage #5225 @@ -969,5 +969,20 @@ Update to wrap gRPC C Core version 0.10.0 - Simplify gRPC PHP installation #4517 + + + 0.9.0 + 0.9.0 + + + beta + beta + + 2016-03-01 + BSD + +- Increase unit test code coverage #5225 + + diff --git a/src/php/README.md b/src/php/README.md index b1823b92261..b368482f068 100644 --- a/src/php/README.md +++ b/src/php/README.md @@ -33,45 +33,12 @@ $ sudo mv phpunit.phar /usr/local/bin/phpunit ## Quick Install -**Linux (Debian):** - -Add [Debian jessie-backports][] to your `sources.list` file. Example: - -```sh -echo "deb http://http.debian.net/debian jessie-backports main" | \ -sudo tee -a /etc/apt/sources.list -``` - -Install the gRPC Debian package - -```sh -sudo apt-get update -sudo apt-get install libgrpc-dev -``` - Install the gRPC PHP extension ```sh sudo pecl install grpc-beta ``` -**Mac OS X:** - -Install [homebrew][]. Example: - -```sh -ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -``` - -Install the gRPC core library and the PHP extension in one step - -```sh -$ curl -fsSL https://goo.gl/getgrpc | bash -s php -``` - -This will download and run the [gRPC install script][] and compile the gRPC PHP extension. - - ## Build from Source Clone this repository @@ -297,7 +264,4 @@ Connect to `localhost/math_client.php` in your browser, or run this from command $ curl localhost/math_client.php ``` -[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 jessie-backports]:http://backports.debian.org/Instructions/ diff --git a/templates/package.xml.template b/templates/package.xml.template index 067c8839d5a..bca20a31426 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -12,11 +12,11 @@ grpc-packages@google.com yes - 2016-02-24 + 2016-03-01 - 0.8.0 - 0.8.0 + 0.9.0 + 0.9.0 beta @@ -24,7 +24,7 @@ BSD - - Simplify gRPC PHP installation #4517 + - Increase unit test code coverage #5225 @@ -155,5 +155,20 @@ - Simplify gRPC PHP installation #4517 + + + 0.9.0 + 0.9.0 + + + beta + beta + + 2016-03-01 + BSD + + - Increase unit test code coverage #5225 + + From a91a5db3630e0bdb673a5888de043cd56007a0ee Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Tue, 1 Mar 2016 11:19:16 -0800 Subject: [PATCH 2/2] sync php with core version; --- package.xml | 8 ++++---- templates/package.xml.template | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.xml b/package.xml index b6a59040188..e65ab73b54a 100644 --- a/package.xml +++ b/package.xml @@ -13,8 +13,8 @@ 2016-03-01 - 0.9.0 - 0.9.0 + 0.14.0 + 0.14.0 beta @@ -971,8 +971,8 @@ Update to wrap gRPC C Core version 0.10.0 - 0.9.0 - 0.9.0 + 0.14.0 + 0.14.0 beta diff --git a/templates/package.xml.template b/templates/package.xml.template index bca20a31426..d309bfddbc3 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -15,8 +15,8 @@ 2016-03-01 - 0.9.0 - 0.9.0 + 0.14.0 + 0.14.0 beta @@ -157,8 +157,8 @@ - 0.9.0 - 0.9.0 + 0.14.0 + 0.14.0 beta