diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-21 16:59:35 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-21 16:59:35 -0800 |
| commit | 3d37017c6858c31d0e62414b410e96a4fcd4fa99 (patch) | |
| tree | b40c9dc286ea4fced605cb94d2f8d4c326608079 | |
| parent | 4a18e1cf770cc328a5ef349abcdb44ec6b7f4c3f (diff) | |
| download | qtlocation-mapboxgl-3d37017c6858c31d0e62414b410e96a4fcd4fa99.tar.gz | |
[ios, osx] Drop xcpretty
It's buggy and hides necessary diagnostics.
| -rw-r--r-- | INSTALL.md | 1 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | platform/ios/scripts/install.sh | 3 | ||||
| -rwxr-xr-x | platform/ios/scripts/test.sh | 3 | ||||
| -rwxr-xr-x | platform/osx/scripts/install.sh | 3 | ||||
| -rw-r--r-- | scripts/main.mk | 6 | ||||
| -rwxr-xr-x | scripts/xcpretty.sh | 3 |
7 files changed, 3 insertions, 17 deletions
diff --git a/INSTALL.md b/INSTALL.md index e03d5056ca..9eee0e27ed 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -47,7 +47,6 @@ dependencies: - Apple Command Line Tools (available at [Apple Developer](https://developer.apple.com/downloads)) - [Homebrew](http://brew.sh) - - [xcpretty](https://github.com/supermarin/xcpretty) - [Cask](http://caskroom.io/) (if building for Android) ## 3: Setting up a development environment & building @@ -6,7 +6,6 @@ export BUILD_RENDER ?= 1 ifeq ($(shell uname -s), Darwin) export BUILD = osx export JOBS ?= $(shell sysctl -n hw.ncpu) -export XCPRETTY := $(shell ./scripts/xcpretty.sh) else ifeq ($(shell uname -s), Linux) export BUILD = linux export JOBS ?= $(shell grep --count processor /proc/cpuinfo) diff --git a/platform/ios/scripts/install.sh b/platform/ios/scripts/install.sh index b002aeeca8..23000e160b 100755 --- a/platform/ios/scripts/install.sh +++ b/platform/ios/scripts/install.sh @@ -8,9 +8,6 @@ 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 diff --git a/platform/ios/scripts/test.sh b/platform/ios/scripts/test.sh index 60ccc76a9e..2192ac7f4d 100755 --- a/platform/ios/scripts/test.sh +++ b/platform/ios/scripts/test.sh @@ -10,5 +10,4 @@ xcodebuild \ -sdk iphonesimulator \ -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ -destination 'platform=iOS Simulator,name=iPad 2,OS=latest' \ - test \ - | xcpretty + test diff --git a/platform/osx/scripts/install.sh b/platform/osx/scripts/install.sh index d6d9c065cf..0f9b5a2752 100755 --- a/platform/osx/scripts/install.sh +++ b/platform/osx/scripts/install.sh @@ -5,6 +5,3 @@ 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/main.mk b/scripts/main.mk index afbb34f56a..e8fd6d3764 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -131,8 +131,7 @@ Xcode/node: Xcode/__project__ node/xproj -project ./build/binding.xcodeproj \ -configuration $(BUILDTYPE) \ -target mapbox-gl-native \ - -jobs $(JOBS) \ - $(XCPRETTY) + -jobs $(JOBS) Xcode/%: Xcode/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" @@ -141,8 +140,7 @@ Xcode/%: Xcode/__project__ -project ./build/$(HOST_SLUG)/gyp/$(HOST).xcodeproj \ -configuration $(BUILDTYPE) \ -target $* \ - -jobs $(JOBS) \ - $(XCPRETTY) + -jobs $(JOBS) Ninja/%: Ninja/__project__ @printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n" diff --git a/scripts/xcpretty.sh b/scripts/xcpretty.sh deleted file mode 100755 index c39f588220..0000000000 --- a/scripts/xcpretty.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -FN=$(which xcpretty) ; [ ! -z ${FN} ] && echo "| ${FN}" |