diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2016-09-15 11:09:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-15 11:09:01 -0700 |
commit | e0e54661f76183684dca66694967a60cbb10f04e (patch) | |
tree | 0a2a20f984705fdf6ef13de8829901b80f88efb5 /src/google/protobuf/compiler/main.cc | |
parent | 86fcd879b38505446799b2f2a2929415ddad620a (diff) |
Check in php implementation. (#2052)
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
Diffstat (limited to 'src/google/protobuf/compiler/main.cc')
-rw-r--r-- | src/google/protobuf/compiler/main.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/google/protobuf/compiler/main.cc b/src/google/protobuf/compiler/main.cc index 2f3c5b8f..b83b8f32 100644 --- a/src/google/protobuf/compiler/main.cc +++ b/src/google/protobuf/compiler/main.cc @@ -35,8 +35,7 @@ #include <google/protobuf/compiler/python/python_generator.h> #include <google/protobuf/compiler/java/java_generator.h> #include <google/protobuf/compiler/javanano/javanano_generator.h> -// TODO(teboring): Add it back when php implementation is ready -// #include <google/protobuf/compiler/php/php_generator.h> +#include <google/protobuf/compiler/php/php_generator.h> #include <google/protobuf/compiler/ruby/ruby_generator.h> #include <google/protobuf/compiler/csharp/csharp_generator.h> #include <google/protobuf/compiler/objectivec/objectivec_generator.h> @@ -68,11 +67,10 @@ int main(int argc, char* argv[]) { cli.RegisterGenerator("--javanano_out", &javanano_generator, "Generate Java Nano source file."); - // TODO(teboring): Add it back when php implementation is ready // PHP - // google::protobuf::compiler::php::Generator php_generator; - // cli.RegisterGenerator("--php_out", &php_generator, - // "Generate PHP source file."); + google::protobuf::compiler::php::Generator php_generator; + cli.RegisterGenerator("--php_out", &php_generator, + "Generate PHP source file."); // Ruby google::protobuf::compiler::ruby::Generator rb_generator; |