summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@users.noreply.github.com>2015-07-22 18:02:09 -0700
committerJustin R. Miller <incanus@users.noreply.github.com>2015-07-22 18:02:09 -0700
commit45180599a28fda71d838efb9e5a46bc58d877196 (patch)
tree3008ef92f9b3356789c419cdd5aea820fb5d2ed0
parent73d6c62f60d09060e46c9a7cd7bba8e9ec85eacc (diff)
parent368369ba60100fc91ce08ed430a3dc2722c91e1f (diff)
downloadqtlocation-mapboxgl-45180599a28fda71d838efb9e5a46bc58d877196.tar.gz
Merge pull request #1910 from mapbox/1ec5-styles-mb-pages
Move mapbox/mapbox-gl-styles to mb-pages branch
-rwxr-xr-xscripts/ios/package.sh3
m---------styles0
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index b6a927dd0f..b499f4a108 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -101,7 +101,8 @@ step "Copying Resources..."
cp -pv LICENSE.md "${OUTPUT}/static"
mkdir -p "${OUTPUT}/static/${NAME}.bundle"
cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle"
-cp -prv styles/styles "${OUTPUT}/static/${NAME}.bundle/styles"
+mkdir -p "${OUTPUT}/static/${NAME}.bundle/styles"
+cp -pv styles/styles/{dark,emerald,light,mapbox-streets,satellite}-v7.json "${OUTPUT}/static/${NAME}.bundle/styles"
step "Creating API Docs..."
if [ -z `which appledoc` ]; then
diff --git a/styles b/styles
-Subproject 6b0f8a9b10ad96c43ec1e0e72ab23a48bcda8c2
+Subproject 44bdcec816407ba16765a556135915652e5e5b2