Don't insert #import "ObjectivecDescriptor.pb.h" into generated code? #…

…26

ProtocolBuffers.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = "ProtocolBuffers"
- s.version = "1.9.4"
+ s.version = "1.9.5"
  s.summary = "Protocol Buffers for Objective-C"
  s.description = <<-DESC
  An implementation of Protocol Buffers 2.6 in Objective C.
@@ -41,7 +41,7 @@ Pod::Spec.new do |s|
  s.authors = { "Alexey Khokhlov" => "alexeyxo@gmail.com" }
 
  s.source = {
- :git => "https://github.com/alexeyxo/protobuf-objc.git", :tag => "1.9.4"
+ :git => "https://github.com/alexeyxo/protobuf-objc.git", :tag => s.version
  }
  s.header_dir = "ProtocolBuffers"
  s.source_files = 'src/runtime/Classes/*.{h,m}'

README.md

@@ -34,7 +34,7 @@ How To Install Protobuf
 
 8.`cd <your .xcodeproj directory>`
 
-9.`echo -e "platform :ios , 6.0 \nlink_with '<YourAppTarget>', '<YourAppTarget_Test>' \npod 'ProtocolBuffers', '1.9.4' " > Podfile`
+9.`echo -e "platform :ios , 6.0 \nlink_with '<YourAppTarget>', '<YourAppTarget_Test>' \npod 'ProtocolBuffers', '1.9.5' " > Podfile`
 
 10.`pod install`
 

src/compiler/objc_file.cc

@@ -52,9 +52,11 @@ namespace google { namespace protobuf { namespace compiler {namespace objectivec
 // }
 
  for (int i = 0; i < file_->dependency_count(); i++) {
- printer->Print(
- "#import \"$header$.pb.h\"\n",
- "header", FilePath(file_->dependency(i)));
+ if (!isObjectivecFileOptions(FilePath(file_->dependency(i)))) {
+ printer->Print(
+ "#import \"$header$.pb.h\"\n",
+ "header", FilePath(file_->dependency(i)));
+ }
  }
 
  printer->Print(

src/compiler/objc_helpers.cc

@@ -216,6 +216,10 @@ namespace google { namespace protobuf { namespace compiler { namespace objective
  return file->name() == "google/protobuf/descriptor.proto";
  }
 
+ bool isObjectivecFileOptions(const string& name) {
+ return name == "ObjectivecDescriptor";
+ }
+
 
  string FileName(const FileDescriptor* file) {
  string basename;

src/compiler/objc_helpers.h

@@ -51,6 +51,7 @@ namespace google {
  bool IsRetainedName(const string& name);
 
  bool IsBootstrapFile(const FileDescriptor* file);
+ bool isObjectivecFileOptions(const string& name);
 
  bool isObjectArray(const FieldDescriptor* field);
  // Gets the name of the file we're going to generate (sans the .pb.h