diff --git a/examples/php/composer.json b/examples/php/composer.json
index d40b5db059e..97e9608fe01 100644
--- a/examples/php/composer.json
+++ b/examples/php/composer.json
@@ -1,8 +1,7 @@
{
"name": "grpc/grpc-demo",
"description": "gRPC example for PHP",
- "minimum-stability": "dev",
"require": {
- "grpc/grpc": "v0.15.2"
+ "grpc/grpc": "v1.0.0",
}
}
diff --git a/package.xml b/package.xml
index 81aa5b28237..6e3aab7a769 100644
--- a/package.xml
+++ b/package.xml
@@ -10,11 +10,11 @@
grpc-packages@google.com
yes
- 2016-08-09
+ 2016-08-22
- 1.0.1
- 1.0.1
+ 1.0.1RC1
+ 1.0.1RC1
stable
@@ -22,7 +22,7 @@
BSD
-- Fixed Ubuntu compile error #7571, #7642
+- TBD
@@ -1146,5 +1146,35 @@ Update to wrap gRPC C Core version 0.10.0
- Fixed Ubuntu compile error #7571, #7642
+
+
+ 1.0.0
+ 1.0.0
+
+
+ stable
+ stable
+
+ 2016-08-18
+ BSD
+
+- gRPC 1.0.0 release
+
+
+
+
+ 1.0.1RC1
+ 1.0.1RC1
+
+
+ stable
+ stable
+
+ 2016-08-22
+ BSD
+
+- TBD
+
+
diff --git a/src/php/composer.json b/src/php/composer.json
index 1eacc643a22..db56d2ce6ea 100644
--- a/src/php/composer.json
+++ b/src/php/composer.json
@@ -5,7 +5,7 @@
"keywords": ["rpc"],
"homepage": "http://grpc.io",
"license": "BSD-3-Clause",
- "version": "1.0.0",
+ "version": "1.0.1",
"require": {
"php": ">=5.5.0",
"stanley-cheung/protobuf-php": "v0.6"
diff --git a/templates/package.xml.template b/templates/package.xml.template
index 43d3aa2a584..65fef1892fb 100644
--- a/templates/package.xml.template
+++ b/templates/package.xml.template
@@ -12,7 +12,7 @@
grpc-packages@google.com
yes
- 2016-08-09
+ 2016-08-22
${settings.php_version.php()}
@@ -24,7 +24,7 @@
BSD
- - Fixed Ubuntu compile error #7571, #7642
+ - TBD
@@ -264,5 +264,35 @@
- Fixed Ubuntu compile error #7571, #7642
+
+
+ 1.0.0
+ 1.0.0
+
+
+ stable
+ stable
+
+ 2016-08-18
+ BSD
+
+ - gRPC 1.0.0 release
+
+
+
+
+ ${settings.php_version.php()}
+ ${settings.php_version.php()}
+
+
+ stable
+ stable
+
+ 2016-08-22
+ BSD
+
+ - TBD
+
+
diff --git a/templates/src/php/composer.json.template b/templates/src/php/composer.json.template
new file mode 100644
index 00000000000..bf876f345e7
--- /dev/null
+++ b/templates/src/php/composer.json.template
@@ -0,0 +1,23 @@
+%YAML 1.2
+--- |
+ {
+ "name": "grpc/grpc",
+ "type": "library",
+ "description": "gRPC library for PHP",
+ "keywords": ["rpc"],
+ "homepage": "http://grpc.io",
+ "license": "BSD-3-Clause",
+ "version": "${settings.php_version.php_composer()}",
+ "require": {
+ "php": ">=5.5.0",
+ "stanley-cheung/protobuf-php": "v0.6"
+ },
+ "require-dev": {
+ "google/auth": "v0.9"
+ },
+ "autoload": {
+ "psr-4": {
+ "Grpc\\": "lib/Grpc/"
+ }
+ }
+ }
diff --git a/tools/buildgen/plugins/expand_version.py b/tools/buildgen/plugins/expand_version.py
index c6cc5621c97..6098cca59c9 100755
--- a/tools/buildgen/plugins/expand_version.py
+++ b/tools/buildgen/plugins/expand_version.py
@@ -85,10 +85,21 @@ class Version:
return '%d.%d.%d' % (self.major, self.minor, self.patch)
def php(self):
- """Version string in PHP style"""
- """PECL does not allow tag in version string"""
- return '%d.%d.%d' % (self.major, self.minor, self.patch)
+ """Version string for PHP PECL package"""
+ s = '%d.%d.%d' % (self.major, self.minor, self.patch)
+ if self.tag:
+ if self.tag == 'dev':
+ s += 'dev'
+ elif len(self.tag) >= 3 and self.tag[0:3] == 'pre':
+ s += 'RC%d' % int(self.tag[3:])
+ else:
+ raise Exception('Don\'t know how to translate version tag "%s" to PECL version' % self.tag)
+ return s
+ def php_composer(self):
+ """Version string for PHP Composer package"""
+ return '%d.%d.%d' % (self.major, self.minor, self.patch)
+
def mako_plugin(dictionary):
"""Expand version numbers:
- for each language, ensure there's a language_version tag in