[ios, osx] Drop xcpretty

It's buggy and hides necessary diagnostics.
This commit is contained in:
John Firebaugh
2015-12-21 16:59:35 -08:00
parent 4a18e1cf77
commit 3d37017c68
7 changed files with 3 additions and 17 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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"

View File

@@ -1,3 +0,0 @@
#!/usr/bin/env bash
FN=$(which xcpretty) ; [ ! -z ${FN} ] && echo "| ${FN}"