summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-08-25 14:40:40 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-08-25 14:40:40 -0400
commitf251bcb3044f520258b662054f8011e50f4e7fbe (patch)
tree62d931865469ce446e64ec2bd99b7bb658622028 /scripts
parent3fea9d38782f9c42a606206b1318f1e5508cf62a (diff)
parent4540c3c0e8c80de4f0074c1c4328840ebf708470 (diff)
downloadqtlocation-mapboxgl-f251bcb3044f520258b662054f8011e50f4e7fbe.tar.gz
Merge branch 'before-render' into node
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ios/package.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index 56bd325ebf..2b1e97c304 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -102,7 +102,7 @@ cp -pv LICENSE.md "${OUTPUT}/static"
mkdir -p "${OUTPUT}/static/${NAME}.bundle"
cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle"
mkdir -p "${OUTPUT}/static/${NAME}.bundle/styles"
-cp -pv styles/styles/{dark,emerald,light,mapbox-streets,satellite}-v7.json "${OUTPUT}/static/${NAME}.bundle/styles"
+cp -pv styles/styles/{dark,emerald,light,streets,satellite}-v8.json "${OUTPUT}/static/${NAME}.bundle/styles"
step "Creating API Docs..."
if [ -z `which appledoc` ]; then
@@ -111,7 +111,7 @@ if [ -z `which appledoc` ]; then
fi
DOCS_OUTPUT="${OUTPUT}/static/Docs"
git fetch --tags
-DOCS_VERSION=$( git tag --sort -v:refname | grep -v '\-rc.' | sed -n '1p' | sed 's/^v//' )
+DOCS_VERSION=$( git tag | sed 's/^ios-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' )
rm -rf /tmp/mbgl
mkdir -p /tmp/mbgl/
README=/tmp/mbgl/README.md