From 687a5fef9dbf625be043df2eeb9175fc3f110ac3 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Wed, 13 May 2015 19:54:55 -0700 Subject: Adds the initial version of the podspec for the proto3 Objective-C runtime. --- Protobuf.podspec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Protobuf.podspec diff --git a/Protobuf.podspec b/Protobuf.podspec new file mode 100644 index 00000000..98b69e15 --- /dev/null +++ b/Protobuf.podspec @@ -0,0 +1,23 @@ +Pod::Spec.new do |s| + s.name = 'Protobuf' + s.version = '3.0.0' + s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' + s.homepage = 'https://github.com/google/protobuf' + s.license = 'New BSD' + s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } + + s.source_files = 'objectivec/*.{h,m}', 'objectivec/google/protobuf/*.pbobjc.h', 'objectivec/google/protobuf/Descriptor.pbobjc.m' + s.public_header_files = 'objectivec/*.h', 'objectivec/google/protobuf/*.pbobjc.h' + # The following is a .m umbrella file, and would cause duplicate symbol + # definitions: + s.exclude_files = 'objectivec/GPBProtocolBuffers.m' + # The .m's of the proto Well-Known-Types under google/protobuf are #imported + # by GPBWellKnownTypes.m. So we can't compile them (duplicate symbols), but we + # need them available for the importing: + s.preserve_paths = 'objectivec/google/protobuf/*.pbobjc.m' + s.header_mappings_dir = 'objectivec' + + s.ios.deployment_target = '6.0' + s.osx.deployment_target = '10.8' + s.requires_arc = false +end -- cgit v1.2.3 From 592c44f3ea9e3b7b836d28d5bb2226bd94b2c822 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Thu, 14 May 2015 14:16:40 -0700 Subject: Makes _PackagePrivate.h files private --- Protobuf.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Protobuf.podspec b/Protobuf.podspec index 98b69e15..962a6f23 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -4,10 +4,10 @@ Pod::Spec.new do |s| s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/google/protobuf' s.license = 'New BSD' - s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } + s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } s.source_files = 'objectivec/*.{h,m}', 'objectivec/google/protobuf/*.pbobjc.h', 'objectivec/google/protobuf/Descriptor.pbobjc.m' - s.public_header_files = 'objectivec/*.h', 'objectivec/google/protobuf/*.pbobjc.h' + s.private_header_files = 'objectivec/*_PackagePrivate.h' # The following is a .m umbrella file, and would cause duplicate symbol # definitions: s.exclude_files = 'objectivec/GPBProtocolBuffers.m' -- cgit v1.2.3 From 56ffef9f334554eda6e931342b413c66624349d1 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Thu, 14 May 2015 16:07:49 -0700 Subject: Restricts public headers to GPBProtocolBuffers.h and GPBProtocolBuffers_RuntimeSupport.h --- Protobuf.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Protobuf.podspec b/Protobuf.podspec index 962a6f23..11e12e52 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } s.source_files = 'objectivec/*.{h,m}', 'objectivec/google/protobuf/*.pbobjc.h', 'objectivec/google/protobuf/Descriptor.pbobjc.m' - s.private_header_files = 'objectivec/*_PackagePrivate.h' + s.public_header_files = 'objectivec/GPBProtocolBuffers.h', 'objectivec/GPBProtocolBuffers_RuntimeSupport.h' # The following is a .m umbrella file, and would cause duplicate symbol # definitions: s.exclude_files = 'objectivec/GPBProtocolBuffers.m' -- cgit v1.2.3 From 244366f8a8a64a4a377e875ce46be496724f3c7e Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Thu, 14 May 2015 16:29:40 -0700 Subject: Undo previous commit: Make all headers public instead. Apparently, in Cocoapods, all recursive #imports of public headers need to be public. --- Protobuf.podspec | 1 - 1 file changed, 1 deletion(-) diff --git a/Protobuf.podspec b/Protobuf.podspec index 11e12e52..5c154a57 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -7,7 +7,6 @@ Pod::Spec.new do |s| s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } s.source_files = 'objectivec/*.{h,m}', 'objectivec/google/protobuf/*.pbobjc.h', 'objectivec/google/protobuf/Descriptor.pbobjc.m' - s.public_header_files = 'objectivec/GPBProtocolBuffers.h', 'objectivec/GPBProtocolBuffers_RuntimeSupport.h' # The following is a .m umbrella file, and would cause duplicate symbol # definitions: s.exclude_files = 'objectivec/GPBProtocolBuffers.m' -- cgit v1.2.3 From 46b0a6570271a5f880e9277f158ceabf404a2348 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Thu, 14 May 2015 22:38:52 -0700 Subject: Adds the podspec to objectivec_EXTRA_DIST in Makefile.am --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index eecffa1f..45d44f5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -318,7 +318,8 @@ objectivec_EXTRA_DIST= \ objectivec/Tests/unittest_runtime_proto2.proto \ objectivec/Tests/unittest_runtime_proto3.proto \ objectivec/Tests/UnitTests-Bridging-Header.h \ - objectivec/Tests/UnitTests-Info.plist + objectivec/Tests/UnitTests-Info.plist \ + Protobuf.podspec python_EXTRA_DIST= \ python/google/protobuf/internal/api_implementation.cc \ -- cgit v1.2.3