[ios, osx] The return of xcpretty, part II

mapbox · Apr 3, 2016 · 585709b · 585709b
1 parent a7b9a4f
commit 585709b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
@@ -94,7 +94,7 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
             -project ./build/ios-all/gyp/mbgl.xcodeproj \
             -configuration ${BUILDTYPE} \
             -target everything \
-            -jobs ${JOBS}
+            -jobs ${JOBS} | xcpretty
     fi
 
     if [[ ${BUILD_DYNAMIC} == true ]]; then
@@ -111,7 +111,7 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
             -project ./build/ios-all/gyp/ios.xcodeproj \
             -configuration ${BUILDTYPE} \
             -target iossdk \
-            -jobs ${JOBS}
+            -jobs ${JOBS} | xcpretty
     fi
 fi
 
@@ -124,7 +124,7 @@ if [[ ${BUILD_STATIC} == true ]]; then
         -project ./build/ios-all/gyp/mbgl.xcodeproj \
         -configuration ${BUILDTYPE} \
         -target everything \
-        -jobs ${JOBS}
+        -jobs ${JOBS} | xcpretty
 fi
 
 if [[ ${BUILD_DYNAMIC} == true ]]; then
@@ -138,7 +138,7 @@ if [[ ${BUILD_DYNAMIC} == true ]]; then
         -project ./build/ios-all/gyp/ios.xcodeproj \
         -configuration ${BUILDTYPE} \
         -target iossdk \
-        -jobs ${JOBS}
+        -jobs ${JOBS} | xcpretty
 fi
 
 LIBS=(core.a platform-ios.a asset-fs.a http-nsurl.a)

diff --git a/platform/ios/scripts/test.sh b/platform/ios/scripts/test.sh
@@ -13,7 +13,7 @@ xcodebuild \
     -sdk iphonesimulator \
     -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \
     -derivedDataPath ./build/ios/test \
-    build
+    build | xcpretty
 
 ios-sim start
 ios-sim launch ./build/ios/test/Build/Products/Debug-iphonesimulator/ios-test.app
@@ -23,4 +23,4 @@ xcodebuild \
     -scheme 'Mapbox GL Tests' \
     -sdk iphonesimulator \
     -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \
-    test
+    test | xcpretty
diff --git a/platform/osx/scripts/package.sh b/platform/osx/scripts/package.sh
@@ -37,7 +37,7 @@ xcodebuild -sdk macosx${OSX_SDK_VERSION} \
     -project ./build/osx-x86_64/gyp/osx.xcodeproj \
     -configuration ${BUILDTYPE} \
     -target osxsdk \
-    -jobs ${JOBS}
+    -jobs ${JOBS} | xcpretty
 
 TARGET_BUILD_DIR=gyp/build/${BUILDTYPE}
 INFOPLIST_PATH=Mapbox.framework/Versions/Current/Resources/Info.plist

diff --git a/platform/osx/scripts/test.sh b/platform/osx/scripts/test.sh
@@ -16,4 +16,4 @@ xcodebuild -verbose \
     -sdk macosx${OSX_SDK_VERSION} \
     -project "${OSX_PROJ_PATH}" \
     -scheme osxsdk \
-    test
+    test | xcpretty
diff --git a/scripts/main.mk b/scripts/main.mk
@@ -133,7 +133,7 @@ Xcode/node: Xcode/__project__ node/xproj
 		-project ./build/binding.xcodeproj \
 		-configuration $(BUILDTYPE) \
 		-target mapbox-gl-native \
-		-jobs $(JOBS)
+		-jobs $(JOBS) | xcpretty
 
 Xcode/%: Xcode/__project__
 	@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n"
@@ -142,7 +142,7 @@ Xcode/%: Xcode/__project__
 		-project ./build/$(HOST_SLUG)/gyp/$(HOST).xcodeproj \
 		-configuration $(BUILDTYPE) \
 		-target $* \
-		-jobs $(JOBS)
+		-jobs $(JOBS) | xcpretty
 
 Ninja/%: Ninja/__project__
 	@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target $*...$(FORMAT_END)\n"