From 79eb3415370fe88da6046bb863978f9d7eeefd14 Mon Sep 17 00:00:00 2001 From: Yavor Georgiev Date: Fri, 22 Jan 2016 16:25:36 +0200 Subject: [PATCH 1/3] Pipe build logs through XCPretty --- build/scripts/build.sh | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/build/scripts/build.sh b/build/scripts/build.sh index ccb32e399..df69c69de 100755 --- a/build/scripts/build.sh +++ b/build/scripts/build.sh @@ -4,6 +4,14 @@ set -e WORKSPACE=`pwd` +function xcodebuild_pretty { + XCFORMATTER=tee + if hash xcpretty 2>/dev/null; then + XCFORMATTER=xcpretty + fi + set -o pipefail && xcodebuild "$@" 2>&1 | tee -a "$WORKSPACE/build.log" | $XCFORMATTER +} + CMAKE_FLAGS="-G Xcode -DCMAKE_INSTALL_PREFIX=$WORKSPACE/dist" mkdir -p "$WORKSPACE/cmake-build" @@ -11,12 +19,13 @@ cd "$WORKSPACE/cmake-build" echo "Building NativeScript.framework..." rm -f CMakeCache.txt -echo "\tConfiguring..." -cmake .. $CMAKE_FLAGS -DBUILD_SHARED_LIBS=ON > "$WORKSPACE/build.log" 2>&1 -echo "\tiPhoneOS..." -xcodebuild -configuration Release -sdk iphoneos -target NativeScript >> "$WORKSPACE/build.log" 2>&1 -echo "\tiPhoneSimulator..." -xcodebuild -configuration Release -sdk iphonesimulator -target NativeScript >> "$WORKSPACE/build.log" 2>&1 +rm -f "$WORKSPACE/build.log" +echo -e "\tConfiguring..." +cmake .. $CMAKE_FLAGS -DBUILD_SHARED_LIBS=ON 2>&1 | tee -a "$WORKSPACE/build.log" +echo -e "\tiPhoneOS..." +xcodebuild_pretty -configuration Release -sdk iphoneos -target NativeScript +echo -e "\tiPhoneSimulator..." +xcodebuild_pretty -configuration Release -sdk iphonesimulator -target NativeScript echo "Packaging NativeScript.framework..." mkdir -p "$WORKSPACE/dist" @@ -29,12 +38,12 @@ lipo -create -output "$WORKSPACE/dist/NativeScript.framework/NativeScript" \ echo "Building libNativeScript..." rm -f CMakeCache.txt -echo "\tConfiguring..." -cmake .. $CMAKE_FLAGS -DEMBED_STATIC_DEPENDENCIES=ON >> "$WORKSPACE/build.log" -echo "\tiPhoneOS..." -xcodebuild -configuration Release -sdk iphoneos -target NativeScript >> "$WORKSPACE/build.log" 2>&1 -echo "\tiPhoneSimulator..." -xcodebuild -configuration Release -sdk iphonesimulator -target NativeScript >> "$WORKSPACE/build.log" 2>&1 +echo -e "\tConfiguring..." +cmake .. $CMAKE_FLAGS -DEMBED_STATIC_DEPENDENCIES=ON 2>&1 | tee -a "$WORKSPACE/build.log" +echo -e "\tiPhoneOS..." +xcodebuild_pretty -configuration Release -sdk iphoneos -target NativeScript +echo -e "\tiPhoneSimulator..." +xcodebuild_pretty -configuration Release -sdk iphonesimulator -target NativeScript echo "Packaging libNativeScript..." mkdir -p "$WORKSPACE/dist/NativeScript/lib" @@ -52,13 +61,13 @@ cp \ "$WORKSPACE/dist/NativeScript/include" echo "Building objc-metadata-generator..." -xcodebuild -configuration Release -target MetadataGenerator >> "$WORKSPACE/build.log" 2>&1 +xcodebuild_pretty -configuration Release -target MetadataGenerator echo "Packaging objc-metadata-generator..." cp -R "$WORKSPACE/cmake-build/metadataGenerator" "$WORKSPACE/dist/" cp "$WORKSPACE/build/scripts/metadata-generation-build-step" "$WORKSPACE/dist/metadataGenerator/bin/" echo "Building Gameraww..." -xcodebuild -configuration Release -sdk iphoneos -target Gameraww >> "$WORKSPACE/build.log" 2>&1 +xcodebuild_pretty -configuration Release -sdk iphoneos -target Gameraww echo "Packaging Gameraww..." xcrun -sdk iphoneos PackageApplication -v "$WORKSPACE/cmake-build/examples/Gameraww/Release-iphoneos/Gameraww.app" \ -o "$WORKSPACE/cmake-build/examples/Gameraww/Release-iphoneos/Gameraww.ipa" \ @@ -68,8 +77,11 @@ echo "TNS_IPA_SIZE: "$GAMERAWW_IPA_SIZE"KB" echo "TNS_IPA_SIZE_KB\\n"$GAMERAWW_IPA_SIZE > "$WORKSPACE/build-stats.csv" echo "Building TestRunner..." -xcodebuild -configuration Debug -sdk iphoneos -target TestRunner ARCHS="armv7" ONLY_ACTIVE_ARCH=NO >> "$WORKSPACE/build.log" 2>&1 +xcodebuild_pretty -configuration Debug -sdk iphoneos -target TestRunner ARCHS="armv7" ONLY_ACTIVE_ARCH=NO echo "Packaging TestRunner..." xcrun -sdk iphoneos PackageApplication -v "$WORKSPACE/cmake-build/tests/TestRunner/Debug-iphoneos/TestRunner.app" \ + -o "$WORKSPACE/cmake-build/tests/TestRunner/Debug-iphoneos/TestRunner.ipa" \ + >> "$WORKSPACE/build.log" 2>&1 +TestRunner/Debug-iphoneos/TestRunner.app" \ -o "$WORKSPACE/cmake-build/tests/TestRunner/Debug-iphoneos/TestRunner.ipa" \ >> "$WORKSPACE/build.log" 2>&1 \ No newline at end of file From b316d05f0fb88b657f9ef5371f8aa667f0fa8fea Mon Sep 17 00:00:00 2001 From: Yavor Georgiev Date: Fri, 22 Jan 2016 16:43:07 +0200 Subject: [PATCH 2/3] Inhibit all warnings when building WebKit --- build/scripts/buildWebKitFromWithinXcode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/buildWebKitFromWithinXcode.sh b/build/scripts/buildWebKitFromWithinXcode.sh index 7138aae29..78ae15633 100755 --- a/build/scripts/buildWebKitFromWithinXcode.sh +++ b/build/scripts/buildWebKitFromWithinXcode.sh @@ -1,3 +1,3 @@ #!/bin/bash -xcodebuild -target JavaScriptCore -sdk "$SDKROOT" -configuration $CONFIGURATION ARCHS="$ARCHS" ONLY_ACTIVE_ARCH=$ONLY_ACTIVE_ARCH $DEPLOYMENT_TARGET_SETTING_NAME=${!DEPLOYMENT_TARGET_CLANG_ENV_NAME} \ No newline at end of file +xcodebuild -target JavaScriptCore -sdk "$SDKROOT" -configuration $CONFIGURATION ARCHS="$ARCHS" ONLY_ACTIVE_ARCH=$ONLY_ACTIVE_ARCH $DEPLOYMENT_TARGET_SETTING_NAME=${!DEPLOYMENT_TARGET_CLANG_ENV_NAME} GCC_WARN_INHIBIT_ALL_WARNINGS=YES From e4fdd084e88e7799e787603765a81a7013982630 Mon Sep 17 00:00:00 2001 From: Yavor Georgiev Date: Thu, 28 Jan 2016 15:32:29 +0200 Subject: [PATCH 3/3] Don't emit build logs to stdout if xcpretty is not present --- build/scripts/build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/scripts/build.sh b/build/scripts/build.sh index df69c69de..8274513ae 100755 --- a/build/scripts/build.sh +++ b/build/scripts/build.sh @@ -5,7 +5,7 @@ set -e WORKSPACE=`pwd` function xcodebuild_pretty { - XCFORMATTER=tee + XCFORMATTER=true if hash xcpretty 2>/dev/null; then XCFORMATTER=xcpretty fi @@ -82,6 +82,3 @@ echo "Packaging TestRunner..." xcrun -sdk iphoneos PackageApplication -v "$WORKSPACE/cmake-build/tests/TestRunner/Debug-iphoneos/TestRunner.app" \ -o "$WORKSPACE/cmake-build/tests/TestRunner/Debug-iphoneos/TestRunner.ipa" \ >> "$WORKSPACE/build.log" 2>&1 -TestRunner/Debug-iphoneos/TestRunner.app" \ - -o "$WORKSPACE/cmake-build/tests/TestRunner/Debug-iphoneos/TestRunner.ipa" \ - >> "$WORKSPACE/build.log" 2>&1 \ No newline at end of file