From 7a4e7376e1422964cb7a456f772104e28003f4d2 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 16 Dec 2015 14:05:23 -0800 Subject: Move platform scripts into platforms --- .travis.yml | 8 +- Makefile | 16 +-- configure | 6 +- docker/clang-tidy/tidy.sh | 2 +- docker/linux/test.sh | 4 +- platform/android/scripts/configure.sh | 15 ++ platform/android/scripts/defaults.mk | 11 ++ platform/android/scripts/install.sh | 13 ++ platform/android/scripts/run.sh | 56 ++++++++ platform/android/scripts/toolchain.sh | 26 ++++ platform/ios/scripts/add-key.sh | 25 ++++ platform/ios/scripts/after_failure.sh | 13 ++ platform/ios/scripts/apple.crt | Bin 0 -> 1063 bytes platform/ios/scripts/benchmark.sh | 16 +++ platform/ios/scripts/configure.sh | 9 ++ platform/ios/scripts/defaults.mk | 12 ++ platform/ios/scripts/framework.sh | 40 ++++++ platform/ios/scripts/install.sh | 26 ++++ platform/ios/scripts/ios-dist.cer.enc | 30 ++++ platform/ios/scripts/ios-dist.p12.enc | 32 +++++ .../ios/scripts/ios-in-house.mobileprovision.enc | 153 +++++++++++++++++++++ platform/ios/scripts/package.sh | 152 ++++++++++++++++++++ platform/ios/scripts/publish.sh | 31 +++++ platform/ios/scripts/remove-key.sh | 4 + platform/ios/scripts/run.sh | 45 ++++++ platform/ios/scripts/setup.sh | 5 + platform/ios/scripts/test.sh | 14 ++ platform/linux/scripts/after_script.sh | 15 ++ platform/linux/scripts/configure.sh | 22 +++ platform/linux/scripts/defaults.mk | 5 + platform/linux/scripts/install.sh | 11 ++ platform/linux/scripts/run.sh | 28 ++++ platform/linux/scripts/setup.sh | 28 ++++ platform/linux/scripts/tidy.sh | 17 +++ platform/node/scripts/after_script.sh | 51 +++++++ platform/node/scripts/create_node_scheme.sh | 8 ++ platform/node/scripts/install.sh | 28 ++++ platform/node/scripts/node.xcscheme | 98 +++++++++++++ platform/node/scripts/run.sh | 31 +++++ platform/osx/scripts/configure.sh | 17 +++ platform/osx/scripts/defaults.mk | 5 + platform/osx/scripts/install.sh | 10 ++ platform/osx/scripts/package.sh | 57 ++++++++ platform/osx/scripts/run.sh | 21 +++ platform/osx/scripts/setup.sh | 8 ++ scripts/android/configure.sh | 15 -- scripts/android/defaults.mk | 11 -- scripts/android/install.sh | 13 -- scripts/android/run.sh | 56 -------- scripts/android/toolchain.sh | 26 ---- scripts/ios/add-key.sh | 25 ---- scripts/ios/after_failure.sh | 13 -- scripts/ios/apple.crt | Bin 1063 -> 0 bytes scripts/ios/benchmark.sh | 16 --- scripts/ios/configure.sh | 9 -- scripts/ios/defaults.mk | 12 -- scripts/ios/framework.sh | 40 ------ scripts/ios/install.sh | 26 ---- scripts/ios/ios-dist.cer.enc | 30 ---- scripts/ios/ios-dist.p12.enc | 32 ----- scripts/ios/ios-in-house.mobileprovision.enc | 153 --------------------- scripts/ios/package.sh | 152 -------------------- scripts/ios/publish.sh | 31 ----- scripts/ios/remove-key.sh | 4 - scripts/ios/run.sh | 45 ------ scripts/ios/setup.sh | 5 - scripts/ios/test.sh | 14 -- scripts/linux/after_script.sh | 15 -- scripts/linux/configure.sh | 22 --- scripts/linux/defaults.mk | 5 - scripts/linux/install.sh | 11 -- scripts/linux/run.sh | 28 ---- scripts/linux/setup.sh | 28 ---- scripts/linux/tidy.sh | 17 --- scripts/main.mk | 14 +- scripts/node/after_script.sh | 51 ------- scripts/node/create_node_scheme.sh | 8 -- scripts/node/install.sh | 28 ---- scripts/node/node.xcscheme | 98 ------------- scripts/node/run.sh | 31 ----- scripts/osx/configure.sh | 17 --- scripts/osx/defaults.mk | 5 - scripts/osx/install.sh | 10 -- scripts/osx/package.sh | 57 -------- scripts/osx/run.sh | 21 --- scripts/osx/setup.sh | 8 -- 86 files changed, 1213 insertions(+), 1213 deletions(-) create mode 100644 platform/android/scripts/configure.sh create mode 100644 platform/android/scripts/defaults.mk create mode 100755 platform/android/scripts/install.sh create mode 100755 platform/android/scripts/run.sh create mode 100755 platform/android/scripts/toolchain.sh create mode 100755 platform/ios/scripts/add-key.sh create mode 100755 platform/ios/scripts/after_failure.sh create mode 100644 platform/ios/scripts/apple.crt create mode 100755 platform/ios/scripts/benchmark.sh create mode 100644 platform/ios/scripts/configure.sh create mode 100644 platform/ios/scripts/defaults.mk create mode 100755 platform/ios/scripts/framework.sh create mode 100755 platform/ios/scripts/install.sh create mode 100644 platform/ios/scripts/ios-dist.cer.enc create mode 100644 platform/ios/scripts/ios-dist.p12.enc create mode 100644 platform/ios/scripts/ios-in-house.mobileprovision.enc create mode 100755 platform/ios/scripts/package.sh create mode 100755 platform/ios/scripts/publish.sh create mode 100755 platform/ios/scripts/remove-key.sh create mode 100755 platform/ios/scripts/run.sh create mode 100644 platform/ios/scripts/setup.sh create mode 100755 platform/ios/scripts/test.sh create mode 100755 platform/linux/scripts/after_script.sh create mode 100644 platform/linux/scripts/configure.sh create mode 100644 platform/linux/scripts/defaults.mk create mode 100755 platform/linux/scripts/install.sh create mode 100755 platform/linux/scripts/run.sh create mode 100755 platform/linux/scripts/setup.sh create mode 100755 platform/linux/scripts/tidy.sh create mode 100755 platform/node/scripts/after_script.sh create mode 100755 platform/node/scripts/create_node_scheme.sh create mode 100755 platform/node/scripts/install.sh create mode 100644 platform/node/scripts/node.xcscheme create mode 100755 platform/node/scripts/run.sh create mode 100644 platform/osx/scripts/configure.sh create mode 100644 platform/osx/scripts/defaults.mk create mode 100755 platform/osx/scripts/install.sh create mode 100755 platform/osx/scripts/package.sh create mode 100755 platform/osx/scripts/run.sh create mode 100755 platform/osx/scripts/setup.sh delete mode 100644 scripts/android/configure.sh delete mode 100644 scripts/android/defaults.mk delete mode 100755 scripts/android/install.sh delete mode 100755 scripts/android/run.sh delete mode 100755 scripts/android/toolchain.sh delete mode 100755 scripts/ios/add-key.sh delete mode 100755 scripts/ios/after_failure.sh delete mode 100644 scripts/ios/apple.crt delete mode 100755 scripts/ios/benchmark.sh delete mode 100644 scripts/ios/configure.sh delete mode 100644 scripts/ios/defaults.mk delete mode 100755 scripts/ios/framework.sh delete mode 100755 scripts/ios/install.sh delete mode 100644 scripts/ios/ios-dist.cer.enc delete mode 100644 scripts/ios/ios-dist.p12.enc delete mode 100644 scripts/ios/ios-in-house.mobileprovision.enc delete mode 100755 scripts/ios/package.sh delete mode 100755 scripts/ios/publish.sh delete mode 100755 scripts/ios/remove-key.sh delete mode 100755 scripts/ios/run.sh delete mode 100644 scripts/ios/setup.sh delete mode 100755 scripts/ios/test.sh delete mode 100755 scripts/linux/after_script.sh delete mode 100644 scripts/linux/configure.sh delete mode 100644 scripts/linux/defaults.mk delete mode 100755 scripts/linux/install.sh delete mode 100755 scripts/linux/run.sh delete mode 100755 scripts/linux/setup.sh delete mode 100755 scripts/linux/tidy.sh delete mode 100755 scripts/node/after_script.sh delete mode 100755 scripts/node/create_node_scheme.sh delete mode 100755 scripts/node/install.sh delete mode 100644 scripts/node/node.xcscheme delete mode 100755 scripts/node/run.sh delete mode 100644 scripts/osx/configure.sh delete mode 100644 scripts/osx/defaults.mk delete mode 100755 scripts/osx/install.sh delete mode 100755 scripts/osx/package.sh delete mode 100755 scripts/osx/run.sh delete mode 100755 scripts/osx/setup.sh diff --git a/.travis.yml b/.travis.yml index da5bae89b1..95ff5d0897 100644 --- a/.travis.yml +++ b/.travis.yml @@ -117,20 +117,20 @@ before_install: - source ./scripts/travis_helper.sh install: -- ./scripts/${FLAVOR}/install.sh +- ./platform/${FLAVOR}/scripts/install.sh before_script: - if command -v ccache >/dev/null 2>&1; then ccache --zero-stats ; fi script: -- ./scripts/${FLAVOR}/${ACTION:-run}.sh +- ./platform/${FLAVOR}/scripts/${ACTION:-run}.sh after_failure: -- "[ -f ./scripts/${FLAVOR}/after_failure.sh ] && ./scripts/${FLAVOR}/after_failure.sh" +- "[ -f ./platform/${FLAVOR}/scripts/after_failure.sh ] && ./platform/${FLAVOR}/scripts/after_failure.sh" after_script: - if command -v ccache >/dev/null 2>&1; then ccache --show-stats ; fi -- "[ -f ./scripts/${FLAVOR}/after_script.sh ] && ./scripts/${FLAVOR}/after_script.sh" +- "[ -f ./platform/${FLAVOR}/scripts/after_script.sh ] && ./platform/${FLAVOR}/scripts/after_script.sh" notifications: slack: diff --git a/Makefile b/Makefile index 364aaad939..b917e9e81f 100644 --- a/Makefile +++ b/Makefile @@ -50,16 +50,16 @@ ibench: export XCODEBUILD_ARGS += -sdk iphoneos ARCHS="arm64" ibench: ; $(RUN) HOST=ios Xcode/ios-bench .PHONY: ipackage ipackage-strip ipackage-sim ipackage-no-bitcode itest -ipackage: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh -ipackage-strip: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh strip -ipackage-sim: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh sim -ipackage-no-bitcode: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh no-bitcode -iframework: ipackage-strip ; ./scripts/ios/framework.sh -itest: ipackage-sim ; ./scripts/ios/test.sh +ipackage: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh +ipackage-strip: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh strip +ipackage-sim: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh sim +ipackage-no-bitcode: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh no-bitcode +iframework: ipackage-strip ; ./platform/ios/scripts/framework.sh +itest: ipackage-sim ; ./platform/ios/scripts/test.sh .PHONY: xpackage xpackage-strip -xpackage: Xcode/osx ; @JOBS=$(JOBS) ./scripts/osx/package.sh -xpackage-strip: Xcode/osx ; @JOBS=$(JOBS) ./scripts/osx/package.sh strip +xpackage: Xcode/osx ; @JOBS=$(JOBS) ./platform/osx/scripts/package.sh +xpackage-strip: Xcode/osx ; @JOBS=$(JOBS) ./platform/osx/scripts/package.sh strip endif #### All platforms targets ##################################################### diff --git a/configure b/configure index 8c74b1db8e..d8ccc0b19e 100755 --- a/configure +++ b/configure @@ -54,9 +54,9 @@ function print_opengl_flags { } # Load dependencies -source scripts/${MASON_PLATFORM}/configure.sh -if [ -e scripts/${MASON_PLATFORM}/${MASON_PLATFORM_VERSION}/configure.sh ]; then - source scripts/${MASON_PLATFORM}/${MASON_PLATFORM_VERSION}/configure.sh +source platform/${MASON_PLATFORM}/scripts/configure.sh +if [ -e platform/${MASON_PLATFORM}/scripts/${MASON_PLATFORM_VERSION}/configure.sh ]; then + source platform/${MASON_PLATFORM}/scripts/${MASON_PLATFORM_VERSION}/configure.sh fi PYTHON=`which python || abort 'Cannot find python'` diff --git a/docker/clang-tidy/tidy.sh b/docker/clang-tidy/tidy.sh index 9c939d219b..222bd263f8 100755 --- a/docker/clang-tidy/tidy.sh +++ b/docker/clang-tidy/tidy.sh @@ -13,7 +13,7 @@ cd build source ./scripts/travis_helper.sh # install -./scripts/${FLAVOR}/install.sh +./platform/${FLAVOR}/scripts/install.sh export CLANG_TIDY=clang-tidy-3.8 make tidy diff --git a/docker/linux/test.sh b/docker/linux/test.sh index 63057d9422..f9d0b5daec 100755 --- a/docker/linux/test.sh +++ b/docker/linux/test.sh @@ -20,7 +20,7 @@ cd build source ./scripts/travis_helper.sh # install -./scripts/${FLAVOR}/install.sh +./platform/${FLAVOR}/scripts/install.sh # script -./scripts/${FLAVOR}/run.sh +./platform/${FLAVOR}/scripts/run.sh diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh new file mode 100644 index 0000000000..2e3e7b9d7c --- /dev/null +++ b/platform/android/scripts/configure.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +BOOST_VERSION=1.59.0 +LIBPNG_VERSION=1.6.18 +JPEG_VERSION=v9a +SQLITE_VERSION=3.9.1 +LIBUV_VERSION=1.7.5 +ZLIB_VERSION=system +NUNICODE_VERSION=1.6 +LIBZIP_VERSION=0.11.2 +GEOJSONVT_VERSION=3.1.0 +VARIANT_VERSION=1.0 +RAPIDJSON_VERSION=1.0.2 + +export MASON_ANDROID_ABI=${MASON_PLATFORM_VERSION} diff --git a/platform/android/scripts/defaults.mk b/platform/android/scripts/defaults.mk new file mode 100644 index 0000000000..d5e87c6796 --- /dev/null +++ b/platform/android/scripts/defaults.mk @@ -0,0 +1,11 @@ +HEADLESS ?= none +PLATFORM ?= android +ASSET ?= zip +HTTP ?= android +CACHE ?= sqlite + +GYP_FLAVOR_SUFFIX=-android + +HOST_VERSION ?= arm-v7 + +ENV = $(shell MASON_ANDROID_ABI=$(HOST_VERSION) ./platform/android/scripts/toolchain.sh) diff --git a/platform/android/scripts/install.sh b/platform/android/scripts/install.sh new file mode 100755 index 0000000000..e99c3dc75e --- /dev/null +++ b/platform/android/scripts/install.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +mapbox_time "checkout_mason" \ +git submodule update --init .mason + +export MASON_PLATFORM=android +export MASON_ANDROID_ABI=${ANDROID_ABI} + +mapbox_time "android_toolchain" \ +./platform/android/scripts/toolchain.sh diff --git a/platform/android/scripts/run.sh b/platform/android/scripts/run.sh new file mode 100755 index 0000000000..9e87298fe9 --- /dev/null +++ b/platform/android/scripts/run.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +# Add Mason to PATH +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" +export MASON_PLATFORM=android +export MASON_ANDROID_ABI=${ANDROID_ABI} + +################################################################################ +# Build +################################################################################ + +mkdir -p ./platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw +echo "${MAPBOX_ACCESS_TOKEN}" > ./platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt + +mapbox_time "compile_library" \ +make android-lib HOST_VERSION=${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE} + +mapbox_time "build_apk" \ +make android HOST_VERSION=${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE} + +################################################################################ +# Deploy +################################################################################ + +if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then + # Install and add awscli to PATH for uploading the results + mapbox_time "install_awscli" \ + pip install --user awscli + export PATH="`python -m site --user-base`/bin:${PATH}" + + mapbox_time_start "deploy_results" + echo "Deploying results..." + + S3_PREFIX=s3://mapbox/mapbox-gl-native/android/build/${TRAVIS_JOB_NUMBER} + APK_OUTPUTS=./platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk + JNILIB=`mason env JNIDIR` + + # ARM64 does not build APK for now + if [ ${JNIDIR} != "arm64-v8a" ] ; then + # Upload either the debug or the release build + if [ ${BUILDTYPE} == "Debug" ] ; then + aws s3 cp \ + ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-${JNILIB}-debug.apk \ + ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-debug.apk + elif [ ${BUILDTYPE} == "Release" ] ; then + aws s3 cp \ + ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-${JNILIB}-release-unsigned.apk \ + ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-release-unsigned.apk + fi + fi + + mapbox_time_finish +fi diff --git a/platform/android/scripts/toolchain.sh b/platform/android/scripts/toolchain.sh new file mode 100755 index 0000000000..67cd0aa476 --- /dev/null +++ b/platform/android/scripts/toolchain.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +export MASON_PLATFORM=android +export MASON_ANDROID_ABI=${MASON_ANDROID_ABI:-arm-v7} +export PATH="`pwd`/.mason:${PATH}" +export MASON_DIR="`pwd`/.mason" + +export PATH=`mason env PATH` + +echo MASON_PLATFORM=\"${MASON_PLATFORM}\" +echo MASON_ANDROID_ABI=\"${MASON_ANDROID_ABI}\" +echo CXX=\"`which $(mason env CXX)`\" +echo CC=\"`which $(mason env CC)`\" +echo LD=\"`which $(mason env LD)`\" +echo LINK=\"`which $(mason env CXX)`\" +echo AR=\"`which $(mason env AR)`\" +echo RANLIB=\"`which $(mason env RANLIB)`\" +echo STRIP=\"`which $(mason env STRIP)`\" +echo LDFLAGS=\"`mason env LDFLAGS` \${LDFLAGS:-}\" +echo CFLAGS=\"`mason env CFLAGS` \${CFLAGS:-}\" +echo CXXFLAGS=\"`mason env CXXFLAGS` \${CXXFLAGS:-}\" +echo CPPFLAGS=\"`mason env CPPFLAGS` \${CPPFLAGS:-}\" +echo JNIDIR=\"`mason env JNIDIR`\" diff --git a/platform/ios/scripts/add-key.sh b/platform/ios/scripts/add-key.sh new file mode 100755 index 0000000000..37a989025e --- /dev/null +++ b/platform/ios/scripts/add-key.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +# This is all taken from http://www.objc.io/issue-6/travis-ci.html + +# Create a custom keychain +security create-keychain -p travis ios-build.keychain + +# Make the custom keychain default, so xcodebuild will use it for signing +security default-keychain -s ios-build.keychain + +# Unlock the keychain +security unlock-keychain -p travis ios-build.keychain + +# Set keychain timeout to 1 hour for long builds +# see http://www.egeek.me/2013/02/23/jenkins-and-xcode-user-interaction-is-not-allowed/ +security set-keychain-settings -t 3600 -l ~/Library/Keychains/ios-build.keychain + +# Add certificates to keychain and allow codesign to access them +security import ./platform/ios/scripts/apple.crt -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign +security import ./platform/ios/scripts/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign +security import ./platform/ios/scripts/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign + +# Put the provisioning profile in place +mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles +cp "./platform/ios/scripts/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/ diff --git a/platform/ios/scripts/after_failure.sh b/platform/ios/scripts/after_failure.sh new file mode 100755 index 0000000000..88a6427f75 --- /dev/null +++ b/platform/ios/scripts/after_failure.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +ls $KIF_SCREENSHOTS/ + +REPO_NAME=$(basename $TRAVIS_REPO_SLUG) + +aws s3 cp $KIF_SCREENSHOTS/ s3://mapbox/$REPO_NAME/ios/tests/$TRAVIS_JOB_NUMBER/ --acl public-read --recursive > /dev/null + +echo http://mapbox.s3.amazonaws.com/$REPO_NAME/ios/tests/$TRAVIS_JOB_NUMBER/index.html diff --git a/platform/ios/scripts/apple.crt b/platform/ios/scripts/apple.crt new file mode 100644 index 0000000000..0de099b869 Binary files /dev/null and b/platform/ios/scripts/apple.crt differ diff --git a/platform/ios/scripts/benchmark.sh b/platform/ios/scripts/benchmark.sh new file mode 100755 index 0000000000..1c342e6533 --- /dev/null +++ b/platform/ios/scripts/benchmark.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +if [ -z "$(which ios-deploy)" ] ; then + npm install -g ios-deploy +fi + +(cd ios/benchmark/assets/tiles && ./download.sh) +(cd ios/benchmark/assets/glyphs && ./download.sh) + +make ibench + +ios-deploy --debug --noninteractive --bundle "gyp/build/Release-iphoneos/Bench GL.app" diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh new file mode 100644 index 0000000000..ee6d60de2f --- /dev/null +++ b/platform/ios/scripts/configure.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +BOOST_VERSION=1.59.0 +SQLITE_VERSION=system +LIBUV_VERSION=1.7.5 +ZLIB_VERSION=system +GEOJSONVT_VERSION=3.1.0 +VARIANT_VERSION=1.0 +RAPIDJSON_VERSION=1.0.2 diff --git a/platform/ios/scripts/defaults.mk b/platform/ios/scripts/defaults.mk new file mode 100644 index 0000000000..fafc332133 --- /dev/null +++ b/platform/ios/scripts/defaults.mk @@ -0,0 +1,12 @@ +HEADLESS = none +PLATFORM ?= ios +ASSET ?= fs +HTTP ?= nsurl +CACHE ?= sqlite + +HOST_VERSION = all + +PROVISIONING_PROFILE ?= 19324a54-7455-4f0b-8e1c-e6957c718ebc + +export MASON_PLATFORM=$(HOST) +export MASON_PLATFORM_VERSION=$(HOST_VERSION) diff --git a/platform/ios/scripts/framework.sh b/platform/ios/scripts/framework.sh new file mode 100755 index 0000000000..e2842a4707 --- /dev/null +++ b/platform/ios/scripts/framework.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +cd build/ios/pkg +rm -rf framework +mkdir framework +cd framework + +mkdir Mapbox.framework + +# headers +cp -rv ../static/Headers Mapbox.framework/Headers +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 + +# binary +cp -v ../static/libMapbox.a Mapbox.framework/Mapbox +strip -Sx Mapbox.framework/Mapbox + +# module map +mkdir Mapbox.framework/Modules +cp -v ../../../../ios/framework/modulemap Mapbox.framework/Modules/module.modulemap + +# 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/platform/ios/scripts/install.sh b/platform/ios/scripts/install.sh new file mode 100755 index 0000000000..b002aeeca8 --- /dev/null +++ b/platform/ios/scripts/install.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +git fetch --tags + +mapbox_time "checkout_mason" \ +git submodule update --init .mason + +mapbox_time "install_xcpretty" \ +gem install xcpretty --no-rdoc --no-ri --no-document --quiet + +mapbox_time "install_recent_git" \ +brew install git + +mapbox_time "install_awscli" \ +brew install awscli + +mapbox_time "install_appledoc" \ +wget https://github.com/tomaz/appledoc/releases/download/v2.2-963/appledoc.zip && \ +tar xvzf appledoc.zip && \ +cp appledoc /usr/local/bin && \ +cp -Rf Templates/ ~/.appledoc + +mkdir -p ${KIF_SCREENSHOTS} diff --git a/platform/ios/scripts/ios-dist.cer.enc b/platform/ios/scripts/ios-dist.cer.enc new file mode 100644 index 0000000000..dfdd0ca997 --- /dev/null +++ b/platform/ios/scripts/ios-dist.cer.enc @@ -0,0 +1,30 @@ +U2FsdGVkX1/Dn0fx6y0q6CHTK5UmCnel5Nw0kQlpeCqrqpWvXnYS//Ep0updcMIQ +xj1hu+baBWjw7ccysFG/zcReSh/xgP6JrW7QKiA/kIQvqOvH0vhtzvDsnAQCB52T +VWVy492mIwFRCBANVTPbdmBbVIeHAkeQcrVkFJJIKOv4dC+CFAw9ArHm8iYrg7FV +FDK3cmrfR/pgvlQ1lQDa1C0vV1k/R5KuhqwDM3xMML1WbuBlR0RRHccs4xJRmRV7 +NuAuWg2Ob+p5gOW4L3+7PnBTBgxUZl2nbukd3oUlAPBOxgwwbgQSJPDvnsw2zmgp +uv2X0Q0/fT9R8VxuoSXYkLkgIlOnVVRpyG4C4ou7HPS8VDiLP5iRWKx2PoTvaBLz +9lNPTXhXu45n2k9L9SbkYk0024u6I8x9EkAmu0wU/rQpdudw4uLO7Pxz7BZHq3/D +frwBMvtQXRogeQcsi3dKmsISrxdSEO1hax6toVnqujPSXKmFOMHXyhqJg/K9DDhs +8GAUUO0cVfAaviofVFBZAXwkOd0SaYWz3WY4qHOZHnFiuGN0MCd2lXe5kVKFXRdE +6ElXMm2+M0YLH+L55MA79hIDjqjv9JXTAAKpLy5wsOkMYEaaXvevdAEhkSW9QzIh +HGUqBED5jqdrNlm7qOPSMWDcB/9FlnizKFsqrZOjquWFQZ4L34t++8FPT0ipxKCI +XkYxBqVesZlHBOLPBYQ2bdJUuYaACkyMtB5eRebEieoWRXTB0aD4otvh6F6MYpiY +4q66GO3faCnPxcZY4OxxwSSuyotBP8qKJcACqf3/Ji0nt42IHOIWJmiwROjBzMQ2 +DgYLtjsi1/b8eXLO5g+6S8o404j8g+2Z2rYXG+Hw6TaxY5bXrAH51fbUNDJP6qFR +X3K3q8YvJlXcKIU6aZi5CDqaJUz6e22FvsOeWVHjdQYB23kk+LWYQY58hvkFUDXd +/Nn2FxGPn80280sF4s8EX77YEXLGLqIo293Yg9F9JBwrq76ObY6DJbRlB4EG0Hx+ +vo0WJhEWHahu2uCfwqMJPDhMTGYcYRdHcNSepJlbj+gFTmH8bdKZGI/g13ZsDYEK +HKP72rtaGQT4JYkS06TC6/Vvi+0+PxXr9SKbODCskN2yJpp0S2wXy8H6IwlpPe1R +v82oCJQAXrcD8wd65TR2Q7fg4akHzI9VX1q8UGjzNt/Y/EsPEVv48PM/zngk/Hat +Ptq6SoOFAj/JqbXOMuW0fidBI7uhq5575lgxaQ+VL4nKdDrdoHZXWJgjG/ZQO1j4 +8o12Z+Fk8tNpMPofJaAf3ebuArAE/IUDK7KKB7UoSwT1XPOFI9gCVtG654i7CAtN +LfkDruwjTcD2XyaVLcVTeDUr2wMMrugE+OS4B/d0nD7jU4hVHTVn5fJxRiAFx+ql +cBG/TIf951aDZ1x7eIj4xhehletdeWTZ2wGT8RJcFPD3LIB1hddeDIFQrkfEP7Gp +IY+VdYo3tZtYcj9x0dXey/n9y0kxZw2w8oAY5iJB7NydeSANL4btPWO8y4KxXta9 +P+HNq01JS78ufYxfIOnOxD8l7YtD6Z6Evr1elzGFJOzRl4nCbPUg+VXekR94Lmf8 +0MBLgyG6xSoRBHvIYK6SRHEc+NuWvyfZGSOKBQVTwvf4/y4+xGcbPZy/YnUX6u+/ +zRWaYPJBdRhTrwAqawz9ZLL65uFYM7jhpZPEYGhOVqFoarNsy0m0gF5HNy8r/s71 +N1DBKUyVzdhR+4JZEHkkAr8JnN108d1uDIkaiI1F+hLCK2m5wnMYlZBMj2pP4kSC +1E7JiIr/EKDiIHE7rOzf3yTYwug0xusBDdNTappMzTRsTCEyJf330k3kS7y0+zoH +lwtG/9HS6qcwPY2h5buxTb6v9xQqmyWNT28Q8qEb3h8b2XS/NUyB9SQvRpkn9oUR diff --git a/platform/ios/scripts/ios-dist.p12.enc b/platform/ios/scripts/ios-dist.p12.enc new file mode 100644 index 0000000000..ad6507ef9f --- /dev/null +++ b/platform/ios/scripts/ios-dist.p12.enc @@ -0,0 +1,32 @@ +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 diff --git a/platform/ios/scripts/ios-in-house.mobileprovision.enc b/platform/ios/scripts/ios-in-house.mobileprovision.enc new file mode 100644 index 0000000000..51036a7415 --- /dev/null +++ b/platform/ios/scripts/ios-in-house.mobileprovision.enc @@ -0,0 +1,153 @@ +U2FsdGVkX1/xCimmqpQF5NssG6mKnQJtCs71V6elWQzSeSQ+eXtItM/qqvAOtA2h +vaZxXqcyiBUMn5diQZ4ZOG2u4qHoGTkiYYsKI7XURQqOhUC0MFtdGxvRFpW4Q8bR +p593tVorRX3R2PtPw0h2vDluIRb8y/BaoxRWIa12TwA7yipYrP5RcmaLg8k6slGS +PEq7VddJpdAS+W5qawUoDYH9z5ffXhej2d0IFwXCJzFkBf3CdUeKBr8yInMULywG +O0DkvitnnpFu7asADuTDlBgpTqF8JImXIR7OXHDWMDTMGMMN1HQSOzP026ZDFhha +V71pTACLWscMnaoLd8UeZaSFb4j+szT9bV4EOPT5n3bHOu9V6BMCOL6Y5S3CsFRG +4cRIEiY/yS41zCUvumu3WWXJDr6QMOKlmk5WVKA6lKZ5FfEKWbyMAXGqn8c9zbT9 +BxvM151gOL3eqsiC16rIvB8uNOvTVKsFsuVdzZgYQSDs8PC1uS6A5k/KwbqAn6jj +ATkiHCDbGtZoyAV+8bjOei36iyQMjoV2St6eHpDz9F0c9PkCDjjA4A77V7AayHQ8 +s37qY0M8Fer/+zqPCFoUOK0TRdV8oV78ZtzpsGaUOtiVzhxyDkFt2cwaf0VSfZG7 +/+1VR65TQgJ1JYIIY+/4wROBEPOJBVCBJyDsUHWuB9MQQzyC7sg/UD2hliZ/4Irl +2Lo1l13p5JF5ib06zVffi7rsKbI432Lffqa5/zVW1NyjqqAPAo2TOA90u6eLjrVf +Nn7qtZkn/kPCsIE2e4cFEYU5h1OO7af2/f1H+ukzaRJRPHtCMf/W576J7PWnna/N +r3BxgJIoS1/1DPMtQPpHLHo/KnWwmC03yWFqJAXNVawQuw9SG7txCjVvPOtu2AuS +TLZ73hCAcu+JBJVD1l2B7Vt5y3qxdD1ei3WrxC7YlCbn2oyGstSuPs9MvePdpxe3 +vvaHvyAJsmjXD6MuG1diEM1BZ46L3vnDt3BAdGkwcnhS0rggAaVAd6inyLBbjrZi +DuSgiR8ABpuCqGeHB4Y3oVJYzZSuM81X4PXcn/A8Iz5PN1SEq0g/rCrgICjyRaJA +bdsop2/aZzMO2vIOUrr5py+51bRO0hT3P8xbuGUjhY2b3rdtFsXasDM/TywVg5Cr +VGO7lULyj4UZU3weKSBtmMnEqlnducroxckYdVZGD1XegE2pKhydjpJp1I1gyXwh +SX6qPQY4/ABcE9/OA3jLjZctcdbRpDpbzRTlIoUB0eHe6E9of2B0Wq4PxpFTCy25 +PT2yY074SN9QsPlUiE57F/KYKCfwxMicEbZMcrpTs3aX7PqcLZP9YToG/dNI2fc0 +xWmWN5ZcO8fPLG5MMDFCm39lxvk4jIynytcBhJAAvbNX7+HMVRWyWjvf7H0ldZrV +3OQPXXmxu0Sg1RgQSUSZu1zQeSk5Uf879ay3PQY5CCQz9H0nm/Sxf+zN2esqDUEP +0ZpuTb62qsAIIsf/zAeVNu1UtXTlOdWbz4EjofFl2Gr55pMF4BkjO4XxRnVZAl2B +u89H8mv6cM//oA+lt+JbYRv3coPqjv5LZq1iAmm9zvVnbbQEin5h1DwwG1X+iGhz +BuWoUrLI1KuGSLqiaP7yH79N4z3n+HHVx0gdsvc8pJDpFEyFqRWuF1RSmQcI2Dx8 +bkr/vjXn+OO0O9OicZTnAj48+LpfUTTu/uKL9QVQfRYiRWB55nPhvBTcWNMzoPxD +qhFI5Im5TLUNDkilXmCxOoOJ3yeX2IMZdO20FlZIBZEvF3/ECTa7TMLYE6tXtvKb +QW9O99s0G1S/8g6FcIq0h4QO9cwZHKHxCsKHixK4s0yiZyTznUyPQJB+gh/EWlMc +xC/8kT9RBiSmU9Ym7vNlyVX1Xxt2mutIb1SAgnxYKik/06b7HktDX0eibNYwtT1e +/RJxwk4OEocbNftGMEdiFvk56cvrMjEov61QYOPAfIUCnpUTC/DMHCbYuUD8mguO +gpjWk3MD50OKjVK6CrQoxjFNxFuSxNxqHtEQ6w9nrrgi4LaVaFxluBeiaolRrGwW +418ZbZYDf4hq/zcEH8kPDd0kfAW9/FwPwqh6nDhlJJnHHgIN65keLu/Ls7pnVs+N +VVjGIdIVLH0BufECIQVT4E/1kPSwoqiScBkCVPIWS9O238P2/qPRDt2g0o+LclMm +R0GOKkn5Oe+KzyLdqF0gB6ZoJVD5mUTMcykrN027HI02q1ctRXFbOJQLE+aa085W +wAVw/J37Fuw1SGkCmIFZtL++z1grb14CIzS5HsIrCoM67JGEYjZxabTIilCWUt63 +mv6BJR6I985//nFPbPMpjT2K06zLdIdgm2qTYVbU9lXAZ2m1fcHmiHkEBaDYlv3N +dKkmkA8cJPCl6wyYQhzwc7I1B1HCcWtI0Lx0BTYZ9G2ND7/2hFBmJcP2a8V2xQx2 +2p/Gnd2YvphqvPRDfTbUTtpCirUaWD223Pq9w4aV1mDytcoBmnBgl4BID2RpcS/8 +nTsjSObs+Fu1ieskW7AMog3lOrjXntg4HqBUi6biAp+RASyAIaDskb2eWvbUloxg +FEIeG6GK/odD4fWHBmLCUJbgtYaDpqs4s5hkfC+edxj4UUBJNjKnp9awArOyBvXx +M5tlBi9fQ/6Y4nyKdcNFculLyLsxKMJNrOzR6Q+WOw6IKL7A8uue0le+YyDdACbn +4xtqn9R6c28nUCEGz4qkJmARoNxapAu3fMYuhp2CYgyQsW2yUq3lsJg/Vc1Dqu5a +EcrtYf27BpPlLqyS0YM0gyV027YBDNBnJRO0Rmq5ryF4N1vzoC6C8Y3XHea8p11L +vhLy3TXK6nn1pv1PKBceCvvfjz9ZC+GkPohmuXRwY3Kt8QBt2Ua5I1AHpYUseleR +GfiqetHAfM4Wr3qcgc/gjK07cSdrW7qA85laKxpTGJlJ15IAt4SRH8TRzjiU2YLe +ZgdMe1zW5YjCAxG7QvtFcmTUoXY/JIytiycyafM76mu0hKErAmrsV4Nt+7PuO2qB +49hI67sjM62owHVKdyEA7Km6k4dnl1sznQtHCTnqC53YhY1JlMMGJ9q3uue8WUnO +theDFbFc6aTtDShXMvmWmgETBfE8L4sbgLdEpbyBGgE7xGgYeNNw2tBWr7wTEjMe +qqfP3ZGDNQb55QPpbUwUCFoEQUe9GGAw1gkV5E8buklVL3nWbzuVwEUqcYNfYyAh +ZbNXMfdq9Wh15X/gJKiCIyEGkS2zI1MS4ctbcIE87MizhukpHBk8EYTW8Ddma2Ry +zNMxzkTBgzFYNA0YEYkYS9U8ZXqsG5HlIJ06G5sSSbjY4wH8seTeCXgtOQ0ovWL6 +nlwJm9uo+/Xt947Swtwruf7YmtQaje0rUpfGnQB+EBlY8mN4nfMuw9pRYzxXymgk +hWNpstD06IvtQTD1WAL55YThjXTFfR42fgrsOBEHD6C5R/TKVczDynYFbJkBZg2q +4Nq9AI05XiJdoZVScWj1eTfl5e9H/NDf4DgL6LdDjZGADuA6Xyl1X1ufS6bwek52 +CUb7bDFGpZPaWM+wKfk8hYnJqM3pSOMSf99mWvVtXM+kXvQZr1PNQpkp/oMBiOWi +oDVylF75cwtfn5mN+yo/psNcSY8a7qBhaZ48+5Wni1ocOpQIwaG4a42hyK9sOmrv +/plu+Y+CaMYC0pEae4tG9VGb3LYgEfEE8uYLSoLS9h7Y/8QWFHRnlbNAFYUh4VTF +MihsugXr2WJJlmmqxnYUoe2XbRnXho9sQk+Dkrc7krccBqfM5dmreuQp+p2TwB9+ +2940DUvpHiOR6tISNzOjDi9vbxZi6BWpyKP9uvAdWO46U/ZLDv9Od2W3x0rQtgkb +C8XcnO7MTffU7fGYSH90HSVWi1wPdMsGpLKgzkRfR9VX4MfNcwjMBk0IRd3MQFup +7tMXUx6vcKWZLpVK3biWenS3TTcTtXznVt8LTdu6LbTriHrsWx/kucDPPxYjUJP3 +O56cgwVHY+AsSoilRP/oRS3Vz+fiqppU6bAxrgkt+5InU6AHg0KcJTwNXcqZYZ7f +LPuwdI6fPVSxsZqje/sAcwhLhi5+uuCkJXJF/wIUoncG3pmZzoZg4naLj2K/y2f/ +DNGzEX07v3aRHWy6hRWrkmeWg5HtfW7+nDGGTd+UqQbFif+y9xGCJ6i+TCowih5R +/h/12z4GJojCrJjmymroJtbJ5oxOru3MpvwgZen51s4ZZsmPmn4gmKJqIgAvWQrx +2EeVYeKMgMBI6bax4FLx/NqOFBVTp3BGy4Q1PqCwWIJe6Mjd0hAPA1osDd/vdJqP +/cIuAGNiO0BVcLyJ2KOOEiGEpQysA9lUK4X8LikAbSAanhSslS5ReGUOEd7L6mCs +Sr3xnHgjgbg3MmaNyfgRNOhUa0/b/jYMin+32eZDVnuC7o8wG+jWBbHisQILjy2+ +gbYhu3FnEXW6+j0uoxn2FHcNUli6V7sAz9+BjiF3FoE8fgZPCdacIQ7e4N2LroxY +QfUC6409qUd5Vrd61hWEVZMRTIYqS4ubdDv2vTAIkC1HlLCUZ2iC05ibsu18FpLt +6UtFC4oDgedazPYiAtiMrOopzoppCA49h8/1J4Y8jZti7XtJ8pQFC/gBEIbGz01i +6Bzubr56E48+0RPPm4zXkPZdNMzIsGA7/awedoFOAy+/HRfc+i2uuK4oR3Eo7D+w +MvgwbJdqTLnqpjbxyo2hYwYT+34aJK0yR+JaDYTFf2uFbwvoqPXDdo1lkmhgyRuz +bPHTE9soMROkR3HzHjtuRt2hUmnxXCOH1xXJN/eRzj3ieXfEwoxf8pvqssbf+e28 +7WMlDdP6WWq/lJsHhT6A0lsY6CE3WSaUs6qugMzQVBddCK8mYRHYbU5DWRMID/L0 +bqiePCe01uz9rbLHvEYJf4KP7C2CvHFL56G9nTU6jC8AlZXWltha/pAxgspPRB3t +UvdHVkCN5ErrQEOjE732NHTZbQgy1fWi0dOvO6isSmN9zJb+M8VBkTdf0qvmcdSY +P1iNV6eyVltk7maYWCRlVZj5jTgSc44mows4TyqXe8UCwu61dbIVFw8yBumLyJtu +bpJhujPe+Sut3pZ3uSUm2bDtxM8/2iaglT9aJmn+g46dPdkItp+87qLlscZiDLVJ +0p/9AhMJuXG01C7luAFhCHUQaZnZ0b51l3SyYKH6g44dcyAv5LQyVVJ+gLFKzpsp +VyUmhBFigk3Jbjv0XMF+vZ+zU0+/4T9eg1RnPMRdM7iUnzswtBdrILMBYkbkgnsF +hXGTpK4JGk6+kIzoVQFCP4KnOMzHAoY7kpx1oOW1/ss/OnqBrRd35msLIuxb033r +tPTRS3iLo3eUIG3j54WtcQyaMlVi2DuSaXrVeDeGlFkNaJq1Ztukc4mEdklrvsLS +BASmILUytZfJa36VtfYI3WEX8wpxzamWuDIUIjAbbFi76dDkZo2m34IBl4HsS1ze +3RWxVE7BoBRjXo3eSUYIKvXvC8ixz1YJKPqFTZdArrrfJhrZGO10Gda7ez23YHm3 +Q72SIQhZOT9qN21Pz7q4LQV5clbY2l3wDARNfk03LCdOSqKAlT5C/A5q7Lhx2kVW +qT7ISL+CLwAhBAus60231xNoj8uz7OqQbGOmoWd5x+ultyqRtFwX+zpvWp/ppY4+ +9MLvW42tzIpxzjFcFmoN9Db+Bk2vs1iWsNrdMqU4c1bz6qUocP4GBnxWTgHgGcbG +6eZYGKOPUFCs/PR/hkPeqk5qgdkDsnUuIH6OoVftyJD3s0e8AZ7ZzCb9/XwpfFlR +xXLH8XXjp6suIbx2nY4hvY+5HkajlMKe9i1tF/nkSfP459UGGEyvDNbOpBzcr8WV +hrDOYumR/JEiWpEdvC2yZrmk8gbO23/TzcFnP1DTY8F71UgXqZJhoHIwlxGMrvjv +l9OaBz8Xr4q3p8pmfevyqx404B+tmPsk9+t74pQM9XcKNLl48EMzcAWlCI9C6jLl +0+uZjKMbad9abVeK0+YscPUkZXiyXVsWJkx5rAvzTNIBjZ/9B3kFxsm/FvuDnGYt +5wj1VeL4TQuFep+T3aS7Mjoew0y7DO0ODf7e2BrSOPx3OdvM6wSxlgqP7ZKO74Lc +0EuwiMhD0rVPY9QJmXL3RDd6+xA1FhGZ798rhNQn6Y00awpXvOw4OwDkTCI78fyO +/eGYga8z8VXvdpnolsbJNmSNcEeEpCSh/ho+qD2JFaQ39z8aPogdeqPw7UueuELt +4FDMR3MFglJ0MLW+9Um7L7qZMxu3sGUBkLcOiY4hfZH76oJSSGUZGER9JRt5iBtV +zjlH88XFyavKoTzEh6qdPdNy9dXBsveIsgQ0SalVWHCCa6Eri0dBshNxM7Baj/Hp +RdOyxhMssmr2sWyIUBcux/vN705GttAbIDA8pWVB0SgDlaXYI/xtw5S+tL6YV4zj +NQAnauZtuyf33qabwfeQHZCxjdyMmt+8tv+AgW0ayh/69OhaaDxBzhAeWfY80pbH +G0Sf2cAR5jRR5Y4iBic2PMSgNW3LFsic9CQRGSdfZpqYCn9AdLwap/c/fyBLusGL +fobmSey3+MhnPbGAwqBfT0Tpo3gDsbO8StB8p9OQEaCYnTZJ9xAVkpWqEtr9VUBA +yIUPjsz0PvDOHdyzTse+b3mnkatlIFwSl4ynXirBlXE8/3bcyH61VW+mxpFGxdn8 +kOwnMZh0z0KrHdv3TWrG6PSoyjrBuTvj51F3Xy+XH3KTBns8d4CqtNhqIKxjPOFV +OIKEvVAO76SvdIKOpinAuPBH05EiShtMf8/SvQu6Bbv6f5yMSzQkTFCj3Jm4GOpw +3T0+m+kwJdquZwNSPKLlTbDWjLXxCnlVxLA7PWSZgy5tu9b7k1rfULJgm1k++/n4 +l0I9DL3HZ63ZnEXD1DAHxNolsMJqcAtFVLH93KJhODPh/HmGoD9c1QYVlRVJI84x +AgsVyff3OlJ3ccQdLr669FNK46t8EmPJaBG2pzoAS17AJjb6deSC274xDAQ9cf/m +eWKbVQvHSIJ48O9nIwuPzeqVOYmAaeOXaU1w18lJEopR1JNkOdibptUzGUgrzdl6 +rbJ7cqeqNNEJ6x/l+M8VHnJL4SFH9jvQ/B7+uRIaF27BbFwho60ayyyCzaH5AZaR +m1XF1YLkTaxXnERX7zny34OdI5xNsZ7M90WVbtCWxEuA4qhr3Zgi4y45ZnxzBdNr +cRiF3gsI2tN0dHFViTAUmikVlE1drpZm+C1IGHPq4S+vXOLHj6XODggsKxJXnfFv +LT8ydmZ4NySHMHpOUer4kTHuI/QGZ1zTlC6L93Ipo8bLOkTjKroa5QvtlkfErtnj +vlynae2ciqKX/qnqZF7eZeMQHyekHpxWQyrKU5pKaTkKky8N3vUw5Q+HMLuDqi1g +UcOPeyfq90GTVyuhrvK2sFZNh8J5gnYteBZz7atx9fvnNlx73S0Mc7t2rjzBlJN9 +Wz4Hu9wvyQVMFgt1Z+HnhFeJAbkytwxgipu/JJS2s6HREtrfnQEuGtUpLGmUEwrE +5SAb6HD4mjsVpLbjzo9i4YkgDJOS4IZhWM5iR2Q8N4107jadn2a6Vwrb8GBZOspI +0vLUgabllcU4K9eINud5ETZS4vT516RKriXqM5Xbr2BeZSU6P6R9ji5NDn1ylNx4 +WDn8bmZRtIxOcAaV/W3XbvmIpXrelcRTDQHqk/WtoJkvb6wrC60gp0uPLJJanMcV +NsUyF9goUkF3TFXVAj0jknbBjiCApYynBqpFy52wVEXSFuHLUxK8d5QND2SGP5Ib +WXbnaPE8r5JyOhY0u9KFidx3JbOPfA8K9wxzkUa1NCoBNp9CyyLQhQmO7ALBGHcZ +5MM3rVR/0gwd0s9Qt5g4F/pBtKedla0wJMWaM90bhIwASD2PKxyGiKzQMYlE9HiQ +AqgvGBM4yeXmIgdu8itIjk0teKJi4AdZE/oXDV6OkzT57Cm0M/7dKkWnHB0eYHFA +CFMnJr56N9SJF8skkX4of7412xWXAMd4ERDqq3UyQ2r4qq1aYPVxAGw76PR+px/Q +ZrjNm7hCDxevXZN8g/Nbvb+gtqSDTjKzOjKq8bUPVxZZxEdIR3/ZYf4bKu+kHZQs +9RM8uYuqipQOpJl/ftLOOLLGPgFONXA7sH3P8yF3tFyHjMEmuq5Ac6x3aVIe/tAc +3anzmVGcdmVMrZj24PPn8STf4RfWzIRlPaNn6I0EYoJWUpLhTgpOWGDodUtZEcC7 +WoaMcSum3gpvQyR/eROwq5jtvMPNCdO3nEjB11gLL3n7uWeeDqdeVwVJPVurU5Gb +BpDRi0sTf3qaldStkNp00aBBb5f5P0Ezq0ynVO5+4x31gQaCzrgp9r387gHiEkDb +A/lDdKJl3LINMgIz+RieWTQgzKVl9rNgaxSUeEmzPXxaYLE/Ds/cN1RmLB6kAaH9 +9KImQP1gz/0kE96tpL+0jfcqXcZlofSHWivBJ9/Nolgd4FK+3/vHqKgahswIdndj +/LfN2X+PpQOwJ0vpYf8vL5bUUNgtoDE87kKZiZE/JaXAB/k0DmtuQfQa7MCZGGFa +SMFIGlqlDjiXBzgPK9iOJPrlBpQmIwp56LLeVE29ye80bvPh+GV0VeJe5tC+7AJf +pnN/iwc6a31lQXMZVjKdtRCrDmK/Ceb3G66+np0OfIjfERsU+fSbJN5tUIb0X0oo +9okBhrBElmN6K2TG2LNd9vcM/n+ulz34H7yQn/g7hgZQqAGwcVCcXVOxpjxfqhyo +fv9nj95K4IBm2LgWFJQNlhv5WpQmtw9iaHKYLEtT+Djl9YA2s2W6fHR6loTMwPV7 +7YcFBpP6XWk0IbHjchvnoBokChpRpUdfKc0xhzee7tkTwckdVBJgRENoVLaIw1RG +RcucR7fzKHjxuXWJ1Qc8H5Qn8vDuRjncCqhSof2XL87qwlT6xUQ4x8iv8MORIwp9 +SvjF0a2fGWCqqvyRIl3ZemrxRWj909tX1MK2Verux0wNJKuTBoT94gouW+yH3NdU +5LA8NMtEpJYrBBPlh6zQ1di2b1MAaNxji2nYWaen//TR/vU+tSYtped10H+BrPNB +zXtu1MiFMhWn6ZtflwHGhRimdyDfIU5iyTgnq2FX8T4fY7sYawWtd9xl2xS6WrRm +UnJfuCKhQcwg9xWbNe/Hk9ak1rEjd8vEo5JXpD5KpTLm2j9zVSZCvWvjRorIMqxQ +CxCPbZAE9uctq6/M8f/zKKLwAVGQP3oB8HWPzcx6/YMy38x4t5SfPzA9yUB0zgsT +LRj8ksKSq1icH1z0016HRKM+34KmTX0gQNImAAzxBY8r0XIAh422qkXdb8+86Mry +bshEKsNqO5OhSGhz+oHidZDprepqh7KhuO1rqPFYAEd2JvMGEIcnZRc1VeLMrSlf +pI6Pu/yPWOu7U4GAfHugN1Lt/Yot16ls8/PXR8m3//Wq7MED2wGMbokiIKmPnSL/ +ThIb+v2nu9lib9ixbqycnDmR6hhJhQYdSKNOEh0EXfsynll9XxQCnBUqCSUKdlfc +vHikP+ACyhaLxuRRLQFi2nU1MyJayeBCl0G3N6bkIY2dA7oIXiUSb1uSUtV2Mp8y +8Mrj0ZrBgCJcqKKTxf7GGHWFZ+WhTBGDyigSA8mBMLtO4cX2XCWvXv6w+c8YQJ60 +zm+lxYRemjw9ND1HnPQpQjYsJqgm8HA5GyqWQOxMun6dqYy+Ev1/CRhXYCnxa3cz +B3LpUR8cI2H8JSxHdl3SSKb63oGY91gaSaFU5CXp+tQBTpqCeqnqmsIJm/bipvls +mCKBZzE+OCJOYS4bO4/Lbg== diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh new file mode 100755 index 0000000000..d067e67eab --- /dev/null +++ b/platform/ios/scripts/package.sh @@ -0,0 +1,152 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +NAME=Mapbox +OUTPUT=build/ios/pkg +IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version` +LIBUV_VERSION=1.7.5 +ENABLE_BITCODE=YES + +if [[ ${#} -eq 0 ]]; then # e.g. "make ipackage" + BUILDTYPE="Release" + BUILD_FOR_DEVICE=true + GCC_GENERATE_DEBUGGING_SYMBOLS="YES" +elif [[ ${1} == "no-bitcode" ]]; then # e.g. "make ipackage-no-bitcode" + BUILDTYPE="Release" + BUILD_FOR_DEVICE=true + GCC_GENERATE_DEBUGGING_SYMBOLS="YES" + ENABLE_BITCODE=NO +elif [[ ${1} == "sim" ]]; then # e.g. "make ipackage-sim" + BUILDTYPE="Debug" + BUILD_FOR_DEVICE=false + GCC_GENERATE_DEBUGGING_SYMBOLS="YES" +else # e.g. "make ipackage-strip" + BUILDTYPE="Release" + BUILD_FOR_DEVICE=true + GCC_GENERATE_DEBUGGING_SYMBOLS="NO" +fi + +function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } +function finish { >&2 echo -en "\033[0m"; } +trap finish EXIT + + +rm -rf ${OUTPUT} +mkdir -p "${OUTPUT}"/static + + +step "Recording library version..." +VERSION="${OUTPUT}"/static/version.txt +echo -n "https://github.com/mapbox/mapbox-gl-native/commit/" > ${VERSION} +HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true +echo -n "mapbox-gl-native " +echo ${HASH} +echo ${HASH} >> ${VERSION} + + +step "Creating build files..." +export MASON_PLATFORM=ios +export BUILDTYPE=${BUILDTYPE:-Release} +export HOST=ios +make Xcode/ios + +if [[ "${BUILD_FOR_DEVICE}" == true ]]; then + step "Building iOS device targets..." + xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \ + ARCHS="arm64 armv7 armv7s" \ + ONLY_ACTIVE_ARCH=NO \ + GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \ + ENABLE_BITCODE=${ENABLE_BITCODE} \ + DEPLOYMENT_POSTPROCESSING=YES \ + -project ./build/ios-all/gyp/mbgl.xcodeproj \ + -configuration ${BUILDTYPE} \ + -target everything \ + -jobs ${JOBS} +fi + +step "Building iOS Simulator targets..." +xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \ + ARCHS="x86_64 i386" \ + ONLY_ACTIVE_ARCH=NO \ + GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \ + -project ./build/ios-all/gyp/mbgl.xcodeproj \ + -configuration ${BUILDTYPE} \ + -target everything \ + -jobs ${JOBS} + + +step "Building static library..." +LIBS=(core.a platform-ios.a asset-fs.a cache-sqlite.a http-nsurl.a) +if [[ "${BUILD_FOR_DEVICE}" == true ]]; then + libtool -static -no_warning_for_no_symbols \ + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \ + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \ + -o ${OUTPUT}/static/lib${NAME}.a \ + ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphoneos/libmbgl-} \ + ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-} +else + libtool -static -no_warning_for_no_symbols \ + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \ + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \ + -o ${OUTPUT}/static/lib${NAME}.a \ + ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-} +fi +echo "Created ${OUTPUT}/static/lib${NAME}.a" + + +step "Copying Headers..." +mkdir -p "${OUTPUT}/static/Headers" +for i in `ls -R include/mbgl/darwin | grep -vi private`; do + cp -pv include/mbgl/darwin/$i "${OUTPUT}/static/Headers" +done +for i in `ls -R include/mbgl/ios | grep -vi private`; do + cp -pv include/mbgl/ios/$i "${OUTPUT}/static/Headers" +done + + +# Manually create resource bundle. We don't use a GYP target here because of +# complications between faked GYP bundles-as-executables, device build +# dependencies, and code signing. +step "Copying Resources..." +cp -pv LICENSE.md "${OUTPUT}/static" +mkdir -p "${OUTPUT}/static/${NAME}.bundle" +cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle" + +step "Creating API Docs..." +if [ -z `which appledoc` ]; then + echo "Unable to find appledoc. See https://github.com/mapbox/mapbox-gl-native/blob/master/docs/BUILD_IOS_OSX.md" + exit 1 +fi +DOCS_OUTPUT="${OUTPUT}/static/Docs" +DOCS_VERSION=$( git tag | grep ^ios | 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 +cat ios/docs/pod-README.md > ${README} +echo >> ${README} +echo -n "#" >> ${README} +cat CHANGELOG.md | sed -n "/^## iOS ${DOCS_VERSION}/,/^##/p" | sed '$d' >> ${README} +# Copy headers to a temporary location where we can substitute macros that appledoc doesn't understand. +cp -r "${OUTPUT}/static/Headers" /tmp/mbgl +perl \ + -pi \ + -e 's/NS_(?:(MUTABLE)_)?(ARRAY|SET|DICTIONARY)_OF\(\s*(.+?)\s*\)/NS\L\u$1\u$2\E <$3>/g' \ + /tmp/mbgl/Headers/*.h +perl \ + -i -p0 \ + -e 's/^#if\s+!\s*TARGET_OS_IPHONE\s*(?:&&[^\n]+)?\n.+?\n#endif//gms' \ + /tmp/mbgl/Headers/*.h +appledoc \ + --output ${DOCS_OUTPUT} \ + --project-name "Mapbox iOS SDK ${DOCS_VERSION}" \ + --project-company Mapbox \ + --create-html \ + --no-create-docset \ + --no-install-docset \ + --company-id com.mapbox \ + --index-desc ${README} \ + /tmp/mbgl/Headers +cp ${README} "${OUTPUT}/static" diff --git a/platform/ios/scripts/publish.sh b/platform/ios/scripts/publish.sh new file mode 100755 index 0000000000..c914fcaccd --- /dev/null +++ b/platform/ios/scripts/publish.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +# +# iOS release tag format is `vX.Y.Z`; `X.Y.Z` gets passed in +# In the case of symbolicated builds, we also append the `-symbols`. +# +PUBLISH_VERSION="$1" + +if [[ ${#} -eq 2 ]]; then + PUBLISH_STYLE="-$2" +else + PUBLISH_STYLE="" +fi + +# +# zip +# +cd build/ios/pkg/static +ZIP=mapbox-ios-sdk-${PUBLISH_VERSION}${PUBLISH_STYLE}.zip +rm -f ../${ZIP} +zip -r ../${ZIP} * +# +# upload +# +REPO_NAME=$(basename $TRAVIS_REPO_SLUG) +aws s3 cp ../${ZIP} s3://mapbox/$REPO_NAME/ios/builds/ --acl public-read > /dev/null +echo http://mapbox.s3.amazonaws.com/$REPO_NAME/ios/builds/${ZIP} diff --git a/platform/ios/scripts/remove-key.sh b/platform/ios/scripts/remove-key.sh new file mode 100755 index 0000000000..56b769ac21 --- /dev/null +++ b/platform/ios/scripts/remove-key.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +security delete-keychain ios-build.keychain +rm -f "~/Library/MobileDevice/Provisioning Profiles/$IOS_PROFILE_NAME.mobileprovision" diff --git a/platform/ios/scripts/run.sh b/platform/ios/scripts/run.sh new file mode 100755 index 0000000000..bfca74d318 --- /dev/null +++ b/platform/ios/scripts/run.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +source ./platform/ios/scripts/setup.sh + +BUILDTYPE=${BUILDTYPE:-Release} + +PUBLISH_TAG=($(git show -s --format=%B | sed -n 's/.*\[publish \([a-z]\{1,\}\)-v\([0-9a-z.\-]\{1,\}\)\].*/\1 \2/p')) +PUBLISH_PLATFORM=${PUBLISH_TAG[0],-} +PUBLISH_VERSION=${PUBLISH_TAG[1],-} + + +################################################################################ +# Build +################################################################################ + +if [[ ${PUBLISH_PLATFORM} = 'ios' ]]; then + # default, with debug symbols + mapbox_time "package_ios_symbols" \ + make ipackage + + mapbox_time "deploy_ios_symbols" + ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}" symbols + + # no debug symbols, for smaller distribution + mapbox_time "package_ios_stripped" \ + make ipackage-strip + + mapbox_time "deploy_ios_stripped" + ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}" + + # debug symbols but no Bitcode + mapbox_time "package_ios_no_bitcode" \ + make ipackage-no-bitcode + + mapbox_time "deploy_ios_no_bitcode" + ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}" no-bitcode +else + # build & test iOS + mapbox_time "run_ios_tests" \ + make itest +fi diff --git a/platform/ios/scripts/setup.sh b/platform/ios/scripts/setup.sh new file mode 100644 index 0000000000..d115cf9020 --- /dev/null +++ b/platform/ios/scripts/setup.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# This script is sourced; do not set -e or -o pipefail here. + +# Ensure mason is on the PATH +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" diff --git a/platform/ios/scripts/test.sh b/platform/ios/scripts/test.sh new file mode 100755 index 0000000000..60ccc76a9e --- /dev/null +++ b/platform/ios/scripts/test.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +xcodebuild \ + -project ./test/ios/ios-tests.xcodeproj \ + -scheme 'Mapbox GL Tests' \ + -sdk iphonesimulator \ + -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ + -destination 'platform=iOS Simulator,name=iPad 2,OS=latest' \ + test \ + | xcpretty diff --git a/platform/linux/scripts/after_script.sh b/platform/linux/scripts/after_script.sh new file mode 100755 index 0000000000..f8e4bc3486 --- /dev/null +++ b/platform/linux/scripts/after_script.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -o pipefail + +if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then + # Install and add awscli to PATH for uploading the results + pip install --user awscli + export PATH="`python -m site --user-base`/bin:${PATH}" + + REPO_NAME=$(basename $TRAVIS_REPO_SLUG) + + aws s3 cp --recursive --acl public-read test/fixtures/annotations \ + s3://mapbox/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/annotations +fi diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh new file mode 100644 index 0000000000..1c2dff9d27 --- /dev/null +++ b/platform/linux/scripts/configure.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +BOOST_VERSION=1.59.0 +BOOST_LIBPROGRAM_OPTIONS_VERSION=1.59.0 +LIBCURL_VERSION=system +GLFW_VERSION=3.1.2 +LIBPNG_VERSION=1.6.18 +JPEG_VERSION=v9a +SQLITE_VERSION=3.9.1 +LIBUV_VERSION=1.7.5 +ZLIB_VERSION=system +NUNICODE_VERSION=1.6 +GEOJSONVT_VERSION=3.1.0 +VARIANT_VERSION=1.0 +RAPIDJSON_VERSION=1.0.2 +GTEST_VERSION=1.7.0 +PIXELMATCH_VERSION=0.9.0 + +function print_opengl_flags { + CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN + CONFIG+=" 'opengl_ldflags%': $(quote_flags $(pkg-config gl x11 --libs)),"$LN +} diff --git a/platform/linux/scripts/defaults.mk b/platform/linux/scripts/defaults.mk new file mode 100644 index 0000000000..126c8f99a4 --- /dev/null +++ b/platform/linux/scripts/defaults.mk @@ -0,0 +1,5 @@ +HEADLESS ?= glx +PLATFORM ?= linux +ASSET ?= fs +HTTP ?= curl +CACHE ?= sqlite diff --git a/platform/linux/scripts/install.sh b/platform/linux/scripts/install.sh new file mode 100755 index 0000000000..a254d312ec --- /dev/null +++ b/platform/linux/scripts/install.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +mapbox_time "checkout_mason" \ +git submodule update --init .mason + +PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" \ +mapbox_time "install_mesa" \ +mason install mesa 10.4.3 diff --git a/platform/linux/scripts/run.sh b/platform/linux/scripts/run.sh new file mode 100755 index 0000000000..3e40881ec6 --- /dev/null +++ b/platform/linux/scripts/run.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +source ./platform/linux/scripts/setup.sh + +BUILDTYPE=${BUILDTYPE:-Release} + +################################################################################ +# Build +################################################################################ + +mapbox_time "compile_program" \ +make linux -j${JOBS} BUILDTYPE=${BUILDTYPE} + +mapbox_time "compile_render_binary" \ +make render -j${JOBS} BUILDTYPE=${BUILDTYPE} + +mapbox_time "compile_tests" \ +make test -j${JOBS} BUILDTYPE=${BUILDTYPE} + +################################################################################ +# Test +################################################################################ + +mapbox_time "run_tests" \ +make test-* BUILDTYPE=${BUILDTYPE} diff --git a/platform/linux/scripts/setup.sh b/platform/linux/scripts/setup.sh new file mode 100755 index 0000000000..af0eafb5cf --- /dev/null +++ b/platform/linux/scripts/setup.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# This script is sourced; do not set -e or -o pipefail here. + +# Ensure mason is on the PATH +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" + +# Set the core file limit to unlimited so a core file is generated upon crash +ulimit -c unlimited -S + +################################################################################ +# X Server setup +################################################################################ + +# Start the mock X server +if [ -f /etc/init.d/xvfb ] ; then + mapbox_time "start_xvfb" \ + sh -e /etc/init.d/xvfb start + sleep 2 # sometimes, xvfb takes some time to start up +fi + +# Make sure we're connecting to xvfb +export DISPLAY=:99.0 + +# Make sure we're loading the 10.4.3 libs we installed manually +export LD_LIBRARY_PATH="`mason prefix mesa 10.4.3`/lib:${LD_LIBRARY_PATH:-}" + +mapbox_time "glxinfo" \ +glxinfo diff --git a/platform/linux/scripts/tidy.sh b/platform/linux/scripts/tidy.sh new file mode 100755 index 0000000000..424c82c3cd --- /dev/null +++ b/platform/linux/scripts/tidy.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +# Ensure mason is on the PATH +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" + +BUILDTYPE=${BUILDTYPE:-Release} + +export CLANG_TIDY=clang-tidy-3.8 + +mapbox_time "config" \ +make config + +mapbox_time "tidy" \ +make tidy diff --git a/platform/node/scripts/after_script.sh b/platform/node/scripts/after_script.sh new file mode 100755 index 0000000000..af2cd78dd6 --- /dev/null +++ b/platform/node/scripts/after_script.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +set -e +set -o pipefail + +# Inspect binary. +if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then + ldd ./lib/mapbox-gl-native.node +else + otool -L ./lib/mapbox-gl-native.node +fi + +COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n') +PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") + +if [[ ${TRAVIS_TAG} == node-v${PACKAGE_JSON_VERSION} ]] || test "${COMMIT_MESSAGE#*'[publish binary]'}" != "$COMMIT_MESSAGE"; then + source ~/.nvm/nvm.sh + nvm use $NODE_VERSION + + npm install aws-sdk + + ./node_modules/.bin/node-pre-gyp package + + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then + ./node_modules/.bin/node-pre-gyp testpackage + fi + + ./node_modules/.bin/node-pre-gyp publish info + + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then + source ./platform/linux/scripts/setup.sh + + rm -rf build + rm -rf lib + npm install --fallback-to-build=false + npm test + fi +fi + +if [[ ${TRAVIS_OS_NAME} == "linux" ]] && [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then + # Install and add awscli to PATH for uploading the results + pip install --user awscli + export PATH="`python -m site --user-base`/bin:${PATH}" + + REPO_NAME=$(basename $TRAVIS_REPO_SLUG) + gzip --stdout node_modules/mapbox-gl-test-suite/render-tests/index.html | \ + aws s3 cp --acl public-read --content-encoding gzip --content-type text/html \ + - s3://mapbox/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/index.html + + echo http://mapbox.s3.amazonaws.com/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/index.html +fi diff --git a/platform/node/scripts/create_node_scheme.sh b/platform/node/scripts/create_node_scheme.sh new file mode 100755 index 0000000000..5b97918aea --- /dev/null +++ b/platform/node/scripts/create_node_scheme.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +NAME=$1 +shift +CMD=$@ +DIR="build/binding.xcodeproj/xcshareddata/xcschemes" +mkdir -p "${DIR}" + +sed "s#{{NODE_PATH}}#$(dirname `which node`)#;s#{{BLUEPRINT_IDENTIFIER}}#$(hexdump -n 12 -v -e '/1 "%02X"' /dev/urandom)#;s#{{WORKING_DIRECTORY}}#$(pwd)#;s#{{NODE_ARGUMENT}}#${CMD}#" platform/node/scripts/node.xcscheme > "${DIR}/${NAME}.xcscheme" diff --git a/platform/node/scripts/install.sh b/platform/node/scripts/install.sh new file mode 100755 index 0000000000..1edc2c91d9 --- /dev/null +++ b/platform/node/scripts/install.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +mapbox_time "checkout_mason" \ +git submodule update --init .mason + +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" + +if [ ${TRAVIS_OS_NAME} == "linux" ]; then + mapbox_time "install_mesa" \ + mason install mesa 10.4.3 +fi + +if [ ! -d ~/.nvm ]; then + curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.28.0/install.sh | bash +fi + +source ~/.nvm/nvm.sh + +mapbox_time $NODE_VERSION \ +nvm install $NODE_VERSION + +nvm alias default $NODE_VERSION + +node --version +npm --version diff --git a/platform/node/scripts/node.xcscheme b/platform/node/scripts/node.xcscheme new file mode 100644 index 0000000000..52a89fb81f --- /dev/null +++ b/platform/node/scripts/node.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/node/scripts/run.sh b/platform/node/scripts/run.sh new file mode 100755 index 0000000000..07395d6a69 --- /dev/null +++ b/platform/node/scripts/run.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +source ./platform/${TRAVIS_OS_NAME}/scripts/setup.sh + +BUILDTYPE=${BUILDTYPE:-Release} + +################################################################################ +# Build +################################################################################ + +source ~/.nvm/nvm.sh +nvm use $NODE_VERSION + +mapbox_time "compile_program" \ +npm install --build-from-source + +################################################################################ +# Test +################################################################################ + +# Travis OS X has no GPU +if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then + mapbox_time "run_tests" \ + npm test + + mapbox_time "run_render_tests" \ + npm run test-suite +fi diff --git a/platform/osx/scripts/configure.sh b/platform/osx/scripts/configure.sh new file mode 100644 index 0000000000..138738bb44 --- /dev/null +++ b/platform/osx/scripts/configure.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +BOOST_VERSION=1.59.0 +BOOST_LIBPROGRAM_OPTIONS_VERSION=1.59.0 +LIBCURL_VERSION=system +GLFW_VERSION=3.1.2 +LIBPNG_VERSION=1.6.18 +JPEG_VERSION=v9a +SQLITE_VERSION=3.9.1 +LIBUV_VERSION=1.7.5 +ZLIB_VERSION=system +NUNICODE_VERSION=1.6 +GEOJSONVT_VERSION=3.1.0 +VARIANT_VERSION=1.0 +RAPIDJSON_VERSION=1.0.2 +GTEST_VERSION=1.7.0 +PIXELMATCH_VERSION=0.9.0 diff --git a/platform/osx/scripts/defaults.mk b/platform/osx/scripts/defaults.mk new file mode 100644 index 0000000000..f148f66d8a --- /dev/null +++ b/platform/osx/scripts/defaults.mk @@ -0,0 +1,5 @@ +HEADLESS ?= cgl +PLATFORM ?= osx +ASSET ?= fs +HTTP ?= nsurl +CACHE ?= sqlite diff --git a/platform/osx/scripts/install.sh b/platform/osx/scripts/install.sh new file mode 100755 index 0000000000..d6d9c065cf --- /dev/null +++ b/platform/osx/scripts/install.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +mapbox_time "checkout_mason" \ +git submodule update --init .mason + +mapbox_time "install_xcpretty" \ +gem install xcpretty --no-rdoc --no-ri --no-document --quiet diff --git a/platform/osx/scripts/package.sh b/platform/osx/scripts/package.sh new file mode 100755 index 0000000000..f39d730674 --- /dev/null +++ b/platform/osx/scripts/package.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail +set -u + +NAME=Mapbox +OUTPUT=build/osx/pkg +OSX_SDK_VERSION=`xcrun --sdk macosx --show-sdk-version` +LIBUV_VERSION=1.7.5 + +if [[ ${#} -eq 0 ]]; then # e.g. "make xpackage" + BUILDTYPE="Release" + GCC_GENERATE_DEBUGGING_SYMBOLS="YES" +else # e.g. "make xpackage-strip" + BUILDTYPE="Release" + GCC_GENERATE_DEBUGGING_SYMBOLS="NO" +fi + +function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } +function finish { >&2 echo -en "\033[0m"; } +trap finish EXIT + +step "Creating build files..." +export MASON_PLATFORM=osx +export BUILDTYPE=${BUILDTYPE:-Release} +export HOST=osx +make Xcode/osx + +VERSION=${TRAVIS_JOB_NUMBER:-${BITRISE_BUILD_NUMBER:-0}} + +step "Building OS X framework (build ${VERSION})..." +xcodebuild -sdk macosx${OSX_SDK_VERSION} \ + ARCHS="x86_64" \ + ONLY_ACTIVE_ARCH=NO \ + GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \ + CURRENT_PROJECT_VERSION=${VERSION} \ + -project ./build/osx-x86_64/gyp/osx.xcodeproj \ + -configuration ${BUILDTYPE} \ + -target osxsdk \ + -jobs ${JOBS} + +TARGET_BUILD_DIR=gyp/build/${BUILDTYPE} +INFOPLIST_PATH=Mapbox.framework/Versions/Current/Resources/Info.plist + +# Uncomment when we're ready to release an official version. +#VERSION=$( git tag | grep ^osx | sed 's/^osx-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' ) +#if [ "$VERSION" ]; then +# plutil \ +# -replace CFBundleShortVersionString -string ${VERSION} \ +# $TARGET_BUILD_DIR/$INFOPLIST_PATH +# plutil \ +# -replace CFBundleVersion -string ${VERSION} \ +# $TARGET_BUILD_DIR/$INFOPLIST_PATH +#fi + +echo $TARGET_BUILD_DIR/Mapbox.framework diff --git a/platform/osx/scripts/run.sh b/platform/osx/scripts/run.sh new file mode 100755 index 0000000000..dcb83e2902 --- /dev/null +++ b/platform/osx/scripts/run.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +source ./platform/osx/scripts/setup.sh + +BUILDTYPE=${BUILDTYPE:-Release} + +################################################################################ +# Build +################################################################################ + +mapbox_time "compile_program" \ +make xosx -j${JOBS} BUILDTYPE=${BUILDTYPE} + +mapbox_time "compile_render_binary" \ +make xrender -j${JOBS} BUILDTYPE=${BUILDTYPE} + +mapbox_time "compile_tests" \ +make xtest -j${JOBS} BUILDTYPE=${BUILDTYPE} diff --git a/platform/osx/scripts/setup.sh b/platform/osx/scripts/setup.sh new file mode 100755 index 0000000000..502d61d44d --- /dev/null +++ b/platform/osx/scripts/setup.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# This script is sourced; do not set -e or -o pipefail here. + +# Ensure mason is on the PATH +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" + +# Set the core file limit to unlimited so a core file is generated upon crash +ulimit -c unlimited -S diff --git a/scripts/android/configure.sh b/scripts/android/configure.sh deleted file mode 100644 index 2e3e7b9d7c..0000000000 --- a/scripts/android/configure.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -BOOST_VERSION=1.59.0 -LIBPNG_VERSION=1.6.18 -JPEG_VERSION=v9a -SQLITE_VERSION=3.9.1 -LIBUV_VERSION=1.7.5 -ZLIB_VERSION=system -NUNICODE_VERSION=1.6 -LIBZIP_VERSION=0.11.2 -GEOJSONVT_VERSION=3.1.0 -VARIANT_VERSION=1.0 -RAPIDJSON_VERSION=1.0.2 - -export MASON_ANDROID_ABI=${MASON_PLATFORM_VERSION} diff --git a/scripts/android/defaults.mk b/scripts/android/defaults.mk deleted file mode 100644 index 29f047c887..0000000000 --- a/scripts/android/defaults.mk +++ /dev/null @@ -1,11 +0,0 @@ -HEADLESS ?= none -PLATFORM ?= android -ASSET ?= zip -HTTP ?= android -CACHE ?= sqlite - -GYP_FLAVOR_SUFFIX=-android - -HOST_VERSION ?= arm-v7 - -ENV = $(shell MASON_ANDROID_ABI=$(HOST_VERSION) ./scripts/android/toolchain.sh) diff --git a/scripts/android/install.sh b/scripts/android/install.sh deleted file mode 100755 index fe2b816064..0000000000 --- a/scripts/android/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -mapbox_time "checkout_mason" \ -git submodule update --init .mason - -export MASON_PLATFORM=android -export MASON_ANDROID_ABI=${ANDROID_ABI} - -mapbox_time "android_toolchain" \ -./scripts/android/toolchain.sh diff --git a/scripts/android/run.sh b/scripts/android/run.sh deleted file mode 100755 index 9e87298fe9..0000000000 --- a/scripts/android/run.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -# Add Mason to PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" -export MASON_PLATFORM=android -export MASON_ANDROID_ABI=${ANDROID_ABI} - -################################################################################ -# Build -################################################################################ - -mkdir -p ./platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw -echo "${MAPBOX_ACCESS_TOKEN}" > ./platform/android/MapboxGLAndroidSDKTestApp/src/main/res/raw/token.txt - -mapbox_time "compile_library" \ -make android-lib HOST_VERSION=${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE} - -mapbox_time "build_apk" \ -make android HOST_VERSION=${ANDROID_ABI} -j${JOBS} BUILDTYPE=${BUILDTYPE} - -################################################################################ -# Deploy -################################################################################ - -if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then - # Install and add awscli to PATH for uploading the results - mapbox_time "install_awscli" \ - pip install --user awscli - export PATH="`python -m site --user-base`/bin:${PATH}" - - mapbox_time_start "deploy_results" - echo "Deploying results..." - - S3_PREFIX=s3://mapbox/mapbox-gl-native/android/build/${TRAVIS_JOB_NUMBER} - APK_OUTPUTS=./platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk - JNILIB=`mason env JNIDIR` - - # ARM64 does not build APK for now - if [ ${JNIDIR} != "arm64-v8a" ] ; then - # Upload either the debug or the release build - if [ ${BUILDTYPE} == "Debug" ] ; then - aws s3 cp \ - ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-${JNILIB}-debug.apk \ - ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-debug.apk - elif [ ${BUILDTYPE} == "Release" ] ; then - aws s3 cp \ - ${APK_OUTPUTS}/MapboxGLAndroidSDKTestApp-${JNILIB}-release-unsigned.apk \ - ${S3_PREFIX}/MapboxGLAndroidSDKTestApp-release-unsigned.apk - fi - fi - - mapbox_time_finish -fi diff --git a/scripts/android/toolchain.sh b/scripts/android/toolchain.sh deleted file mode 100755 index 67cd0aa476..0000000000 --- a/scripts/android/toolchain.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -export MASON_PLATFORM=android -export MASON_ANDROID_ABI=${MASON_ANDROID_ABI:-arm-v7} -export PATH="`pwd`/.mason:${PATH}" -export MASON_DIR="`pwd`/.mason" - -export PATH=`mason env PATH` - -echo MASON_PLATFORM=\"${MASON_PLATFORM}\" -echo MASON_ANDROID_ABI=\"${MASON_ANDROID_ABI}\" -echo CXX=\"`which $(mason env CXX)`\" -echo CC=\"`which $(mason env CC)`\" -echo LD=\"`which $(mason env LD)`\" -echo LINK=\"`which $(mason env CXX)`\" -echo AR=\"`which $(mason env AR)`\" -echo RANLIB=\"`which $(mason env RANLIB)`\" -echo STRIP=\"`which $(mason env STRIP)`\" -echo LDFLAGS=\"`mason env LDFLAGS` \${LDFLAGS:-}\" -echo CFLAGS=\"`mason env CFLAGS` \${CFLAGS:-}\" -echo CXXFLAGS=\"`mason env CXXFLAGS` \${CXXFLAGS:-}\" -echo CPPFLAGS=\"`mason env CPPFLAGS` \${CPPFLAGS:-}\" -echo JNIDIR=\"`mason env JNIDIR`\" diff --git a/scripts/ios/add-key.sh b/scripts/ios/add-key.sh deleted file mode 100755 index fe963d38eb..0000000000 --- a/scripts/ios/add-key.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# This is all taken from http://www.objc.io/issue-6/travis-ci.html - -# Create a custom keychain -security create-keychain -p travis ios-build.keychain - -# Make the custom keychain default, so xcodebuild will use it for signing -security default-keychain -s ios-build.keychain - -# Unlock the keychain -security unlock-keychain -p travis ios-build.keychain - -# Set keychain timeout to 1 hour for long builds -# see http://www.egeek.me/2013/02/23/jenkins-and-xcode-user-interaction-is-not-allowed/ -security set-keychain-settings -t 3600 -l ~/Library/Keychains/ios-build.keychain - -# Add certificates to keychain and allow codesign to access them -security import ./scripts/ios/apple.crt -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign -security import ./scripts/ios/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign -security import ./scripts/ios/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign - -# Put the provisioning profile in place -mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles -cp "./scripts/ios/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/ diff --git a/scripts/ios/after_failure.sh b/scripts/ios/after_failure.sh deleted file mode 100755 index 88a6427f75..0000000000 --- a/scripts/ios/after_failure.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -ls $KIF_SCREENSHOTS/ - -REPO_NAME=$(basename $TRAVIS_REPO_SLUG) - -aws s3 cp $KIF_SCREENSHOTS/ s3://mapbox/$REPO_NAME/ios/tests/$TRAVIS_JOB_NUMBER/ --acl public-read --recursive > /dev/null - -echo http://mapbox.s3.amazonaws.com/$REPO_NAME/ios/tests/$TRAVIS_JOB_NUMBER/index.html diff --git a/scripts/ios/apple.crt b/scripts/ios/apple.crt deleted file mode 100644 index 0de099b869..0000000000 Binary files a/scripts/ios/apple.crt and /dev/null differ diff --git a/scripts/ios/benchmark.sh b/scripts/ios/benchmark.sh deleted file mode 100755 index 1c342e6533..0000000000 --- a/scripts/ios/benchmark.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -if [ -z "$(which ios-deploy)" ] ; then - npm install -g ios-deploy -fi - -(cd ios/benchmark/assets/tiles && ./download.sh) -(cd ios/benchmark/assets/glyphs && ./download.sh) - -make ibench - -ios-deploy --debug --noninteractive --bundle "gyp/build/Release-iphoneos/Bench GL.app" diff --git a/scripts/ios/configure.sh b/scripts/ios/configure.sh deleted file mode 100644 index ee6d60de2f..0000000000 --- a/scripts/ios/configure.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -BOOST_VERSION=1.59.0 -SQLITE_VERSION=system -LIBUV_VERSION=1.7.5 -ZLIB_VERSION=system -GEOJSONVT_VERSION=3.1.0 -VARIANT_VERSION=1.0 -RAPIDJSON_VERSION=1.0.2 diff --git a/scripts/ios/defaults.mk b/scripts/ios/defaults.mk deleted file mode 100644 index fafc332133..0000000000 --- a/scripts/ios/defaults.mk +++ /dev/null @@ -1,12 +0,0 @@ -HEADLESS = none -PLATFORM ?= ios -ASSET ?= fs -HTTP ?= nsurl -CACHE ?= sqlite - -HOST_VERSION = all - -PROVISIONING_PROFILE ?= 19324a54-7455-4f0b-8e1c-e6957c718ebc - -export MASON_PLATFORM=$(HOST) -export MASON_PLATFORM_VERSION=$(HOST_VERSION) diff --git a/scripts/ios/framework.sh b/scripts/ios/framework.sh deleted file mode 100755 index e2842a4707..0000000000 --- a/scripts/ios/framework.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -cd build/ios/pkg -rm -rf framework -mkdir framework -cd framework - -mkdir Mapbox.framework - -# headers -cp -rv ../static/Headers Mapbox.framework/Headers -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 - -# binary -cp -v ../static/libMapbox.a Mapbox.framework/Mapbox -strip -Sx Mapbox.framework/Mapbox - -# module map -mkdir Mapbox.framework/Modules -cp -v ../../../../ios/framework/modulemap Mapbox.framework/Modules/module.modulemap - -# 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/install.sh b/scripts/ios/install.sh deleted file mode 100755 index b002aeeca8..0000000000 --- a/scripts/ios/install.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -git fetch --tags - -mapbox_time "checkout_mason" \ -git submodule update --init .mason - -mapbox_time "install_xcpretty" \ -gem install xcpretty --no-rdoc --no-ri --no-document --quiet - -mapbox_time "install_recent_git" \ -brew install git - -mapbox_time "install_awscli" \ -brew install awscli - -mapbox_time "install_appledoc" \ -wget https://github.com/tomaz/appledoc/releases/download/v2.2-963/appledoc.zip && \ -tar xvzf appledoc.zip && \ -cp appledoc /usr/local/bin && \ -cp -Rf Templates/ ~/.appledoc - -mkdir -p ${KIF_SCREENSHOTS} diff --git a/scripts/ios/ios-dist.cer.enc b/scripts/ios/ios-dist.cer.enc deleted file mode 100644 index dfdd0ca997..0000000000 --- a/scripts/ios/ios-dist.cer.enc +++ /dev/null @@ -1,30 +0,0 @@ -U2FsdGVkX1/Dn0fx6y0q6CHTK5UmCnel5Nw0kQlpeCqrqpWvXnYS//Ep0updcMIQ -xj1hu+baBWjw7ccysFG/zcReSh/xgP6JrW7QKiA/kIQvqOvH0vhtzvDsnAQCB52T -VWVy492mIwFRCBANVTPbdmBbVIeHAkeQcrVkFJJIKOv4dC+CFAw9ArHm8iYrg7FV -FDK3cmrfR/pgvlQ1lQDa1C0vV1k/R5KuhqwDM3xMML1WbuBlR0RRHccs4xJRmRV7 -NuAuWg2Ob+p5gOW4L3+7PnBTBgxUZl2nbukd3oUlAPBOxgwwbgQSJPDvnsw2zmgp -uv2X0Q0/fT9R8VxuoSXYkLkgIlOnVVRpyG4C4ou7HPS8VDiLP5iRWKx2PoTvaBLz -9lNPTXhXu45n2k9L9SbkYk0024u6I8x9EkAmu0wU/rQpdudw4uLO7Pxz7BZHq3/D -frwBMvtQXRogeQcsi3dKmsISrxdSEO1hax6toVnqujPSXKmFOMHXyhqJg/K9DDhs -8GAUUO0cVfAaviofVFBZAXwkOd0SaYWz3WY4qHOZHnFiuGN0MCd2lXe5kVKFXRdE -6ElXMm2+M0YLH+L55MA79hIDjqjv9JXTAAKpLy5wsOkMYEaaXvevdAEhkSW9QzIh -HGUqBED5jqdrNlm7qOPSMWDcB/9FlnizKFsqrZOjquWFQZ4L34t++8FPT0ipxKCI -XkYxBqVesZlHBOLPBYQ2bdJUuYaACkyMtB5eRebEieoWRXTB0aD4otvh6F6MYpiY -4q66GO3faCnPxcZY4OxxwSSuyotBP8qKJcACqf3/Ji0nt42IHOIWJmiwROjBzMQ2 -DgYLtjsi1/b8eXLO5g+6S8o404j8g+2Z2rYXG+Hw6TaxY5bXrAH51fbUNDJP6qFR -X3K3q8YvJlXcKIU6aZi5CDqaJUz6e22FvsOeWVHjdQYB23kk+LWYQY58hvkFUDXd -/Nn2FxGPn80280sF4s8EX77YEXLGLqIo293Yg9F9JBwrq76ObY6DJbRlB4EG0Hx+ -vo0WJhEWHahu2uCfwqMJPDhMTGYcYRdHcNSepJlbj+gFTmH8bdKZGI/g13ZsDYEK -HKP72rtaGQT4JYkS06TC6/Vvi+0+PxXr9SKbODCskN2yJpp0S2wXy8H6IwlpPe1R -v82oCJQAXrcD8wd65TR2Q7fg4akHzI9VX1q8UGjzNt/Y/EsPEVv48PM/zngk/Hat -Ptq6SoOFAj/JqbXOMuW0fidBI7uhq5575lgxaQ+VL4nKdDrdoHZXWJgjG/ZQO1j4 -8o12Z+Fk8tNpMPofJaAf3ebuArAE/IUDK7KKB7UoSwT1XPOFI9gCVtG654i7CAtN -LfkDruwjTcD2XyaVLcVTeDUr2wMMrugE+OS4B/d0nD7jU4hVHTVn5fJxRiAFx+ql -cBG/TIf951aDZ1x7eIj4xhehletdeWTZ2wGT8RJcFPD3LIB1hddeDIFQrkfEP7Gp -IY+VdYo3tZtYcj9x0dXey/n9y0kxZw2w8oAY5iJB7NydeSANL4btPWO8y4KxXta9 -P+HNq01JS78ufYxfIOnOxD8l7YtD6Z6Evr1elzGFJOzRl4nCbPUg+VXekR94Lmf8 -0MBLgyG6xSoRBHvIYK6SRHEc+NuWvyfZGSOKBQVTwvf4/y4+xGcbPZy/YnUX6u+/ -zRWaYPJBdRhTrwAqawz9ZLL65uFYM7jhpZPEYGhOVqFoarNsy0m0gF5HNy8r/s71 -N1DBKUyVzdhR+4JZEHkkAr8JnN108d1uDIkaiI1F+hLCK2m5wnMYlZBMj2pP4kSC -1E7JiIr/EKDiIHE7rOzf3yTYwug0xusBDdNTappMzTRsTCEyJf330k3kS7y0+zoH -lwtG/9HS6qcwPY2h5buxTb6v9xQqmyWNT28Q8qEb3h8b2XS/NUyB9SQvRpkn9oUR diff --git a/scripts/ios/ios-dist.p12.enc b/scripts/ios/ios-dist.p12.enc deleted file mode 100644 index ad6507ef9f..0000000000 --- a/scripts/ios/ios-dist.p12.enc +++ /dev/null @@ -1,32 +0,0 @@ -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 diff --git a/scripts/ios/ios-in-house.mobileprovision.enc b/scripts/ios/ios-in-house.mobileprovision.enc deleted file mode 100644 index 51036a7415..0000000000 --- a/scripts/ios/ios-in-house.mobileprovision.enc +++ /dev/null @@ -1,153 +0,0 @@ -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 -mCKBZzE+OCJOYS4bO4/Lbg== diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh deleted file mode 100755 index d067e67eab..0000000000 --- a/scripts/ios/package.sh +++ /dev/null @@ -1,152 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -NAME=Mapbox -OUTPUT=build/ios/pkg -IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version` -LIBUV_VERSION=1.7.5 -ENABLE_BITCODE=YES - -if [[ ${#} -eq 0 ]]; then # e.g. "make ipackage" - BUILDTYPE="Release" - BUILD_FOR_DEVICE=true - GCC_GENERATE_DEBUGGING_SYMBOLS="YES" -elif [[ ${1} == "no-bitcode" ]]; then # e.g. "make ipackage-no-bitcode" - BUILDTYPE="Release" - BUILD_FOR_DEVICE=true - GCC_GENERATE_DEBUGGING_SYMBOLS="YES" - ENABLE_BITCODE=NO -elif [[ ${1} == "sim" ]]; then # e.g. "make ipackage-sim" - BUILDTYPE="Debug" - BUILD_FOR_DEVICE=false - GCC_GENERATE_DEBUGGING_SYMBOLS="YES" -else # e.g. "make ipackage-strip" - BUILDTYPE="Release" - BUILD_FOR_DEVICE=true - GCC_GENERATE_DEBUGGING_SYMBOLS="NO" -fi - -function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } -function finish { >&2 echo -en "\033[0m"; } -trap finish EXIT - - -rm -rf ${OUTPUT} -mkdir -p "${OUTPUT}"/static - - -step "Recording library version..." -VERSION="${OUTPUT}"/static/version.txt -echo -n "https://github.com/mapbox/mapbox-gl-native/commit/" > ${VERSION} -HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true -echo -n "mapbox-gl-native " -echo ${HASH} -echo ${HASH} >> ${VERSION} - - -step "Creating build files..." -export MASON_PLATFORM=ios -export BUILDTYPE=${BUILDTYPE:-Release} -export HOST=ios -make Xcode/ios - -if [[ "${BUILD_FOR_DEVICE}" == true ]]; then - step "Building iOS device targets..." - xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \ - ARCHS="arm64 armv7 armv7s" \ - ONLY_ACTIVE_ARCH=NO \ - GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \ - ENABLE_BITCODE=${ENABLE_BITCODE} \ - DEPLOYMENT_POSTPROCESSING=YES \ - -project ./build/ios-all/gyp/mbgl.xcodeproj \ - -configuration ${BUILDTYPE} \ - -target everything \ - -jobs ${JOBS} -fi - -step "Building iOS Simulator targets..." -xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \ - ARCHS="x86_64 i386" \ - ONLY_ACTIVE_ARCH=NO \ - GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \ - -project ./build/ios-all/gyp/mbgl.xcodeproj \ - -configuration ${BUILDTYPE} \ - -target everything \ - -jobs ${JOBS} - - -step "Building static library..." -LIBS=(core.a platform-ios.a asset-fs.a cache-sqlite.a http-nsurl.a) -if [[ "${BUILD_FOR_DEVICE}" == true ]]; then - libtool -static -no_warning_for_no_symbols \ - `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \ - `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \ - -o ${OUTPUT}/static/lib${NAME}.a \ - ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphoneos/libmbgl-} \ - ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-} -else - libtool -static -no_warning_for_no_symbols \ - `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \ - `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \ - -o ${OUTPUT}/static/lib${NAME}.a \ - ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-} -fi -echo "Created ${OUTPUT}/static/lib${NAME}.a" - - -step "Copying Headers..." -mkdir -p "${OUTPUT}/static/Headers" -for i in `ls -R include/mbgl/darwin | grep -vi private`; do - cp -pv include/mbgl/darwin/$i "${OUTPUT}/static/Headers" -done -for i in `ls -R include/mbgl/ios | grep -vi private`; do - cp -pv include/mbgl/ios/$i "${OUTPUT}/static/Headers" -done - - -# Manually create resource bundle. We don't use a GYP target here because of -# complications between faked GYP bundles-as-executables, device build -# dependencies, and code signing. -step "Copying Resources..." -cp -pv LICENSE.md "${OUTPUT}/static" -mkdir -p "${OUTPUT}/static/${NAME}.bundle" -cp -pv platform/ios/resources/* "${OUTPUT}/static/${NAME}.bundle" - -step "Creating API Docs..." -if [ -z `which appledoc` ]; then - echo "Unable to find appledoc. See https://github.com/mapbox/mapbox-gl-native/blob/master/docs/BUILD_IOS_OSX.md" - exit 1 -fi -DOCS_OUTPUT="${OUTPUT}/static/Docs" -DOCS_VERSION=$( git tag | grep ^ios | 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 -cat ios/docs/pod-README.md > ${README} -echo >> ${README} -echo -n "#" >> ${README} -cat CHANGELOG.md | sed -n "/^## iOS ${DOCS_VERSION}/,/^##/p" | sed '$d' >> ${README} -# Copy headers to a temporary location where we can substitute macros that appledoc doesn't understand. -cp -r "${OUTPUT}/static/Headers" /tmp/mbgl -perl \ - -pi \ - -e 's/NS_(?:(MUTABLE)_)?(ARRAY|SET|DICTIONARY)_OF\(\s*(.+?)\s*\)/NS\L\u$1\u$2\E <$3>/g' \ - /tmp/mbgl/Headers/*.h -perl \ - -i -p0 \ - -e 's/^#if\s+!\s*TARGET_OS_IPHONE\s*(?:&&[^\n]+)?\n.+?\n#endif//gms' \ - /tmp/mbgl/Headers/*.h -appledoc \ - --output ${DOCS_OUTPUT} \ - --project-name "Mapbox iOS SDK ${DOCS_VERSION}" \ - --project-company Mapbox \ - --create-html \ - --no-create-docset \ - --no-install-docset \ - --company-id com.mapbox \ - --index-desc ${README} \ - /tmp/mbgl/Headers -cp ${README} "${OUTPUT}/static" diff --git a/scripts/ios/publish.sh b/scripts/ios/publish.sh deleted file mode 100755 index c914fcaccd..0000000000 --- a/scripts/ios/publish.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -# -# iOS release tag format is `vX.Y.Z`; `X.Y.Z` gets passed in -# In the case of symbolicated builds, we also append the `-symbols`. -# -PUBLISH_VERSION="$1" - -if [[ ${#} -eq 2 ]]; then - PUBLISH_STYLE="-$2" -else - PUBLISH_STYLE="" -fi - -# -# zip -# -cd build/ios/pkg/static -ZIP=mapbox-ios-sdk-${PUBLISH_VERSION}${PUBLISH_STYLE}.zip -rm -f ../${ZIP} -zip -r ../${ZIP} * -# -# upload -# -REPO_NAME=$(basename $TRAVIS_REPO_SLUG) -aws s3 cp ../${ZIP} s3://mapbox/$REPO_NAME/ios/builds/ --acl public-read > /dev/null -echo http://mapbox.s3.amazonaws.com/$REPO_NAME/ios/builds/${ZIP} diff --git a/scripts/ios/remove-key.sh b/scripts/ios/remove-key.sh deleted file mode 100755 index 56b769ac21..0000000000 --- a/scripts/ios/remove-key.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -security delete-keychain ios-build.keychain -rm -f "~/Library/MobileDevice/Provisioning Profiles/$IOS_PROFILE_NAME.mobileprovision" diff --git a/scripts/ios/run.sh b/scripts/ios/run.sh deleted file mode 100755 index d74daec699..0000000000 --- a/scripts/ios/run.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -source ./scripts/ios/setup.sh - -BUILDTYPE=${BUILDTYPE:-Release} - -PUBLISH_TAG=($(git show -s --format=%B | sed -n 's/.*\[publish \([a-z]\{1,\}\)-v\([0-9a-z.\-]\{1,\}\)\].*/\1 \2/p')) -PUBLISH_PLATFORM=${PUBLISH_TAG[0],-} -PUBLISH_VERSION=${PUBLISH_TAG[1],-} - - -################################################################################ -# Build -################################################################################ - -if [[ ${PUBLISH_PLATFORM} = 'ios' ]]; then - # default, with debug symbols - mapbox_time "package_ios_symbols" \ - make ipackage - - mapbox_time "deploy_ios_symbols" - ./scripts/ios/publish.sh "${PUBLISH_VERSION}" symbols - - # no debug symbols, for smaller distribution - mapbox_time "package_ios_stripped" \ - make ipackage-strip - - mapbox_time "deploy_ios_stripped" - ./scripts/ios/publish.sh "${PUBLISH_VERSION}" - - # debug symbols but no Bitcode - mapbox_time "package_ios_no_bitcode" \ - make ipackage-no-bitcode - - mapbox_time "deploy_ios_no_bitcode" - ./scripts/ios/publish.sh "${PUBLISH_VERSION}" no-bitcode -else - # build & test iOS - mapbox_time "run_ios_tests" \ - make itest -fi diff --git a/scripts/ios/setup.sh b/scripts/ios/setup.sh deleted file mode 100644 index d115cf9020..0000000000 --- a/scripts/ios/setup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -# This script is sourced; do not set -e or -o pipefail here. - -# Ensure mason is on the PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" diff --git a/scripts/ios/test.sh b/scripts/ios/test.sh deleted file mode 100755 index 60ccc76a9e..0000000000 --- a/scripts/ios/test.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -xcodebuild \ - -project ./test/ios/ios-tests.xcodeproj \ - -scheme 'Mapbox GL Tests' \ - -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ - -destination 'platform=iOS Simulator,name=iPad 2,OS=latest' \ - test \ - | xcpretty diff --git a/scripts/linux/after_script.sh b/scripts/linux/after_script.sh deleted file mode 100755 index f8e4bc3486..0000000000 --- a/scripts/linux/after_script.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then - # Install and add awscli to PATH for uploading the results - pip install --user awscli - export PATH="`python -m site --user-base`/bin:${PATH}" - - REPO_NAME=$(basename $TRAVIS_REPO_SLUG) - - aws s3 cp --recursive --acl public-read test/fixtures/annotations \ - s3://mapbox/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/annotations -fi diff --git a/scripts/linux/configure.sh b/scripts/linux/configure.sh deleted file mode 100644 index 1c2dff9d27..0000000000 --- a/scripts/linux/configure.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -BOOST_VERSION=1.59.0 -BOOST_LIBPROGRAM_OPTIONS_VERSION=1.59.0 -LIBCURL_VERSION=system -GLFW_VERSION=3.1.2 -LIBPNG_VERSION=1.6.18 -JPEG_VERSION=v9a -SQLITE_VERSION=3.9.1 -LIBUV_VERSION=1.7.5 -ZLIB_VERSION=system -NUNICODE_VERSION=1.6 -GEOJSONVT_VERSION=3.1.0 -VARIANT_VERSION=1.0 -RAPIDJSON_VERSION=1.0.2 -GTEST_VERSION=1.7.0 -PIXELMATCH_VERSION=0.9.0 - -function print_opengl_flags { - CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN - CONFIG+=" 'opengl_ldflags%': $(quote_flags $(pkg-config gl x11 --libs)),"$LN -} diff --git a/scripts/linux/defaults.mk b/scripts/linux/defaults.mk deleted file mode 100644 index 126c8f99a4..0000000000 --- a/scripts/linux/defaults.mk +++ /dev/null @@ -1,5 +0,0 @@ -HEADLESS ?= glx -PLATFORM ?= linux -ASSET ?= fs -HTTP ?= curl -CACHE ?= sqlite diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh deleted file mode 100755 index a254d312ec..0000000000 --- a/scripts/linux/install.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -mapbox_time "checkout_mason" \ -git submodule update --init .mason - -PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" \ -mapbox_time "install_mesa" \ -mason install mesa 10.4.3 diff --git a/scripts/linux/run.sh b/scripts/linux/run.sh deleted file mode 100755 index 142cbcb680..0000000000 --- a/scripts/linux/run.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -source ./scripts/linux/setup.sh - -BUILDTYPE=${BUILDTYPE:-Release} - -################################################################################ -# Build -################################################################################ - -mapbox_time "compile_program" \ -make linux -j${JOBS} BUILDTYPE=${BUILDTYPE} - -mapbox_time "compile_render_binary" \ -make render -j${JOBS} BUILDTYPE=${BUILDTYPE} - -mapbox_time "compile_tests" \ -make test -j${JOBS} BUILDTYPE=${BUILDTYPE} - -################################################################################ -# Test -################################################################################ - -mapbox_time "run_tests" \ -make test-* BUILDTYPE=${BUILDTYPE} diff --git a/scripts/linux/setup.sh b/scripts/linux/setup.sh deleted file mode 100755 index af0eafb5cf..0000000000 --- a/scripts/linux/setup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# This script is sourced; do not set -e or -o pipefail here. - -# Ensure mason is on the PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -# Set the core file limit to unlimited so a core file is generated upon crash -ulimit -c unlimited -S - -################################################################################ -# X Server setup -################################################################################ - -# Start the mock X server -if [ -f /etc/init.d/xvfb ] ; then - mapbox_time "start_xvfb" \ - sh -e /etc/init.d/xvfb start - sleep 2 # sometimes, xvfb takes some time to start up -fi - -# Make sure we're connecting to xvfb -export DISPLAY=:99.0 - -# Make sure we're loading the 10.4.3 libs we installed manually -export LD_LIBRARY_PATH="`mason prefix mesa 10.4.3`/lib:${LD_LIBRARY_PATH:-}" - -mapbox_time "glxinfo" \ -glxinfo diff --git a/scripts/linux/tidy.sh b/scripts/linux/tidy.sh deleted file mode 100755 index 424c82c3cd..0000000000 --- a/scripts/linux/tidy.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -# Ensure mason is on the PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -BUILDTYPE=${BUILDTYPE:-Release} - -export CLANG_TIDY=clang-tidy-3.8 - -mapbox_time "config" \ -make config - -mapbox_time "tidy" \ -make tidy diff --git a/scripts/main.mk b/scripts/main.mk index d2cf13b524..afbb34f56a 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -6,7 +6,7 @@ endif export HOST ?= $(BUILD) # Defines host defaults -include scripts/$(HOST)/defaults.mk +include platform/$(HOST)/scripts/defaults.mk export HOST_VERSION ?= $(BUILD_VERSION) @@ -16,14 +16,14 @@ export HOST_VERSION ?= $(BUILD_VERSION) export MASON_PLATFORM=$(HOST) export MASON_PLATFORM_VERSION=$(HOST_VERSION) -ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh)) +ifneq (,$(wildcard platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh)) CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh endif export HOST_SLUG = $(HOST)-$(HOST_VERSION) -CONFIGURE_FILES = scripts/$(HOST)/configure.sh -ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh)) - CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh +CONFIGURE_FILES = platform/$(HOST)/scripts/configure.sh +ifneq (,$(wildcard platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh)) + CONFIGURE_FILES += platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh endif ifneq (,$(findstring clang,$(CXX))) @@ -112,8 +112,8 @@ node/configure: node/xproj: Xcode/__project__ node/configure $(QUIET)$(ENV) $(NODE_PRE_GYP) configure --clang -- \ $(GYP_FLAGS) -f xcode -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs= - $(QUIET)$(ENV) ./scripts/node/create_node_scheme.sh "node test" "`npm bin tape`/tape platform/node/test/js/**/*.test.js" - $(QUIET)$(ENV) ./scripts/node/create_node_scheme.sh "npm run test-suite" "platform/node/test/render.test.js" + $(QUIET)$(ENV) ./platform/node/scripts/create_node_scheme.sh "node test" "`npm bin tape`/tape platform/node/test/js/**/*.test.js" + $(QUIET)$(ENV) ./platform/node/scripts/create_node_scheme.sh "npm run test-suite" "platform/node/test/render.test.js" Makefile/node: Makefile/__project__ node/configure @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target node...$(FORMAT_END)\n" diff --git a/scripts/node/after_script.sh b/scripts/node/after_script.sh deleted file mode 100755 index 6ab07fe03d..0000000000 --- a/scripts/node/after_script.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -# Inspect binary. -if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - ldd ./lib/mapbox-gl-native.node -else - otool -L ./lib/mapbox-gl-native.node -fi - -COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n') -PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") - -if [[ ${TRAVIS_TAG} == node-v${PACKAGE_JSON_VERSION} ]] || test "${COMMIT_MESSAGE#*'[publish binary]'}" != "$COMMIT_MESSAGE"; then - source ~/.nvm/nvm.sh - nvm use $NODE_VERSION - - npm install aws-sdk - - ./node_modules/.bin/node-pre-gyp package - - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - ./node_modules/.bin/node-pre-gyp testpackage - fi - - ./node_modules/.bin/node-pre-gyp publish info - - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - source ./scripts/${TRAVIS_OS_NAME}/setup.sh - - rm -rf build - rm -rf lib - npm install --fallback-to-build=false - npm test - fi -fi - -if [[ ${TRAVIS_OS_NAME} == "linux" ]] && [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then - # Install and add awscli to PATH for uploading the results - pip install --user awscli - export PATH="`python -m site --user-base`/bin:${PATH}" - - REPO_NAME=$(basename $TRAVIS_REPO_SLUG) - gzip --stdout node_modules/mapbox-gl-test-suite/render-tests/index.html | \ - aws s3 cp --acl public-read --content-encoding gzip --content-type text/html \ - - s3://mapbox/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/index.html - - echo http://mapbox.s3.amazonaws.com/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/index.html -fi diff --git a/scripts/node/create_node_scheme.sh b/scripts/node/create_node_scheme.sh deleted file mode 100755 index c0907f5d20..0000000000 --- a/scripts/node/create_node_scheme.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -NAME=$1 -shift -CMD=$@ -DIR="build/binding.xcodeproj/xcshareddata/xcschemes" -mkdir -p "${DIR}" - -sed "s#{{NODE_PATH}}#$(dirname `which node`)#;s#{{BLUEPRINT_IDENTIFIER}}#$(hexdump -n 12 -v -e '/1 "%02X"' /dev/urandom)#;s#{{WORKING_DIRECTORY}}#$(pwd)#;s#{{NODE_ARGUMENT}}#${CMD}#" scripts/node/node.xcscheme > "${DIR}/${NAME}.xcscheme" diff --git a/scripts/node/install.sh b/scripts/node/install.sh deleted file mode 100755 index 1edc2c91d9..0000000000 --- a/scripts/node/install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -mapbox_time "checkout_mason" \ -git submodule update --init .mason - -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -if [ ${TRAVIS_OS_NAME} == "linux" ]; then - mapbox_time "install_mesa" \ - mason install mesa 10.4.3 -fi - -if [ ! -d ~/.nvm ]; then - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.28.0/install.sh | bash -fi - -source ~/.nvm/nvm.sh - -mapbox_time $NODE_VERSION \ -nvm install $NODE_VERSION - -nvm alias default $NODE_VERSION - -node --version -npm --version diff --git a/scripts/node/node.xcscheme b/scripts/node/node.xcscheme deleted file mode 100644 index 52a89fb81f..0000000000 --- a/scripts/node/node.xcscheme +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scripts/node/run.sh b/scripts/node/run.sh deleted file mode 100755 index 983916c90c..0000000000 --- a/scripts/node/run.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -source ./scripts/${TRAVIS_OS_NAME}/setup.sh - -BUILDTYPE=${BUILDTYPE:-Release} - -################################################################################ -# Build -################################################################################ - -source ~/.nvm/nvm.sh -nvm use $NODE_VERSION - -mapbox_time "compile_program" \ -npm install --build-from-source - -################################################################################ -# Test -################################################################################ - -# Travis OS X has no GPU -if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - mapbox_time "run_tests" \ - npm test - - mapbox_time "run_render_tests" \ - npm run test-suite -fi diff --git a/scripts/osx/configure.sh b/scripts/osx/configure.sh deleted file mode 100644 index 138738bb44..0000000000 --- a/scripts/osx/configure.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -BOOST_VERSION=1.59.0 -BOOST_LIBPROGRAM_OPTIONS_VERSION=1.59.0 -LIBCURL_VERSION=system -GLFW_VERSION=3.1.2 -LIBPNG_VERSION=1.6.18 -JPEG_VERSION=v9a -SQLITE_VERSION=3.9.1 -LIBUV_VERSION=1.7.5 -ZLIB_VERSION=system -NUNICODE_VERSION=1.6 -GEOJSONVT_VERSION=3.1.0 -VARIANT_VERSION=1.0 -RAPIDJSON_VERSION=1.0.2 -GTEST_VERSION=1.7.0 -PIXELMATCH_VERSION=0.9.0 diff --git a/scripts/osx/defaults.mk b/scripts/osx/defaults.mk deleted file mode 100644 index f148f66d8a..0000000000 --- a/scripts/osx/defaults.mk +++ /dev/null @@ -1,5 +0,0 @@ -HEADLESS ?= cgl -PLATFORM ?= osx -ASSET ?= fs -HTTP ?= nsurl -CACHE ?= sqlite diff --git a/scripts/osx/install.sh b/scripts/osx/install.sh deleted file mode 100755 index d6d9c065cf..0000000000 --- a/scripts/osx/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -mapbox_time "checkout_mason" \ -git submodule update --init .mason - -mapbox_time "install_xcpretty" \ -gem install xcpretty --no-rdoc --no-ri --no-document --quiet diff --git a/scripts/osx/package.sh b/scripts/osx/package.sh deleted file mode 100755 index f39d730674..0000000000 --- a/scripts/osx/package.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail -set -u - -NAME=Mapbox -OUTPUT=build/osx/pkg -OSX_SDK_VERSION=`xcrun --sdk macosx --show-sdk-version` -LIBUV_VERSION=1.7.5 - -if [[ ${#} -eq 0 ]]; then # e.g. "make xpackage" - BUILDTYPE="Release" - GCC_GENERATE_DEBUGGING_SYMBOLS="YES" -else # e.g. "make xpackage-strip" - BUILDTYPE="Release" - GCC_GENERATE_DEBUGGING_SYMBOLS="NO" -fi - -function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; } -function finish { >&2 echo -en "\033[0m"; } -trap finish EXIT - -step "Creating build files..." -export MASON_PLATFORM=osx -export BUILDTYPE=${BUILDTYPE:-Release} -export HOST=osx -make Xcode/osx - -VERSION=${TRAVIS_JOB_NUMBER:-${BITRISE_BUILD_NUMBER:-0}} - -step "Building OS X framework (build ${VERSION})..." -xcodebuild -sdk macosx${OSX_SDK_VERSION} \ - ARCHS="x86_64" \ - ONLY_ACTIVE_ARCH=NO \ - GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \ - CURRENT_PROJECT_VERSION=${VERSION} \ - -project ./build/osx-x86_64/gyp/osx.xcodeproj \ - -configuration ${BUILDTYPE} \ - -target osxsdk \ - -jobs ${JOBS} - -TARGET_BUILD_DIR=gyp/build/${BUILDTYPE} -INFOPLIST_PATH=Mapbox.framework/Versions/Current/Resources/Info.plist - -# Uncomment when we're ready to release an official version. -#VERSION=$( git tag | grep ^osx | sed 's/^osx-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' ) -#if [ "$VERSION" ]; then -# plutil \ -# -replace CFBundleShortVersionString -string ${VERSION} \ -# $TARGET_BUILD_DIR/$INFOPLIST_PATH -# plutil \ -# -replace CFBundleVersion -string ${VERSION} \ -# $TARGET_BUILD_DIR/$INFOPLIST_PATH -#fi - -echo $TARGET_BUILD_DIR/Mapbox.framework diff --git a/scripts/osx/run.sh b/scripts/osx/run.sh deleted file mode 100755 index 28c1adba1b..0000000000 --- a/scripts/osx/run.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -source ./scripts/osx/setup.sh - -BUILDTYPE=${BUILDTYPE:-Release} - -################################################################################ -# Build -################################################################################ - -mapbox_time "compile_program" \ -make xosx -j${JOBS} BUILDTYPE=${BUILDTYPE} - -mapbox_time "compile_render_binary" \ -make xrender -j${JOBS} BUILDTYPE=${BUILDTYPE} - -mapbox_time "compile_tests" \ -make xtest -j${JOBS} BUILDTYPE=${BUILDTYPE} diff --git a/scripts/osx/setup.sh b/scripts/osx/setup.sh deleted file mode 100755 index 502d61d44d..0000000000 --- a/scripts/osx/setup.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# This script is sourced; do not set -e or -o pipefail here. - -# Ensure mason is on the PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -# Set the core file limit to unlimited so a core file is generated upon crash -ulimit -c unlimited -S -- cgit v1.2.1