diff options
| -rw-r--r-- | examples/php/composer.json | 3 | ||||
| -rw-r--r-- | package.xml | 38 | ||||
| -rw-r--r-- | src/php/composer.json | 2 | ||||
| -rw-r--r-- | templates/package.xml.template | 34 | ||||
| -rw-r--r-- | templates/src/php/composer.json.template | 23 | ||||
| -rwxr-xr-x | tools/buildgen/plugins/expand_version.py | 17 |
6 files changed, 105 insertions, 12 deletions
diff --git a/examples/php/composer.json b/examples/php/composer.json index d40b5db059..97e9608fe0 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 81aa5b2823..6e3aab7a76 100644 --- a/package.xml +++ b/package.xml @@ -10,11 +10,11 @@ <email>grpc-packages@google.com</email> <active>yes</active> </lead> - <date>2016-08-09</date> + <date>2016-08-22</date> <time>16:06:07</time> <version> - <release>1.0.1</release> - <api>1.0.1</api> + <release>1.0.1RC1</release> + <api>1.0.1RC1</api> </version> <stability> <release>stable</release> @@ -22,7 +22,7 @@ </stability> <license>BSD</license> <notes> -- Fixed Ubuntu compile error #7571, #7642 +- TBD </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -1146,5 +1146,35 @@ Update to wrap gRPC C Core version 0.10.0 - Fixed Ubuntu compile error #7571, #7642 </notes> </release> + <release> + <version> + <release>1.0.0</release> + <api>1.0.0</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2016-08-18</date> + <license>BSD</license> + <notes> +- gRPC 1.0.0 release + </notes> + </release> + <release> + <version> + <release>1.0.1RC1</release> + <api>1.0.1RC1</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2016-08-22</date> + <license>BSD</license> + <notes> +- TBD + </notes> + </release> </changelog> </package> diff --git a/src/php/composer.json b/src/php/composer.json index 1eacc643a2..db56d2ce6e 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 43d3aa2a58..65fef1892f 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -12,7 +12,7 @@ <email>grpc-packages@google.com</email> <active>yes</active> </lead> - <date>2016-08-09</date> + <date>2016-08-22</date> <time>16:06:07</time> <version> <release>${settings.php_version.php()}</release> @@ -24,7 +24,7 @@ </stability> <license>BSD</license> <notes> - - Fixed Ubuntu compile error #7571, #7642 + - TBD </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -264,5 +264,35 @@ - Fixed Ubuntu compile error #7571, #7642 </notes> </release> + <release> + <version> + <release>1.0.0</release> + <api>1.0.0</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2016-08-18</date> + <license>BSD</license> + <notes> + - gRPC 1.0.0 release + </notes> + </release> + <release> + <version> + <release>${settings.php_version.php()}</release> + <api>${settings.php_version.php()}</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2016-08-22</date> + <license>BSD</license> + <notes> + - TBD + </notes> + </release> </changelog> </package> diff --git a/templates/src/php/composer.json.template b/templates/src/php/composer.json.template new file mode 100644 index 0000000000..bf876f345e --- /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 c6cc5621c9..6098cca59c 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 |