Skip to content

Commit

Permalink
Add --<lang>_opt flag for all built-in generators
Browse files Browse the repository at this point in the history
Plugins (and some built-in generators) have `--<lang>_opt` flag that
allows passing parameters one-by-one instead of passing them as
`--<lang>_out=<params>:<out_base>`. This PR changes protoc to
allow using `--<lang>_opt` for all (built-in) generators.
  • Loading branch information
Yannic authored and acozzette committed Dec 10, 2019
1 parent b4596f8 commit 4447fcc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/google/protobuf/compiler/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ int ProtobufMain(int argc, char* argv[]) {

// Proto2 Python
python::Generator py_generator;
cli.RegisterGenerator("--python_out", &py_generator,
cli.RegisterGenerator("--python_out", "--python_opt", &py_generator,
"Generate Python source file.");

// PHP
php::Generator php_generator;
cli.RegisterGenerator("--php_out", &php_generator,
cli.RegisterGenerator("--php_out", "--php_opt", &php_generator,
"Generate PHP source file.");

// Ruby
ruby::Generator rb_generator;
cli.RegisterGenerator("--ruby_out", &rb_generator,
cli.RegisterGenerator("--ruby_out", "--ruby_opt", &rb_generator,
"Generate Ruby source file.");

// CSharp
Expand All @@ -94,7 +94,7 @@ int ProtobufMain(int argc, char* argv[]) {

// JavaScript
js::Generator js_generator;
cli.RegisterGenerator("--js_out", &js_generator,
cli.RegisterGenerator("--js_out", "--js_opt", &js_generator,
"Generate JavaScript source.");

return cli.Run(argc, argv);
Expand Down

0 comments on commit 4447fcc

Please sign in to comment.