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

Commit

Permalink
fixes #3181: move from vendored lib to framework
Browse files Browse the repository at this point in the history
- Add license file to framework build step to satisfy CocoaPods linting.
- Log version when rolling framework (refs #3046).
- fixes #1426: get rid of dummy file since we make our own framework.
  • Loading branch information
incanus committed Dec 7, 2015
1 parent 203b443 commit 032e3a6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
7 changes: 3 additions & 4 deletions ios/Mapbox-iOS-SDK.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pod::Spec.new do |m|
m.documentation_url = 'https://www.mapbox.com/ios-sdk/'

m.source = {
:http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-ios-sdk-#{m.version.to_s}.zip",
:http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/Mapbox.framework-#{m.version.to_s}.zip",
:flatten => true
}

Expand All @@ -23,9 +23,8 @@ Pod::Spec.new do |m|
m.requires_arc = true

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

m.frameworks = 'CoreLocation', 'GLKit', 'ImageIO', 'MobileCoreServices', 'QuartzCore', 'SystemConfiguration'
Expand Down
4 changes: 4 additions & 0 deletions scripts/ios/framework.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ cat ../../../../ios/framework/umbrella >> Mapbox.framework/Headers/Mapbox.h
# resources
cp -rv ../static/Mapbox.bundle Mapbox.framework/Mapbox.bundle

# license
cp -v ../../../../LICENSE.md Mapbox.framework

# settings bundle
cp -rv ../../../../ios/framework/Settings.bundle Mapbox.framework/Settings.bundle

Expand All @@ -31,6 +34,7 @@ cp -v ../../../../ios/framework/modulemap Mapbox.framework/Modules/module.module

# Info.plist
VERSION=$( git tag | grep ^ios | sed 's/^ios-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' )
echo "Using $VERSION for Info.plist. Note that you will need to manually update the product for pre-releases or release candidates."
cp -v ../../../../ios/framework/Info.plist Mapbox.framework
perl -pi -e "s/#####/$VERSION/" Mapbox.framework/Info.plist
perl -pi -e "s/%%%%%/$VERSION/" Mapbox.framework/Info.plist
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

0 comments on commit 032e3a6

Please sign in to comment.