From ac3c69b99e88110938c22643d1fc4677b6b56173 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Fri, 19 Jan 2018 15:27:19 -0800 Subject: [PATCH] PHP: make generate_projects.sh smarter for package.xml --- package.xml | 9 ++------- templates/package.xml.template | 13 ++++--------- tools/buildgen/plugins/expand_version.py | 7 +++++++ 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/package.xml b/package.xml index 4d242e4eaf1..1b099a8dad7 100644 --- a/package.xml +++ b/package.xml @@ -10,7 +10,7 @@ grpc-packages@google.com yes - 2017-08-24 + 2018-01-19 1.10.0dev @@ -22,12 +22,7 @@ Apache 2.0 -- Channel are now by default persistent #11878 -- Some bug fixes from 1.4 branch #12109, #12123 -- Fixed hang bug when fork() was used #11814 -- License changed to Apache 2.0 -- Added support for php_namespace option in codegen plugin #11886 -- Updated gRPC C Core library version 1.6 +- TBD diff --git a/templates/package.xml.template b/templates/package.xml.template index f10f75b8c06..7f201970b3b 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -12,24 +12,19 @@ grpc-packages@google.com yes - 2017-08-24 + 2018-01-19 ${settings.php_version.php()} ${settings.php_version.php()} - beta - beta + ${settings.php_version.php_stability()} + ${settings.php_version.php_stability()} Apache 2.0 - - Channel are now by default persistent #11878 - - Some bug fixes from 1.4 branch #12109, #12123 - - Fixed hang bug when fork() was used #11814 - - License changed to Apache 2.0 - - Added support for php_namespace option in codegen plugin #11886 - - Updated gRPC C Core library version 1.6 + - TBD diff --git a/tools/buildgen/plugins/expand_version.py b/tools/buildgen/plugins/expand_version.py index 8f56ce8fc97..facf349b0cd 100755 --- a/tools/buildgen/plugins/expand_version.py +++ b/tools/buildgen/plugins/expand_version.py @@ -84,6 +84,13 @@ class Version: % self.tag) return s + def php_stability(self): + """stability string for PHP PECL package.xml file""" + if self.tag: + return 'beta' + else: + return 'stable' + def php_composer(self): """Version string for PHP Composer package""" return '%d.%d.%d' % (self.major, self.minor, self.patch)