[Libreoffice-commits] core.git: ios/CustomTarget_TiledLibreOffice_app.mk

Tor Lillqvist tml at collabora.com
Sun May 25 23:56:16 PDT 2014


 ios/CustomTarget_TiledLibreOffice_app.mk |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ba97e26d417f6465b501502e02bcdd02eb209344
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon May 26 09:54:37 2014 +0300

    Print the xcodebuild output (including errors) if it has failed
    
    Change-Id: I9c1074f49ca8cd1c3c97581ae45cbb8ac1855b71

diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk
index 5ca37a9..01ca06f 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -14,7 +14,14 @@ BUILDID			:=$(shell cd $(SRCDIR) && git log -1 --format=%H)
 #- Macros ---------------------------------------------------------------------
 
 define TiledLibreOfficeXcodeBuild
-	CC=;xcodebuild -project experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj -target TiledLibreOffice -arch $(XCODE_ARCHS) -configuration $(if $(ENABLE_DEBUG),Debug,Release) $(1) $(if $(verbose)$(VERBOSE),,>/dev/null)
+	CC=; \
+	tempfile=`mktemp -t customtarget.tiledlibreoffice.XXXXXX`; \
+	xcodebuild \
+		-project experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj \
+		-target TiledLibreOffice \
+		-arch $(XCODE_ARCHS) \
+		-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
+		$(1) $(if $(verbose)$(VERBOSE),,>$tempfile; test $$? = 0 || cat $tempfile; rm $tempfile)
 endef
 
 #- Targets --------------------------------------------------------------------


More information about the Libreoffice-commits mailing list