From 153d61a1a14c4674feaacc8537a163afd7e8e0c9 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Mon, 1 Jun 2015 22:03:52 -0700 Subject: s/pobjc/pbobjc and simplify a bit the podspec --- Protobuf.podspec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'Protobuf.podspec') diff --git a/Protobuf.podspec b/Protobuf.podspec index cc3f2d7d..230929b8 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -6,13 +6,24 @@ 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/Any.pbobjc.m', 'objectivec/google/protobuf/Api.pbobjc.m', 'objectivec/google/protobuf/Descriptor.pbobjc.m', 'objectivec/google/protobuf/Empty.pbobjc.m', 'objectivec/google/protobuf/FieldMask.pbobjc.m', 'objectivec/google/protobuf/SourceContext.pbobjc.m', 'objectivec/google/protobuf/Struct.pbobjc.m' 'objectivec/google/protobuf/Type.pbobjc.m', 'objectivec/google/protobuf/Wrappers.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/Struct.pbobjc.{h,m}', \ + 'objectivec/google/protobuf/Timestamp.pbobjc.h', \ + 'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}' # The following would cause duplicate symbol definitions - s.exclude_files = 'objectivec/GPBProtocolBuffers.m', 'objectivec/google/protobuf/Api.pobjc.m', 'objectivec/google/protobuf/Type.pobjc.m' + s.exclude_files = 'objectivec/GPBProtocolBuffers.m', \ + 'objectivec/google/protobuf/Api.pbobjc.{h,m}', \ + 'objectivec/google/protobuf/Type.pbobjc.{h,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.preserve_paths = 'objectivec/google/protobuf/Timestamp.pbobjc.m', 'objectivec/google/protobuf/Duration.pbobjc.m' s.header_mappings_dir = 'objectivec' s.ios.deployment_target = '6.0' -- cgit v1.2.3 From 6afcaf0f2d99943f47f96b9227ee272d90a7453e Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Mon, 1 Jun 2015 22:43:29 -0700 Subject: Remove struct.proto too (redefines GPBValue) --- Protobuf.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Protobuf.podspec') diff --git a/Protobuf.podspec b/Protobuf.podspec index 230929b8..eed2bdc3 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -13,12 +13,12 @@ Pod::Spec.new do |s| 'objectivec/google/protobuf/Empty.pbobjc.{h,m}', \ 'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}', \ 'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}', \ - 'objectivec/google/protobuf/Struct.pbobjc.{h,m}', \ 'objectivec/google/protobuf/Timestamp.pbobjc.h', \ 'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}' # The following would cause duplicate symbol definitions 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}' # 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 -- cgit v1.2.3 From d377c17b34b5d4fc20a519e80e16bb9c44a68006 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Tue, 2 Jun 2015 00:34:18 -0700 Subject: Remove backslashes after commas --- Protobuf.podspec | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'Protobuf.podspec') diff --git a/Protobuf.podspec b/Protobuf.podspec index eed2bdc3..d057ccd1 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -6,24 +6,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/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', \ + 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}' # The following would cause duplicate symbol definitions - s.exclude_files = 'objectivec/GPBProtocolBuffers.m', \ - 'objectivec/google/protobuf/Api.pbobjc.{h,m}', \ - 'objectivec/google/protobuf/Struct.pbobjc.{h,m}', \ + 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}' # 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/Timestamp.pbobjc.m', 'objectivec/google/protobuf/Duration.pbobjc.m' + s.preserve_paths = 'objectivec/google/protobuf/Timestamp.pbobjc.m', + 'objectivec/google/protobuf/Duration.pbobjc.m' s.header_mappings_dir = 'objectivec' s.ios.deployment_target = '6.0' -- cgit v1.2.3 From e55a25c086da4ce066d9f0180b4f41e4c3c41cb7 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Tue, 2 Jun 2015 00:34:35 -0700 Subject: Better documentation --- Protobuf.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Protobuf.podspec') diff --git a/Protobuf.podspec b/Protobuf.podspec index d057ccd1..1c1477af 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -15,14 +15,14 @@ Pod::Spec.new do |s| 'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}', 'objectivec/google/protobuf/Timestamp.pbobjc.h', 'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}' - # The following would cause duplicate symbol definitions + # 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}' - # 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: + # 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/Timestamp.pbobjc.m', 'objectivec/google/protobuf/Duration.pbobjc.m' s.header_mappings_dir = 'objectivec' -- cgit v1.2.3 From 9d6b946a9ef3b735696fd99b088af37ccc67703f Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Tue, 2 Jun 2015 01:03:03 -0700 Subject: Reorder fields so it looks like exclude_files affects preserve_paths --- Protobuf.podspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Protobuf.podspec') diff --git a/Protobuf.podspec b/Protobuf.podspec index 1c1477af..8b12135f 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -15,16 +15,16 @@ Pod::Spec.new do |s| '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}' - # 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/Timestamp.pbobjc.m', - 'objectivec/google/protobuf/Duration.pbobjc.m' s.header_mappings_dir = 'objectivec' s.ios.deployment_target = '6.0' -- cgit v1.2.3