From e841bac4fcf47f809e089a70d5f84ac37b3883df Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Fri, 11 Dec 2015 17:09:20 -0800
Subject: Down-integrate from internal code base.

---
 src/google/protobuf/compiler/main.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/google/protobuf/compiler/main.cc')

diff --git a/src/google/protobuf/compiler/main.cc b/src/google/protobuf/compiler/main.cc
index 584e5a40..97df536e 100644
--- a/src/google/protobuf/compiler/main.cc
+++ b/src/google/protobuf/compiler/main.cc
@@ -38,6 +38,7 @@
 #include <google/protobuf/compiler/ruby/ruby_generator.h>
 #include <google/protobuf/compiler/csharp/csharp_generator.h>
 #include <google/protobuf/compiler/objectivec/objectivec_generator.h>
+#include <google/protobuf/compiler/js/js_generator.h>
 
 int main(int argc, char* argv[]) {
 
@@ -80,5 +81,10 @@ int main(int argc, char* argv[]) {
   cli.RegisterGenerator("--objc_out", &objc_generator,
                         "Generate Objective C header and source.");
 
+  // JavaScript
+  google::protobuf::compiler::js::Generator js_generator;
+  cli.RegisterGenerator("--js_out", &js_generator,
+                        "Generate JavaScript source.");
+
   return cli.Run(argc, argv);
 }
-- 
cgit v1.2.3