Merge pull request #4347 from xfxyjwf/pluginpb

Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."

Merge pull request #4347 from xfxyjwf/pluginpb
Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."
8e44a86f · Feng Xiao · GitHub · 6ebfa148 · fd595fcc · 8e44a86f
Unverified Commit 8e44a86f authored Mar 09, 2018 by Feng Xiao Committed by GitHub Mar 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

BUILD BUILD +1 -1

libprotobuf.cmake cmake/libprotobuf.cmake +0 -1

libprotoc.cmake cmake/libprotoc.cmake +1 -0

Makefile.am src/Makefile.am +1 -1

No files found.
--- a/BUILD
+++ b/BUILD
@@ -121,7 +121,6 @@ cc_library(
        "src/google/protobuf/api.pb.cc",
        "src/google/protobuf/compiler/importer.cc",
        "src/google/protobuf/compiler/parser.cc",
-        "src/google/protobuf/compiler/plugin.pb.cc",
        "src/google/protobuf/descriptor.cc",
        "src/google/protobuf/descriptor.pb.cc",
        "src/google/protobuf/descriptor_database.cc",
@@ -379,6 +378,7 @@ cc_library(
        "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",
        "src/google/protobuf/compiler/php/php_generator.cc",
        "src/google/protobuf/compiler/plugin.cc",
+        "src/google/protobuf/compiler/plugin.pb.cc",
        "src/google/protobuf/compiler/python/python_generator.cc",
        "src/google/protobuf/compiler/ruby/ruby_generator.cc",
        "src/google/protobuf/compiler/subprocess.cc",

--- a/cmake/libprotobuf.cmake
+++ b/cmake/libprotobuf.cmake
@@ -4,7 +4,6 @@ set(libprotobuf_files
  ${protobuf_source_dir}/src/google/protobuf/api.pb.cc
  ${protobuf_source_dir}/src/google/protobuf/compiler/importer.cc
  ${protobuf_source_dir}/src/google/protobuf/compiler/parser.cc
-  ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.pb.cc
  ${protobuf_source_dir}/src/google/protobuf/descriptor.cc
  ${protobuf_source_dir}/src/google/protobuf/descriptor.pb.cc
  ${protobuf_source_dir}/src/google/protobuf/descriptor_database.cc

--- a/cmake/libprotoc.cmake
+++ b/cmake/libprotoc.cmake
@@ -88,6 +88,7 @@ set(libprotoc_files
  ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
  ${protobuf_source_dir}/src/google/protobuf/compiler/php/php_generator.cc
  ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.pb.cc
  ${protobuf_source_dir}/src/google/protobuf/compiler/python/python_generator.cc
  ${protobuf_source_dir}/src/google/protobuf/compiler/ruby/ruby_generator.cc
  ${protobuf_source_dir}/src/google/protobuf/compiler/subprocess.cc

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -278,7 +278,6 @@ libprotobuf_la_SOURCES =                                       \
  google/protobuf/io/zero_copy_stream_impl.cc                  \
  google/protobuf/compiler/importer.cc                         \
  google/protobuf/compiler/parser.cc                           \
-  google/protobuf/compiler/plugin.pb.cc                        \
  google/protobuf/util/delimited_message_util.cc               \
  google/protobuf/util/field_comparator.cc                     \
  google/protobuf/util/field_mask_util.cc                      \
@@ -334,6 +333,7 @@ libprotoc_la_SOURCES =                                         \
  google/protobuf/compiler/code_generator.cc                   \
  google/protobuf/compiler/command_line_interface.cc           \
  google/protobuf/compiler/plugin.cc                           \
+  google/protobuf/compiler/plugin.pb.cc                        \
  google/protobuf/compiler/subprocess.cc                       \
  google/protobuf/compiler/subprocess.h                        \
  google/protobuf/compiler/zip_writer.cc                       \