diff options
| author |  Stanley Cheung <stanley.cheung@gmail.com> | 2018-01-20 15:54:41 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-20 15:54:41 -0800 |
| commit | 5b48dc737151464c1d863df6e4318ff3d766ddbc (patch) | |
| tree | 5871a19e909002f4f5fbee6b91e2505757038749 | |
| parent | cd9db08e75ed8b57c4bfc586354446343efb9603 (diff) | |
| parent | ac3c69b99e88110938c22643d1fc4677b6b56173 (diff) | |
Merge pull request #14098 from stanley-cheung/php-smarter-gen-proj
PHP: make generate_projects.sh smarter for package.xml
| -rw-r--r-- | package.xml | 9 | ||||
| -rw-r--r-- | templates/package.xml.template | 13 | ||||
| -rwxr-xr-x | tools/buildgen/plugins/expand_version.py | 7 |
3 files changed, 13 insertions, 16 deletions
diff --git a/package.xml b/package.xml index 4d242e4eaf..1b099a8dad 100644 --- a/package.xml +++ b/package.xml @@ -10,7 +10,7 @@ <email>grpc-packages@google.com</email> <active>yes</active> </lead> - <date>2017-08-24</date> + <date>2018-01-19</date> <time>16:06:07</time> <version> <release>1.10.0dev</release> @@ -22,12 +22,7 @@ </stability> <license>Apache 2.0</license> <notes> -- 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 </notes> <contents> <dir baseinstalldir="/" name="/"> diff --git a/templates/package.xml.template b/templates/package.xml.template index f10f75b8c0..7f201970b3 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -12,24 +12,19 @@ <email>grpc-packages@google.com</email> <active>yes</active> </lead> - <date>2017-08-24</date> + <date>2018-01-19</date> <time>16:06:07</time> <version> <release>${settings.php_version.php()}</release> <api>${settings.php_version.php()}</api> </version> <stability> - <release>beta</release> - <api>beta</api> + <release>${settings.php_version.php_stability()}</release> + <api>${settings.php_version.php_stability()}</api> </stability> <license>Apache 2.0</license> <notes> - - 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 </notes> <contents> <dir baseinstalldir="/" name="/"> diff --git a/tools/buildgen/plugins/expand_version.py b/tools/buildgen/plugins/expand_version.py index 8f56ce8fc9..facf349b0c 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) |