Merge pull request #5475 from stanley-cheung/php-single-pecl-install-release-0_13

Simplify PHP installation for release 0.13

build.yaml

@@ -2788,6 +2788,33 @@ node_modules:
   - src/node/ext/server.cc
   - src/node/ext/server_credentials.cc
   - src/node/ext/timeval.cc
+php_config_m4:
+  deps:
+  - grpc
+  - gpr
+  - boringssl
+  headers:
+  - src/php/ext/grpc/byte_buffer.h
+  - src/php/ext/grpc/call.h
+  - src/php/ext/grpc/call_credentials.h
+  - src/php/ext/grpc/channel.h
+  - src/php/ext/grpc/channel_credentials.h
+  - src/php/ext/grpc/completion_queue.h
+  - src/php/ext/grpc/php_grpc.h
+  - src/php/ext/grpc/server.h
+  - src/php/ext/grpc/server_credentials.h
+  - src/php/ext/grpc/timeval.h
+  src:
+  - src/php/ext/grpc/byte_buffer.c
+  - src/php/ext/grpc/call.c
+  - src/php/ext/grpc/call_credentials.c
+  - src/php/ext/grpc/channel.c
+  - src/php/ext/grpc/channel_credentials.c
+  - src/php/ext/grpc/completion_queue.c
+  - src/php/ext/grpc/php_grpc.c
+  - src/php/ext/grpc/server.c
+  - src/php/ext/grpc/server_credentials.c
+  - src/php/ext/grpc/timeval.c
 python_dependencies:
   deps:
   - grpc

src/php/README.md

@@ -33,44 +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
 

templates/config.m4.template

+%YAML 1.2
+--- |
+  PHP_ARG_ENABLE(grpc, whether to enable grpc support,
+  [  --enable-grpc           Enable grpc support])
+
+  if test "$PHP_GRPC" != "no"; then
+    dnl Write more examples of tests here...
+
+    dnl # --with-grpc -> add include path
+    PHP_ADD_INCLUDE(../../grpc/include)
+    PHP_ADD_INCLUDE(../../grpc/src/php/ext/grpc)
+    PHP_ADD_INCLUDE(../../grpc/third_party/boringssl/include)
+
+    LIBS="-lpthread $LIBS"
+
+    GRPC_SHARED_LIBADD="-lpthread $GRPC_SHARED_LIBADD"
+    PHP_ADD_LIBRARY(pthread)
+
+    PHP_ADD_LIBRARY(dl,,GRPC_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(dl)
+
+    case $host in
+      *darwin*) ;;
+      *)
+        PHP_ADD_LIBRARY(rt,,GRPC_SHARED_LIBADD)
+        PHP_ADD_LIBRARY(rt)
+        ;;
+    esac
+
+    PHP_NEW_EXTENSION(grpc,
+      % for source in php_config_m4.src:
+      ${source} ${"\\"}
+      % endfor
+      % for lib in libs:
+      % if lib.name in php_config_m4.get('deps', []):
+      % for source in lib.src:
+      ${source} ${"\\"}
+      % endfor
+      % endif
+      % endfor
+      , $ext_shared, , -Wall -Werror ${"\\"}
+      -Wno-parentheses-equality -Wno-unused-value -std=c11 ${"\\"}
+      -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN ${"\\"}
+      -D_HAS_EXCEPTIONS=0 -DNOMINMAX)
+
+    PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)
+  <%
+    dirs = {}
+    for lib in libs:
+      if lib.name in php_config_m4.get('deps', []):
+        for source in lib.src:
+          dirs[source[:source.rfind('/')]] = 1
+    dirs = dirs.keys()
+    dirs.sort()
+  %>
+    % for dir in dirs:
+    PHP_ADD_BUILD_DIR($ext_builddir/${dir})
+    % endfor
+  fi

templates/package.xml.template

+%YAML 1.2
+--- |
+  <?xml version="1.0" encoding="UTF-8"?>
+  <package packagerversion="1.9.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+   <name>grpc</name>
+   <channel>pecl.php.net</channel>
+   <summary>A high performance, open source, general RPC framework that puts mobile and HTTP/2 first.</summary>
+   <description>Remote Procedure Calls (RPCs) provide a useful abstraction for building distributed applications and services. The libraries in this repository provide a concrete implementation of the gRPC protocol, layered over HTTP/2. These libraries enable communication between clients and servers using any combination of the supported languages.</description>
+   <lead>
+    <name>Stanley Cheung</name>
+    <user>stanleycheung</user>
+    <email>grpc-packages@google.com</email>
+    <active>yes</active>
+   </lead>
+   <date>2016-02-24</date>
+   <time>16:06:07</time>
+   <version>
+    <release>0.8.0</release>
+    <api>0.8.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <license>BSD</license>
+   <notes>
+  - Simplify gRPC PHP installation #4517
+  - Wrap gRPC core library version 0.13
+   </notes>
+   <contents>
+    <dir baseinstalldir="/" name="/">
+      <file baseinstalldir="/" name="config.m4" 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
+      % for lib in libs:
+      % if lib.name in php_config_m4.get('deps', []):
+      % for source in lib.get('public_headers', []) + lib.headers + lib.src:
+      <file baseinstalldir="/" name="${source}" role="src" />
+      % endfor
+      % endif
+      % endfor
+    </dir>
+   </contents>
+   <dependencies>
+    <required>
+     <php>
+      <min>5.5.0</min>
+     </php>
+     <pearinstaller>
+      <min>1.4.0</min>
+     </pearinstaller>
+    </required>
+   </dependencies>
+   <providesextension>grpc</providesextension>
+   <extsrcrelease />
+   <changelog>
+    <release>
+     <version>
+      <release>0.5.0</release>
+      <api>0.5.0</api>
+     </version>
+     <stability>
+      <release>alpha</release>
+      <api>alpha</api>
+     </stability>
+     <date>2015-06-16</date>
+     <license>BSD</license>
+     <notes>
+  First alpha release
+     </notes>
+    </release>
+    <release>
+     <version>
+      <release>0.5.1</release>
+      <api>0.5.1</api>
+     </version>
+     <stability>
+      <release>alpha</release>
+      <api>alpha</api>
+     </stability>
+     <date>2015-07-09</date>
+     <license>BSD</license>
+     <notes>
+  Update to wrap gRPC C Core version 0.10.0
+     </notes>
+    </release>
+    <release>
+     <version>
+      <release>0.6.0</release>
+      <api>0.6.0</api>
+     </version>
+     <stability>
+      <release>beta</release>
+      <api>beta</api>
+     </stability>
+     <date>2015-09-24</date>
+     <license>BSD</license>
+     <notes>
+  - support per message compression disable
+  - expose per-call host override option
+  - expose connectivity API
+  - expose channel target and call peer
+  - add user-agent
+  - update to wrap gRPC C core library beta version 0.11.0
+     </notes>
+    </release>
+    <release>
+     <version>
+      <release>0.6.1</release>
+      <api>0.6.0</api>
+     </version>
+     <stability>
+      <release>beta</release>
+      <api>beta</api>
+     </stability>
+     <date>2015-10-21</date>
+     <license>BSD</license>
+     <notes>
+  - fixed undefined constant fatal error when run with apache/nginx #2275
+     </notes>
+    </release>
+    <release>
+     <version>
+      <release>0.7.0</release>
+      <api>0.7.0</api>
+     </version>
+     <stability>
+      <release>beta</release>
+      <api>beta</api>
+     </stability>
+     <date>2016-01-13</date>
+     <license>BSD</license>
+     <notes>
+  - Breaking change to Credentials class (removed) #3765
+  - Replaced by ChannelCredentials and CallCredentials class #3765
+  - New plugin based metadata auth API #4394
+  - Explicit ChannelCredentials::createInsecure() call
+     </notes>
+    </release>
+    <release>
+     <version>
+      <release>0.8.0</release>
+      <api>0.8.0</api>
+     </version>
+     <stability>
+      <release>beta</release>
+      <api>beta</api>
+     </stability>
+     <date>2016-02-24</date>
+     <license>BSD</license>
+     <notes>
+  - Simplify gRPC PHP installation #4517
+  - Wrap gRPC core library version 0.13
+     </notes>
+    </release>
+   </changelog>
+  </package>

tools/distrib/python/docgen.py

 #!/usr/bin/env python2.7
-# Copyright 2015, Google Inc.
+# Copyright 2015-2016, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without