diff options
| -rw-r--r-- | composer.json | 11 | ||||
| -rw-r--r-- | examples/php/composer.json | 11 | ||||
| -rw-r--r-- | package.xml | 2 | ||||
| -rw-r--r-- | src/php/composer.json | 6 | ||||
| -rw-r--r-- | src/php/ext/grpc/README.md | 67 | ||||
| -rw-r--r-- | templates/package.xml.template | 2 |
6 files changed, 19 insertions, 80 deletions
diff --git a/composer.json b/composer.json index 61f81e02bf..97b1a5cb49 100644 --- a/composer.json +++ b/composer.json @@ -2,13 +2,20 @@ "name": "grpc/grpc", "type": "library", "description": "gRPC library for PHP", - "version": "0.6.0", + "version": "0.14.0", "keywords": ["rpc"], "homepage": "http://grpc.io", "license": "BSD-3-Clause", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/stanley-cheung/Protobuf-PHP" + } + ], "require": { "php": ">=5.5.0", - "google/auth": "dev-master" + "datto/protobuf-php": "dev-master", + "google/auth": "v0.7" }, "autoload": { "psr-4": { diff --git a/examples/php/composer.json b/examples/php/composer.json index 9f44f0b186..c837bf7ac0 100644 --- a/examples/php/composer.json +++ b/examples/php/composer.json @@ -1,17 +1,14 @@ { + "name": "grpc/grpc-demo", + "description": "gRPC example for PHP", + "minimum-stability": "dev", "repositories": [ { "type": "vcs", "url": "https://github.com/stanley-cheung/Protobuf-PHP" } ], - "name": "grpc/grpc-demo", - "description": "gRPC example for PHP", - "minimum-stability": "dev", "require": { - "php": ">=5.5.0", - "datto/protobuf-php": "dev-master", - "google/auth": "dev-master", - "grpc/grpc": "dev-release-0_11" + "grpc/grpc": "dev-release-0_13" } } diff --git a/package.xml b/package.xml index e65ab73b54..bb4dcc2037 100644 --- a/package.xml +++ b/package.xml @@ -27,9 +27,9 @@ <contents> <dir baseinstalldir="/" name="/"> <file baseinstalldir="/" name="config.m4" role="src" /> + <file baseinstalldir="/" name="src/php/README.md" role="src" /> <file baseinstalldir="/" name="src/php/ext/grpc/CREDITS" role="src" /> <file baseinstalldir="/" name="src/php/ext/grpc/LICENSE" role="src" /> - <file baseinstalldir="/" name="src/php/ext/grpc/README.md" role="src" /> <file baseinstalldir="/" name="src/php/ext/grpc/byte_buffer.c" role="src" /> <file baseinstalldir="/" name="src/php/ext/grpc/call.c" role="src" /> <file baseinstalldir="/" name="src/php/ext/grpc/call_credentials.c" role="src" /> diff --git a/src/php/composer.json b/src/php/composer.json index 1d41f847ac..01674a25db 100644 --- a/src/php/composer.json +++ b/src/php/composer.json @@ -1,7 +1,9 @@ { "name": "grpc/grpc", + "type": "library", "description": "gRPC library for PHP", - "version": "0.6.0", + "version": "0.14.0", + "keywords": ["rpc"], "homepage": "http://grpc.io", "license": "BSD-3-Clause", "repositories": [ @@ -13,7 +15,7 @@ "require": { "php": ">=5.5.0", "datto/protobuf-php": "dev-master", - "google/auth": "dev-master" + "google/auth": "v0.7" }, "autoload": { "psr-4": { diff --git a/src/php/ext/grpc/README.md b/src/php/ext/grpc/README.md deleted file mode 100644 index 6e1cb2002f..0000000000 --- a/src/php/ext/grpc/README.md +++ /dev/null @@ -1,67 +0,0 @@ -gRPC PHP Extension -================== - -# Requirements - - * PHP 5.5+ - * [gRPC core library](https://github.com/grpc/grpc) 0.11.0 - -# Installation - -## Install PHP 5 - -``` -$ sudo apt-get install git php5 php5-dev php-pear unzip -``` - -## Compile gRPC Core Library - -Clone the gRPC source code repository - -``` -$ git clone https://github.com/grpc/grpc.git -``` - -Build and install the gRPC C core libraries - -```sh -$ cd grpc -$ git checkout --track origin/release-0_11 -$ git pull --recurse-submodules && git submodule update --init --recursive -$ make -$ sudo make install -``` - -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/third_party/protobuf -$ sudo make install # 'make' should have been run by core grpc -``` - -## Install the gRPC PHP extension - -Quick install - -```sh -$ sudo pecl install grpc -``` - -Note: before a stable release, you may need to do - -```sh -$ sudo pecl install grpc-beta -``` - -OR - -Compile from source - -```sh -$ # from grpc -$ cd src/php/ext/grpc -$ phpize -$ ./configure -$ make -$ sudo make install -``` diff --git a/templates/package.xml.template b/templates/package.xml.template index d309bfddbc..8f757401e4 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -29,9 +29,9 @@ <contents> <dir baseinstalldir="/" name="/"> <file baseinstalldir="/" name="config.m4" role="src" /> + <file baseinstalldir="/" name="src/php/README.md" role="src" /> <file baseinstalldir="/" name="src/php/ext/grpc/CREDITS" role="src" /> <file baseinstalldir="/" name="src/php/ext/grpc/LICENSE" role="src" /> - <file baseinstalldir="/" name="src/php/ext/grpc/README.md" role="src" /> % for source in php_config_m4.src + php_config_m4.headers: <file baseinstalldir="/" name="${source}" role="src" /> % endfor |