AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #447 from murgatroid99/podspec_fix

Browse Source 
Add remaining not-already-imported well known types files to podspec
This commit is contained in:
Paul Yang 2015-06-02 16:03:38 -07:00
commit 4644f99d1a
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Protobuf.podspec
View File

@ -11,14 +11,25 @@ Pod::Spec.new do |s|
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'
# 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.source_files = 'objectivec/*.{h,m}',
'objectivec/google/protobuf/Any.pbobjc.{h,m}',
'objectivec/google/protobuf/Descriptor.pbobjc.{h,m}',
'objectivec/google/protobuf/Duration.pbobjc.h',
'objectivec/google/protobuf/Empty.pbobjc.{h,m}',
'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}',
'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}',
'objectivec/google/protobuf/Timestamp.pbobjc.h',
'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}'
# Timestamp.pbobjc.m and Duration.pbobjc.m 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/Duration.pbobjc.m',
'objectivec/google/protobuf/Timestamp.pbobjc.m'
# The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be
# left out, as it's an umbrella implementation file. For Api, Struct and Type, see issue #449.
s.exclude_files = 'objectivec/GPBProtocolBuffers.m',
'objectivec/google/protobuf/Api.pbobjc.{h,m}',
'objectivec/google/protobuf/Struct.pbobjc.{h,m}',
'objectivec/google/protobuf/Type.pbobjc.{h,m}'
s.header_mappings_dir = 'objectivec'
s.ios.deployment_target = '6.0'