diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2014-11-25 14:47:04 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2014-11-25 14:47:04 -0800 |
| commit | e9bbfbcd3843cb754e2302a7904268013793d2da (patch) | |
| tree | 7b5f7ccab8fd3bdd221b0e7f9011b01739e83345 | |
| parent | 99aa0f9e8f1a88def7bdebf1385678559cda0707 (diff) | |
| download | protobuf-e9bbfbcd3843cb754e2302a7904268013793d2da.tar.gz protobuf-e9bbfbcd3843cb754e2302a7904268013793d2da.tar.bz2 protobuf-e9bbfbcd3843cb754e2302a7904268013793d2da.zip | |
Link Java Nano generator into protoc.
| -rw-r--r-- | src/Makefile.am | 21 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/main.cc | 6 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 815c9ae9..b88e32ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -239,6 +239,27 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/java/java_string_field.h \ google/protobuf/compiler/java/java_doc_comment.cc \ google/protobuf/compiler/java/java_doc_comment.h \ + google/protobuf/compiler/javanano/javanano_enum.cc \ + google/protobuf/compiler/javanano/javanano_enum_field.h \ + google/protobuf/compiler/javanano/javanano_extension.cc \ + google/protobuf/compiler/javanano/javanano_field.cc \ + google/protobuf/compiler/javanano/javanano_file.cc \ + google/protobuf/compiler/javanano/javanano_generator.cc \ + google/protobuf/compiler/javanano/javanano_helpers.cc \ + google/protobuf/compiler/javanano/javanano_message.cc \ + google/protobuf/compiler/javanano/javanano_message_field.h \ + google/protobuf/compiler/javanano/javanano_params.h \ + google/protobuf/compiler/javanano/javanano_primitive_field.h \ + google/protobuf/compiler/javanano/javanano_enum_field.cc \ + google/protobuf/compiler/javanano/javanano_enum.h \ + google/protobuf/compiler/javanano/javanano_extension.h \ + google/protobuf/compiler/javanano/javanano_field.h \ + google/protobuf/compiler/javanano/javanano_file.h \ + google/protobuf/compiler/javanano/javanano_generator.h \ + google/protobuf/compiler/javanano/javanano_helpers.h \ + google/protobuf/compiler/javanano/javanano_message_field.cc \ + google/protobuf/compiler/javanano/javanano_message.h \ + google/protobuf/compiler/javanano/javanano_primitive_field.cc \ google/protobuf/compiler/python/python_generator.cc bin_PROGRAMS = protoc diff --git a/src/google/protobuf/compiler/main.cc b/src/google/protobuf/compiler/main.cc index 2f5bdaf7..9f2127bb 100644 --- a/src/google/protobuf/compiler/main.cc +++ b/src/google/protobuf/compiler/main.cc @@ -34,6 +34,7 @@ #include <google/protobuf/compiler/cpp/cpp_generator.h> #include <google/protobuf/compiler/python/python_generator.h> #include <google/protobuf/compiler/java/java_generator.h> +#include <google/protobuf/compiler/javanano/javanano_generator.h> int main(int argc, char* argv[]) { @@ -57,5 +58,10 @@ int main(int argc, char* argv[]) { cli.RegisterGenerator("--python_out", &py_generator, "Generate Python source file."); + // Java Nano + google::protobuf::compiler::javanano::JavaNanoGenerator javanano_generator; + cli.RegisterGenerator("--javanano_out", &javanano_generator, + "Generate Java Nano source file."); + return cli.Run(argc, argv); } |