Use xcpretty to filter Xcode output instead of a regex

livecodefraser · livecodefraser · commit 995a89ecacb1 · 2016-07-01T11:54:47.000+01:00
It is prettier and more robust.
diff --git a/.travis.yml b/.travis.yml
@@ -33,6 +33,10 @@ env:
    - secure: "R/JfoBMrkhCGWhfWM1m3gPHuLtMBlp2SIK1R9BaPbRsbGBUJmAg9V0g0YXSaw8SVxoyuiL/jsLtHPfDeub9oTxrYydew+6/4KaoQdG7EGXQJfBhH2f0ag/hTKJfXnmZX9jMMnTxPf5Axjq+w4E6sKkU2+d1oAJRhrqzYNwDhVlc="
    - CXX_STD: "c++11"
 
+# Install any required tools
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then sudo gem install xcpretty ; fi
+
 # Set up the source tree by fetching Linux-specific prebuilt objects
 install: 
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then (cd prebuilt && ./fetch-libraries.sh linux) ; fi
diff --git a/Makefile b/Makefile
@@ -53,6 +53,14 @@ else
   BUILD_PROJECT := livecode
 endif
 
+# Prettifying output for CI builds
+ifeq ($(TRAVIS),true)
+  XCODEBUILD := set -o pipefail && $(XCODEBUILD)
+  XCODEBUILD_FILTER := | xcpretty
+else
+  XCODEBUILD_FILTER :=
+endif 
+
 ################################################################
 
 .DEFAULT: all
@@ -132,10 +140,11 @@ config-mac:
 
 compile-mac:
 	$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target default \
-	  | egrep '^(/.+:[0-9+:[0-9]+:.(error|warning):|fatal|===)'
+	  $(XCODEBUILD_FILTER)
 
 check-mac:
-	$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check
+	$(XCODEBUILD) -project "build-mac$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check \
+	  $(XCODEBUILD_FILTER)
 	$(MAKE) check-common-mac
 
 
