Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[WIP] cleanup podspec, packaging script #3059

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ios/Mapbox-iOS-SDK.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,15 @@ Pod::Spec.new do |m|
m.requires_arc = true

m.preserve_paths = '**'
m.source_files = 'Headers/*.h', 'MGLDummy.m'
m.source_files = 'Headers/*.h'
m.resource_bundle = { 'Mapbox' => 'Mapbox.bundle/*' }
m.vendored_library = 'libMapbox.a'
m.module_name = 'Mapbox'

m.frameworks = 'CoreLocation', 'GLKit', 'ImageIO', 'MobileCoreServices', 'QuartzCore', 'SystemConfiguration'
m.libraries = 'c++', 'sqlite3', 'z'
m.pod_target_xcconfig = {
'OTHER_CPLUSPLUSFLAGS' => '-std=gnu++11 -stdlib=libc++',
'OTHER_LDFLAGS' => '-ObjC',
'OTHER_CPLUSPLUSFLAGS' => '-std=gnu++11 -stdlib=libc++'
}

end
3 changes: 0 additions & 3 deletions scripts/ios/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ for i in `ls -R include/mbgl/ios | grep -vi private`; do
cp -pv include/mbgl/ios/$i "${OUTPUT}/static/Headers"
done

step "Setting up dummy source file for CocoaPods 0.37.0..."
echo "// https://github.com/mapbox/mapbox-gl-native/issues/1426" > "${OUTPUT}/static/MGLDummy.m"


# Manually create resource bundle. We don't use a GYP target here because of
# complications between faked GYP bundles-as-executables, device build
Expand Down