summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-12-03 16:01:35 -0800
committerJustin R. Miller <incanus@codesorcery.net>2015-12-07 12:14:29 -0800
commit032e3a66f35aa4fd3954a700d5753cd21e06a59d (patch)
tree712176c5c57816427bb3ae767e14375964ed8d92 /scripts
parent203b443d2699c44115ce3f2b7234185e592ad529 (diff)
downloadqtlocation-mapboxgl-032e3a66f35aa4fd3954a700d5753cd21e06a59d.tar.gz
fixes #3181: move from vendored lib to framework
- 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.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ios/framework.sh4
-rwxr-xr-xscripts/ios/package.sh3
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/ios/framework.sh b/scripts/ios/framework.sh
index 1d1f755794..e2842a4707 100755
--- a/scripts/ios/framework.sh
+++ b/scripts/ios/framework.sh
@@ -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
@@ -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
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index 41694c2f63..7f0fe447d1 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -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