From 14809e0c56b8199a96e27214a7c8d5776e6e4305 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Mon, 23 Jan 2017 17:47:37 +0200 Subject: [build] Remove submodules and Makefile They are crashing the Qt Windows CIs because of long filenames and Qt CI will try to run the Makefile. --- .gitmodules | 13 - Makefile | 647 -------------------------------------- mapbox-gl-js | 1 - platform/ios/uitest/KIF | 1 - platform/ios/uitest/OHHTTPStubs | 1 - platform/ios/vendor/SMCalloutView | 1 - 6 files changed, 664 deletions(-) delete mode 100644 Makefile delete mode 160000 mapbox-gl-js delete mode 160000 platform/ios/uitest/KIF delete mode 160000 platform/ios/uitest/OHHTTPStubs delete mode 160000 platform/ios/vendor/SMCalloutView diff --git a/.gitmodules b/.gitmodules index 9a9f6c1ed..3ea39fac4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,16 +2,3 @@ path = .mason url = https://github.com/mapbox/mason.git -[submodule "platform/ios/vendor/SMCalloutView"] - path = platform/ios/vendor/SMCalloutView - url = https://github.com/nfarina/calloutview.git - -[submodule "platform/ios/uitest/KIF"] - path = platform/ios/uitest/KIF - url = https://github.com/kif-framework/KIF.git -[submodule "platform/ios/uitest/OHHTTPStubs"] - path = platform/ios/uitest/OHHTTPStubs - url = https://github.com/AliSoftware/OHHTTPStubs.git -[submodule "mapbox-gl-js"] - path = mapbox-gl-js - url = git://github.com/mapbox/mapbox-gl-js.git diff --git a/Makefile b/Makefile deleted file mode 100644 index c4e123d64..000000000 --- a/Makefile +++ /dev/null @@ -1,647 +0,0 @@ -export BUILDTYPE ?= Debug - -ifeq ($(BUILDTYPE), Release) -else ifeq ($(BUILDTYPE), Debug) -else - $(error BUILDTYPE must be Debug or Release) -endif - -ifeq ($(shell uname -s), Darwin) - HOST_PLATFORM = macos - HOST_PLATFORM_VERSION = $(shell uname -m) - NINJA ?= platform/macos/ninja - export JOBS ?= $(shell sysctl -n hw.ncpu) -else ifeq ($(shell uname -s), Linux) - HOST_PLATFORM = linux - HOST_PLATFORM_VERSION = $(shell uname -m) - NINJA ?= platform/linux/ninja - export JOBS ?= $(shell grep --count processor /proc/cpuinfo) -else - $(error Cannot determine host platform) -endif - -ifeq ($(MASON_PLATFORM),) - BUILD_PLATFORM = $(HOST_PLATFORM) -else - BUILD_PLATFORM = $(MASON_PLATFORM) -endif - -ifeq ($(MASON_PLATFORM_VERSION),) - BUILD_PLATFORM_VERSION = $(HOST_PLATFORM_VERSION) -else - BUILD_PLATFORM_VERSION = $(MASON_PLATFORM_VERSION) -endif - -ifeq ($(V), 1) - export XCPRETTY - NINJA_ARGS ?= -v -else - export XCPRETTY ?= | xcpretty - NINJA_ARGS ?= -endif - -.PHONY: default -default: test - -ifneq (,$(wildcard .git/.)) -.mason/mason: - git submodule update --init -else -.mason/mason: ; -endif - -.NOTPARALLEL: node_modules -node_modules: package.json - npm install --ignore-scripts # Install dependencies but don't run our own install script. - -BUILD_DEPS += .mason/mason -BUILD_DEPS += Makefile -BUILD_DEPS += node_modules -BUILD_DEPS += CMakeLists.txt - -#### macOS targets ############################################################## - -ifeq ($(HOST_PLATFORM), macos) - -export PATH := $(shell pwd)/platform/macos:$(PATH) - -MACOS_OUTPUT_PATH = build/macos -MACOS_PROJ_PATH = $(MACOS_OUTPUT_PATH)/mbgl.xcodeproj -MACOS_WORK_PATH = platform/macos/macos.xcworkspace -MACOS_USER_DATA_PATH = $(MACOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad -MACOS_COMPDB_PATH = $(MACOS_OUTPUT_PATH)/compdb/$(BUILDTYPE) - -MACOS_XCODEBUILD = xcodebuild \ - -derivedDataPath $(MACOS_OUTPUT_PATH) \ - -configuration $(BUILDTYPE) \ - -workspace $(MACOS_WORK_PATH) - - -MACOS_XCSCHEMES += platform/macos/scripts/executable.xcscheme -MACOS_XCSCHEMES += platform/macos/scripts/library.xcscheme -MACOS_XCSCHEMES += platform/macos/scripts/node.xcscheme - -$(MACOS_PROJ_PATH): $(BUILD_DEPS) $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(MACOS_XCSCHEMES) - mkdir -p $(MACOS_OUTPUT_PATH) - (cd $(MACOS_OUTPUT_PATH) && cmake -G Xcode ../..) - - @# Create Xcode schemes so that we can use xcodebuild from the command line. CMake doesn't - @# create these automatically. - SCHEME_NAME=mbgl-test SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - SCHEME_NAME=mbgl-benchmark SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - SCHEME_NAME=mbgl-render SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - SCHEME_NAME=mbgl-offline SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - SCHEME_NAME=mbgl-glfw SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - SCHEME_NAME=mbgl-core SCHEME_TYPE=library BUILDABLE_NAME=libmbgl-core.a BLUEPRINT_NAME=mbgl-core platform/macos/scripts/create_scheme.sh - SCHEME_NAME=mbgl-node SCHEME_TYPE=library BUILDABLE_NAME=mbgl-node.node BLUEPRINT_NAME=mbgl-node platform/macos/scripts/create_scheme.sh - - @# Create schemes for running node tests. These have all of the environment variables set to - @# launch in the correct location. - SCHEME_NAME="node tests" SCHEME_TYPE=node BUILDABLE_NAME=mbgl-node.node BLUEPRINT_NAME=mbgl-node NODE_ARGUMENT="`npm bin tape`/tape platform/node/test/js/**/*.test.js" platform/macos/scripts/create_scheme.sh - SCHEME_NAME="node render tests" SCHEME_TYPE=node BUILDABLE_NAME=mbgl-node.node BLUEPRINT_NAME=mbgl-node NODE_ARGUMENT="platform/node/test/render.test.js" platform/macos/scripts/create_scheme.sh - SCHEME_NAME="node query tests" SCHEME_TYPE=node BUILDABLE_NAME=mbgl-node.node BLUEPRINT_NAME=mbgl-node NODE_ARGUMENT="platform/node/test/query.test.js" platform/macos/scripts/create_scheme.sh - -$(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/macos/WorkspaceSettings.xcsettings - mkdir -p "$(MACOS_USER_DATA_PATH)" - cp platform/macos/WorkspaceSettings.xcsettings "$@" - -.PHONY: macos -macos: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'CI' build $(XCPRETTY) - -.PHONY: xproj -xproj: $(MACOS_PROJ_PATH) - open $(MACOS_WORK_PATH) - -.PHONY: test -test: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-test' build $(XCPRETTY) - -.PHONY: benchmark -benchmark: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-benchmark' build $(XCPRETTY) - -.PHONY: run-test -run-test: run-test-* - -run-test-%: test - ulimit -c unlimited && ($(MACOS_OUTPUT_PATH)/$(BUILDTYPE)/mbgl-test --gtest_catch_exceptions=0 --gtest_filter=$* & pid=$$! && wait $$pid \ - || (lldb -c /cores/core.$$pid --batch --one-line 'thread backtrace all' --one-line 'quit' && exit 1)) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'CI' test $(XCPRETTY) - -.PHONY: run-benchmark -run-benchmark: run-benchmark-. - -run-benchmark-%: benchmark - $(MACOS_OUTPUT_PATH)/$(BUILDTYPE)/mbgl-benchmark --benchmark_filter=$* - -.PHONY: glfw-app -glfw-app: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-glfw' build $(XCPRETTY) - -.PHONY: run-glfw-app -run-glfw-app: glfw-app - "$(MACOS_OUTPUT_PATH)/$(BUILDTYPE)/mbgl-glfw" - -.PHONY: render -render: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-render' build $(XCPRETTY) - -.PHONY: offline -offline: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-offline' build $(XCPRETTY) - -.PHONY: node -node: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'mbgl-node' build $(XCPRETTY) - -.PHONY: macos-test -macos-test: $(MACOS_PROJ_PATH) - set -o pipefail && $(MACOS_XCODEBUILD) -scheme 'CI' test $(XCPRETTY) - -.PHONY: xpackage -xpackage: $(MACOS_PROJ_PATH) - SYMBOLS=$(SYMBOLS) ./platform/macos/scripts/package.sh - -.PHONY: xdeploy -xdeploy: - caffeinate -i ./platform/macos/scripts/deploy-packages.sh - -.PHONY: xdocument -xdocument: - OUTPUT=$(OUTPUT) ./platform/macos/scripts/document.sh - -.PHONY: genstrings -genstrings: - genstrings -u -o platform/macos/sdk/Base.lproj platform/darwin/src/*.{m,mm} - genstrings -u -o platform/macos/sdk/Base.lproj platform/macos/src/*.{m,mm} - genstrings -u -o platform/ios/resources/Base.lproj platform/ios/src/*.{m,mm} - -find platform/ios/resources platform/macos/sdk -path '*/Base.lproj/*.strings' -exec \ - textutil -convert txt -extension strings -inputencoding UTF-16 -encoding UTF-8 {} \; - mv platform/macos/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/ - -$(MACOS_COMPDB_PATH)/Makefile: - mkdir -p $(MACOS_COMPDB_PATH) - (cd $(MACOS_COMPDB_PATH) && cmake ../../../.. \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON) - -.PHONY: -compdb: $(BUILD_DEPS) $(TEST_DEPS) $(MACOS_COMPDB_PATH)/Makefile - @$(MAKE) -C $(MACOS_COMPDB_PATH) cmake_check_build_system - -.PHONY: clang-tools -clang-tools: compdb - if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.9.1; fi - if test -z $(CLANG_FORMAT); then .mason/mason install clang-format 3.9.1; fi - $(MAKE) -C $(MACOS_COMPDB_PATH) mbgl-headers - -.PHONY: tidy -tidy: clang-tools - scripts/clang-tools.sh $(MACOS_COMPDB_PATH) - -.PHONY: check -check: clang-tools - scripts/clang-tools.sh $(MACOS_COMPDB_PATH) --diff - -endif - -#### iOS targets ############################################################## - -ifeq ($(HOST_PLATFORM), macos) - -IOS_OUTPUT_PATH = build/ios -IOS_PROJ_PATH = $(IOS_OUTPUT_PATH)/mbgl.xcodeproj -IOS_WORK_PATH = platform/ios/ios.xcworkspace -IOS_USER_DATA_PATH = $(IOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad - -IOS_XCODEBUILD_SIM = xcodebuild \ - ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES \ - -derivedDataPath $(IOS_OUTPUT_PATH) \ - -configuration $(BUILDTYPE) -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ - -workspace $(IOS_WORK_PATH) - -$(IOS_PROJ_PATH): $(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings $(BUILD_DEPS) - mkdir -p $(IOS_OUTPUT_PATH) - (cd $(IOS_OUTPUT_PATH) && cmake -G Xcode ../.. \ - -DCMAKE_TOOLCHAIN_FILE=../../platform/ios/toolchain.cmake \ - -DMBGL_PLATFORM=ios) - -$(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/ios/WorkspaceSettings.xcsettings - mkdir -p "$(IOS_USER_DATA_PATH)" - cp platform/ios/WorkspaceSettings.xcsettings "$@" - -.PHONY: ios -ios: $(IOS_PROJ_PATH) - set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' build $(XCPRETTY) - -.PHONY: iproj -iproj: $(IOS_PROJ_PATH) - open $(IOS_WORK_PATH) - -.PHONY: ios-test -ios-test: $(IOS_PROJ_PATH) - set -o pipefail && $(IOS_XCODEBUILD_SIM) -scheme 'CI' test $(XCPRETTY) - -.PHONY: ipackage -ipackage: $(IOS_PROJ_PATH) - FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ - ./platform/ios/scripts/package.sh - -.PHONY: ipackage-strip -ipackage-strip: $(IOS_PROJ_PATH) - FORMAT=$(FORMAT) BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO \ - ./platform/ios/scripts/package.sh - -.PHONY: ipackage-sim -ipackage-sim: $(IOS_PROJ_PATH) - BUILDTYPE=Debug FORMAT=dynamic BUILD_DEVICE=false SYMBOLS=$(SYMBOLS) \ - ./platform/ios/scripts/package.sh - -.PHONY: iframework -iframework: $(IOS_PROJ_PATH) - FORMAT=dynamic BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=$(SYMBOLS) \ - ./platform/ios/scripts/package.sh - -.PHONY: ifabric -ifabric: $(IOS_PROJ_PATH) - FORMAT=static BUILD_DEVICE=$(BUILD_DEVICE) SYMBOLS=NO SELF_CONTAINED=YES \ - ./platform/ios/scripts/package.sh - -.PHONY: ideploy -ideploy: - caffeinate -i ./platform/ios/scripts/deploy-packages.sh - -.PHONY: idocument -idocument: - OUTPUT=$(OUTPUT) ./platform/ios/scripts/document.sh - -.PHONY: darwin-style-code -darwin-style-code: - node platform/darwin/scripts/generate-style-code.js - node platform/darwin/scripts/update-examples.js -style-code: darwin-style-code - -.PHONY: darwin-update-examples -darwin-update-examples: - node platform/darwin/scripts/update-examples.js - -.PHONY: check-public-symbols -check-public-symbols: - node platform/darwin/scripts/check-public-symbols.js macOS -endif - -#### Linux targets ##################################################### - -ifeq ($(HOST_PLATFORM), linux) - -export PATH := $(shell pwd)/platform/linux:$(PATH) -export LINUX_OUTPUT_PATH = build/linux-$(shell uname -m)/$(BUILDTYPE) -LINUX_BUILD = $(LINUX_OUTPUT_PATH)/build.ninja - -$(LINUX_BUILD): $(BUILD_DEPS) - mkdir -p $(LINUX_OUTPUT_PATH) - (cd $(LINUX_OUTPUT_PATH) && cmake -G Ninja ../../.. \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ - -DWITH_COVERAGE=${WITH_COVERAGE} \ - -DIS_CI_BUILD=${CI} \ - -DWITH_OSMESA=${WITH_OSMESA} \ - -DWITH_EGL=${WITH_EGL}) - -.PHONY: linux -linux: glfw-app render offline - -.PHONY: test -test: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-test - -.PHONY: benchmark -benchmark: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-benchmark - -ifneq (,$(shell which gdb)) - GDB = gdb -batch -return-child-result -ex 'set print thread-events off' -ex 'run' -ex 'thread apply all bt' --args -endif - -.PHONY: run-test -run-test: run-test-* - -run-test-%: test - $(GDB) $(LINUX_OUTPUT_PATH)/mbgl-test --gtest_catch_exceptions=0 --gtest_filter=$* - -.PHONY: run-benchmark -run-benchmark: run-benchmark-. - -run-benchmark-%: benchmark - $(LINUX_OUTPUT_PATH)/mbgl-benchmark --benchmark_filter=$* - -.PHONY: render -render: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-render - -.PHONY: offline -offline: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-offline - -.PHONY: glfw-app -glfw-app: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-glfw - -.PHONY: run-glfw-app -run-glfw-app: glfw-app - cd $(LINUX_OUTPUT_PATH) && ./mbgl-glfw - -.PHONY: node -node: $(LINUX_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-node - -.PHONY: compdb -compdb: $(LINUX_BUILD) - # Ninja generator already outputs the file at the right location - -.PHONY: clang-tools -clang-tools: compdb - if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.9.1; fi - if test -z $(CLANG_FORMAT); then .mason/mason install clang-format 3.9.1; fi - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-headers - -.PHONY: tidy -tidy: clang-tools - scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) - -.PHONY: check -check: clang-tools - scripts/clang-tools.sh $(LINUX_OUTPUT_PATH) --diff - -endif - -#### Qt targets ##################################################### - -ifeq ($(WITH_QT_4), 1) -QT_ROOT_PATH = build/qt4-$(BUILD_PLATFORM)-$(BUILD_PLATFORM_VERSION) -else -QT_ROOT_PATH = build/qt-$(BUILD_PLATFORM)-$(BUILD_PLATFORM_VERSION) -endif - -ifneq (,$(shell which qmake)) -export QT_INSTALL_DOCS = $(shell qmake -query QT_INSTALL_DOCS) -endif - -export QT_OUTPUT_PATH = $(QT_ROOT_PATH)/$(BUILDTYPE) -QT_BUILD = $(QT_OUTPUT_PATH)/build.ninja - -$(QT_BUILD): $(BUILD_DEPS) - mkdir -p $(QT_OUTPUT_PATH) - (cd $(QT_OUTPUT_PATH) && cmake -G Ninja ../../.. \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DMBGL_PLATFORM=qt \ - -DMASON_PLATFORM=$(BUILD_PLATFORM) \ - -DMASON_PLATFORM_VERSION=$(BUILD_PLATFORM_VERSION) \ - -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ - -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_QT_4=${WITH_QT_4} \ - -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ - -DWITH_COVERAGE=${WITH_COVERAGE} \ - -DIS_CI_BUILD=${CI}) - -ifeq ($(HOST_PLATFORM), macos) - -MACOS_QT_PROJ_PATH = $(QT_ROOT_PATH)/xcode/mbgl.xcodeproj -$(MACOS_QT_PROJ_PATH): $(BUILD_DEPS) - mkdir -p $(QT_ROOT_PATH)/xcode - (cd $(QT_ROOT_PATH)/xcode && cmake -G Xcode ../../.. \ - -DMBGL_PLATFORM=qt \ - -DMASON_PLATFORM=$(BUILD_PLATFORM) \ - -DMASON_PLATFORM_VERSION=$(BUILD_PLATFORM_VERSION) \ - -DWITH_QT_DECODERS=${WITH_QT_DECODERS} \ - -DWITH_QT_I18N=${WITH_QT_I18N} \ - -DWITH_QT_4=${WITH_QT_4} \ - -DWITH_CXX11ABI=$(shell scripts/check-cxx11abi.sh) \ - -DWITH_COVERAGE=${WITH_COVERAGE} \ - -DIS_CI_BUILD=${CI}) - - @# Create Xcode schemes so that we can use xcodebuild from the command line. CMake doesn't - @# create these automatically. - XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-qt SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-qt-qml SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-test SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-benchmark SCHEME_TYPE=executable platform/macos/scripts/create_scheme.sh - XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=mbgl-core SCHEME_TYPE=library BUILDABLE_NAME=libmbgl-core.a BLUEPRINT_NAME=mbgl-core platform/macos/scripts/create_scheme.sh - XCODEPROJ=$(MACOS_QT_PROJ_PATH) SCHEME_NAME=qmapboxgl SCHEME_TYPE=library BUILDABLE_NAME=libqmapboxgl.dylib BLUEPRINT_NAME=qmapboxgl platform/macos/scripts/create_scheme.sh - -.PHONY: qtproj -qtproj: $(MACOS_QT_PROJ_PATH) - open $(MACOS_QT_PROJ_PATH) - -endif - -.PHONY: qt-lib -qt-lib: $(QT_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(QT_OUTPUT_PATH) qmapboxgl - -.PHONY: qt-app -qt-app: $(QT_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(QT_OUTPUT_PATH) mbgl-qt - -.PHONY: run-qt-app -run-qt-app: qt-app - $(QT_OUTPUT_PATH)/mbgl-qt - -.PHONY: qt-qml-app -qt-qml-app: $(QT_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(QT_OUTPUT_PATH) mbgl-qt-qml - -.PHONY: run-qt-qml-app -run-qt-qml-app: qt-qml-app - $(QT_OUTPUT_PATH)/mbgl-qt-qml - -.PHONY: qt-test -qt-test: $(QT_BUILD) - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(QT_OUTPUT_PATH) mbgl-test - -run-qt-test-%: qt-test - $(QT_OUTPUT_PATH)/mbgl-test --gtest_catch_exceptions=0 --gtest_filter=$* - -.PHONY: run-qt-test -run-qt-test: run-qt-test-* - -.PHONY: qt-docs -qt-docs: - qdoc $(shell pwd)/platform/qt/config.qdocconf --outputdir $(shell pwd)/$(QT_OUTPUT_PATH)/docs - -#### Node targets ############################################################## - -.PHONY: test-node -test-node: node - npm test - npm run test-suite - -#### Android targets ########################################################### - -MBGL_ANDROID_ENV = platform/android/scripts/toolchain.sh -MBGL_ANDROID_ABIS = arm-v5 arm-v7 arm-v8 x86 x86-64 mips -MBGL_ANDROID_LOCAL_WORK_DIR = /data/local/tmp/core-tests -MBGL_ANDROID_LIBDIR = lib$(if $(filter arm-v8 x86-64,$1),64) -MBGL_ANDROID_DALVIKVM = dalvikvm$(if $(filter arm-v8 x86-64,$1),64,32) -MBGL_ANDROID_APK_SUFFIX = $(if $(filter Release,$(BUILDTYPE)),release-unsigned,debug) -MBGL_ANDROID_CORE_TEST_DIR = build/android-$1/$(BUILDTYPE)/core-tests - -.PHONY: android-style-code -android-style-code: - node platform/android/scripts/generate-style-code.js -style-code: android-style-code - -define ANDROID_RULES - -build/android-$1/$(BUILDTYPE): $(BUILD_DEPS) - mkdir -p build/android-$1/$(BUILDTYPE) - -build/android-$1/$(BUILDTYPE)/toolchain.cmake: platform/android/scripts/toolchain.sh build/android-$1/$(BUILDTYPE) - $(MBGL_ANDROID_ENV) $1 > build/android-$1/$(BUILDTYPE)/toolchain.cmake - -build/android-$1/$(BUILDTYPE)/Makefile: build/android-$1/$(BUILDTYPE)/toolchain.cmake platform/android/config.cmake - cd build/android-$1/$(BUILDTYPE) && cmake ../../.. -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE=build/android-$1/$(BUILDTYPE)/toolchain.cmake \ - -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DMBGL_PLATFORM=android - -.PHONY: android-test-lib-$1 -android-test-lib-$1: build/android-$1/$(BUILDTYPE)/Makefile - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C build/android-$1/$(BUILDTYPE) mbgl-test - -.PHONY: android-lib-$1 -android-lib-$1: build/android-$1/$(BUILDTYPE)/Makefile - $(NINJA) $(NINJA_ARGS) -j$(JOBS) -C build/android-$1/$(BUILDTYPE) mapbox-gl example-custom-layer - -.PHONY: android-$1 -android-$1: android-lib-$1 - cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) - -.PHONY: android-core-test-$1 -android-core-test-$1: android-test-lib-$1 - mkdir -p $(MBGL_ANDROID_CORE_TEST_DIR) - - # Compile main sources and extract the classes (using the test app to get all transitive dependencies in one place) - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:assemble$(BUILDTYPE) - unzip -o platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-$(MBGL_ANDROID_APK_SUFFIX).apk classes.dex -d $(MBGL_ANDROID_CORE_TEST_DIR) - - # Compile Test runner - find platform/android/src/test -name "*.java" > $(MBGL_ANDROID_CORE_TEST_DIR)/java-sources.txt - javac -sourcepath platform/android/src/test -d $(MBGL_ANDROID_CORE_TEST_DIR) -source 1.7 -target 1.7 @$(MBGL_ANDROID_CORE_TEST_DIR)/java-sources.txt - - # Combine and dex - cd $(MBGL_ANDROID_CORE_TEST_DIR) && $(ANDROID_HOME)/build-tools/25.0.0/dx --dex --output=test.jar *.class classes.dex - -run-android-core-test-$1-%: android-core-test-$1 - # Ensure clean state on the device - adb shell "rm -Rf $(MBGL_ANDROID_LOCAL_WORK_DIR) && mkdir -p $(MBGL_ANDROID_LOCAL_WORK_DIR)/test" - - # Generate zipped asset files - cd test/fixtures/api && zip -r assets.zip assets && cd - - cd test/fixtures/storage && zip -r assets.zip assets && cd - - - # Push all needed files to the device - adb push $(MBGL_ANDROID_CORE_TEST_DIR)/test.jar $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - adb push test/fixtures $(MBGL_ANDROID_LOCAL_WORK_DIR)/test > /dev/null 2>&1 - adb push build/android-$1/$(BUILDTYPE)/stripped/libmapbox-gl.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - adb push build/android-$1/$(BUILDTYPE)/stripped/libmbgl-test.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 - - # Kick off the tests - adb shell "export LD_LIBRARY_PATH=/system/$(MBGL_ANDROID_LIBDIR):$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && $(MBGL_ANDROID_DALVIKVM) -cp $(MBGL_ANDROID_LOCAL_WORK_DIR)/test.jar Main --gtest_filter=$$*" - - # Gather the results and unpack them - adb shell "cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && tar -cvzf results.tgz test/fixtures/* > /dev/null 2>&1" - adb pull $(MBGL_ANDROID_LOCAL_WORK_DIR)/results.tgz $(MBGL_ANDROID_CORE_TEST_DIR)/ > /dev/null 2>&1 - rm -rf $(MBGL_ANDROID_CORE_TEST_DIR)/results && mkdir -p $(MBGL_ANDROID_CORE_TEST_DIR)/results - tar -xzf $(MBGL_ANDROID_CORE_TEST_DIR)/results.tgz --strip-components=2 -C $(MBGL_ANDROID_CORE_TEST_DIR)/results - -.PHONY: run-android-core-test-$1 -run-android-core-test-$1: run-android-core-test-$1-* - -.PHONY: run-android-$1 -run-android-$1: android-$1 - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:install$(BUILDTYPE) && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity - -apackage: android-lib-$1 -endef - -$(foreach abi,$(MBGL_ANDROID_ABIS),$(eval $(call ANDROID_RULES,$(abi)))) - -.PHONY: android -android: android-arm-v7 - -.PHONY: run-android -run-android: run-android-arm-v7 - -.PHONY: run-android-unit-test -run-android-unit-test: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:testDebugUnitTest --continue - -run-android-unit-test-%: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:testDebugUnitTest --tests "$*" - -.PHONY: run-android-wear-unit-test -run-android-wear-unit-test: - cd platform/android && ./gradlew :MapboxGLAndroidSDKWearTestApp:testDebugUnitTest --continue - -.PHONY: android-ui-test -android-ui-test: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:assembleDebug --continue && ./gradlew :MapboxGLAndroidSDKTestApp:assembleAndroidTest --continue - -.PHONY: run-android-ui-test -run-android-ui-test: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -i - -run-android-ui-test-%: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$*" - -.PHONY: run-android-ui-test-aws -run-android-ui-test-aws: - cd platform/android && ./gradlew devicefarmUpload - -.PHONY: run-android-ui-test-spoon -run-android-ui-test-spoon: - cd platform/android && ./gradlew spoon - -.PHONY: apackage -apackage: - cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE) - -.PHONY: test-code-android -test-code-android: - node platform/android/scripts/generate-test-code.js - -.PHONY: android-ndk-stack -android-ndk-stack: - adb logcat | ndk-stack -sym build/android-arm-v7/Debug - -.PHONY: android-checkstyle -android-checkstyle: - cd platform/android && ./gradlew checkstyle - -#### Miscellaneous targets ##################################################### - -.PHONY: style-code -style-code: - node scripts/generate-style-code.js - -.PHONY: clean -clean: - -rm -rf ./build \ - ./platform/android/MapboxGLAndroidSDK/build \ - ./platform/android/MapboxGLAndroidSDKTestApp/build \ - ./platform/android/MapboxGLAndroidSDKWearTestApp/build \ - ./platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen \ - ./platform/android/MapboxGLAndroidSDK/src/main/jniLibs \ - ./platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs \ - ./platform/android/MapboxGLAndroidSDK/src/main/assets - -.PHONY: distclean -distclean: clean - -rm -rf ./mason_packages - -rm -rf ./node_modules diff --git a/mapbox-gl-js b/mapbox-gl-js deleted file mode 160000 index 2663093c9..000000000 --- a/mapbox-gl-js +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2663093c9d7f0cba6235131fb9b9f30328a76603 diff --git a/platform/ios/uitest/KIF b/platform/ios/uitest/KIF deleted file mode 160000 index 973a4cb65..000000000 --- a/platform/ios/uitest/KIF +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 973a4cb653b54c3e8b2c0681f4097568ff0ac345 diff --git a/platform/ios/uitest/OHHTTPStubs b/platform/ios/uitest/OHHTTPStubs deleted file mode 160000 index deed01a15..000000000 --- a/platform/ios/uitest/OHHTTPStubs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit deed01a1592210a4c37f3f5c5f2b32fe0e41c605 diff --git a/platform/ios/vendor/SMCalloutView b/platform/ios/vendor/SMCalloutView deleted file mode 160000 index d6ecaba37..000000000 --- a/platform/ios/vendor/SMCalloutView +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d6ecaba377c9f963aef630faf86e3b8f8cdb88d1 -- cgit v1.2.3