Tweak the error message as the generate is in the core binary these days.

9 years ago · 536059e569
parent 20b4e84f42
commit 536059e569
12 changed files with 12 additions and 12 deletions
--- a/objectivec/google/protobuf/Any.pbobjc.h
+++ b/objectivec/google/protobuf/Any.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/Api.pbobjc.h
+++ b/objectivec/google/protobuf/Api.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/Descriptor.pbobjc.h
+++ b/objectivec/google/protobuf/Descriptor.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/Duration.pbobjc.h
+++ b/objectivec/google/protobuf/Duration.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/Empty.pbobjc.h
+++ b/objectivec/google/protobuf/Empty.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/FieldMask.pbobjc.h
+++ b/objectivec/google/protobuf/FieldMask.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/SourceContext.pbobjc.h
+++ b/objectivec/google/protobuf/SourceContext.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/Struct.pbobjc.h
+++ b/objectivec/google/protobuf/Struct.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/Timestamp.pbobjc.h
+++ b/objectivec/google/protobuf/Timestamp.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/Type.pbobjc.h
+++ b/objectivec/google/protobuf/Type.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/objectivec/google/protobuf/Wrappers.pbobjc.h
+++ b/objectivec/google/protobuf/Wrappers.pbobjc.h
@ -4,7 +4,7 @@
 #import "GPBProtocolBuffers.h"

 #if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30000
-#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.
+#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
 #endif

 // @@protoc_insertion_point(imports)
--- a/src/google/protobuf/compiler/objectivec/objectivec_file.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_file.cc
@ -95,7 +95,7 @@ void FileGenerator::GenerateHeader(io::Printer *printer) {
  // code is being compiled with.
  printer->Print(
      "#if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != $protoc_gen_objc_version$\n"
-      "#error This file was generated by a different version of protoc-gen-objc which is incompatible with your Protocol Buffer sources.\n"
+      "#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.\n"
      "#endif\n"
      "\n",
      "protoc_gen_objc_version",