Merge pull request #1023 from NativeScript/bektchiev/framework-linking-optimizations

NativeScript.framework linking optimizations

Author: mbektchiev

CMakeLists.txt

@@ -49,6 +49,10 @@ set(INFO_PLIST_TEMPLATE "${CMAKE_SOURCE_DIR}/cmake/Info.plist")
 #WTF uses char16_t for UCHAR_TYPE and we need to match it
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -stdlib=libc++ -DUCHAR_TYPE=char16_t")
 
+# Override RelWithDebInfo configuration's default optimization O2 to O3
+# because we've started releasing NativeScript.framework from it
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")
+
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG=1")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")
 

build/scripts/build-livesync-static-lib.sh

@@ -33,6 +33,7 @@ xcodebuild \
     -quiet
 
 checkpoint "Packaging TKLiveSync.framework"
+rm -rf "$WORKSPACE/dist/TKLiveSync"
 mkdir -p "$WORKSPACE/dist/TKLiveSync/"
 cp -r "build/Release-iphoneos/TKLiveSync.framework/Headers" "$WORKSPACE/dist/TKLiveSync"
 mv "$WORKSPACE/dist/TKLiveSync/Headers" "$WORKSPACE/dist/TKLiveSync/include"

build/scripts/build-nativescript-framework.sh

@@ -4,6 +4,8 @@ set -e
 
 source "$(dirname "$0")/common.sh"
 
+CONFIGURATION=$NATIVESCRIPT_XCODE_CONFIGURATION
+
 checkpoint "Building NativeScript.framework"
 
 mkdir -p "$WORKSPACE/cmake-build" && pushd "$_"
@@ -12,26 +14,34 @@ rm -f "CMakeCache.txt"
 cmake .. -G"Xcode" -D"BUILD_SHARED_LIBS=ON"
 # TODO: fix build when iphoneos build is started first
 checkpoint "Building NativeScript.framework - iphonesimulator SDK"
-xcodebuild -configuration "RelWithDebInfo" -sdk "iphonesimulator" -target "NativeScript" -quiet
+xcodebuild -configuration $CONFIGURATION -sdk "iphonesimulator" -target "NativeScript" -quiet
 checkpoint "Building NativeScript.framework - iphoneos SDK"
-xcodebuild -configuration "RelWithDebInfo" -sdk "iphoneos" -target "NativeScript" -quiet
+xcodebuild -configuration $CONFIGURATION -sdk "iphoneos" -target "NativeScript" -quiet
 popd
 
 checkpoint "Packaging NativeScript.framework"
 mkdir -p "$DIST_DIR" && pushd "$_"
-cp -r "$WORKSPACE/cmake-build/src/NativeScript/RelWithDebInfo-iphoneos/NativeScript.framework" "."
+cp -r "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphoneos/NativeScript.framework" "."
 rm "NativeScript.framework/NativeScript"
+
+# Strip debug information, dSYM package must be used for debugging and symbolicating
+strip -S "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphonesimulator/NativeScript.framework/NativeScript" \
+    "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphoneos/NativeScript.framework/NativeScript"
+echo "CodeSign $WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphonesimulator/NativeScript.framework/NativeScript"
+
+/usr/bin/codesign --force --sign - --timestamp=none "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphonesimulator/NativeScript.framework/NativeScript"
+
 lipo -create -output "NativeScript.framework/NativeScript" \
-    "$WORKSPACE/cmake-build/src/NativeScript/RelWithDebInfo-iphonesimulator/NativeScript.framework/NativeScript" \
-    "$WORKSPACE/cmake-build/src/NativeScript/RelWithDebInfo-iphoneos/NativeScript.framework/NativeScript"
+    "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphonesimulator/NativeScript.framework/NativeScript" \
+    "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphoneos/NativeScript.framework/NativeScript"
 
-cp -r "$WORKSPACE/cmake-build/src/NativeScript/RelWithDebInfo-iphoneos/NativeScript.framework.dSYM" "."
+cp -r "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphoneos/NativeScript.framework.dSYM" "."
 rm "NativeScript.framework.dSYM/Contents/Resources/DWARF/NativeScript"
 lipo -create -output "NativeScript.framework.dSYM/Contents/Resources/DWARF/NativeScript" \
-    "$WORKSPACE/cmake-build/src/NativeScript/RelWithDebInfo-iphonesimulator/NativeScript.framework.dSYM/Contents/Resources/DWARF/NativeScript" \
-    "$WORKSPACE/cmake-build/src/NativeScript/RelWithDebInfo-iphoneos/NativeScript.framework.dSYM/Contents/Resources/DWARF/NativeScript"
+    "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphonesimulator/NativeScript.framework.dSYM/Contents/Resources/DWARF/NativeScript" \
+    "$WORKSPACE/cmake-build/src/NativeScript/$CONFIGURATION-iphoneos/NativeScript.framework.dSYM/Contents/Resources/DWARF/NativeScript"
 
-tar -zcf NativeScript.framework.dSYM.tgz NativeScript.framework.dSYM
+zip -qr NativeScript.framework.dSYM.zip NativeScript.framework.dSYM
 rm -rf NativeScript.framework.dSYM
 
 popd

build/scripts/build-testrunner-application.sh

@@ -3,10 +3,10 @@
 set -e
 set -o pipefail
 
-CONFIGURATION="Release"
-
 source "$(dirname "$0")/common.sh"
 
+CONFIGURATION=$NATIVESCRIPT_XCODE_CONFIGURATION
+
 checkpoint "Building TestRunner application"
 
 mkdir -p "$WORKSPACE/cmake-build" && pushd "$_"
@@ -25,12 +25,14 @@ xcodebuild \
 -scheme "TestRunner" \
 ARCHS="armv7 arm64" \
 ONLY_ACTIVE_ARCH="NO" \
+-quiet \
 
 xcodebuild archive \
 -archivePath "$WORKSPACE/cmake-build/tests/TestRunner/$CONFIGURATION-iphoneos/TestRunner.xcarchive" \
 -configuration "$CONFIGURATION" \
 -sdk "iphoneos" \
--scheme "TestRunner"
+-scheme "TestRunner" \
+-quiet \
 
 popd
 
@@ -39,7 +41,8 @@ xcodebuild \
 -exportArchive \
 -archivePath "$WORKSPACE/cmake-build/tests/TestRunner/$CONFIGURATION-iphoneos/TestRunner.xcarchive" \
 -exportPath "$WORKSPACE/cmake-build/tests/TestRunner/$CONFIGURATION-iphoneos" \
--exportOptionsPlist "$WORKSPACE/cmake/ExportOptions.plist"
+-exportOptionsPlist "$WORKSPACE/cmake/ExportOptions.plist" \
+-quiet \
 
 cp "$WORKSPACE/cmake-build/tests/TestRunner/$CONFIGURATION-iphoneos/TestRunner.ipa" "$DIST_DIR"
 

build/scripts/common.sh

@@ -12,6 +12,7 @@ function checkpoint {
 
 WORKSPACE=$(pwd)
 DIST_DIR="$WORKSPACE/dist"
+NATIVESCRIPT_XCODE_CONFIGURATION="RelWithDebInfo"
 
 if [ ! -d "$WORKSPACE/build/scripts" ]; then
     echo "This script must be run from the root of the repository."

build/scripts/package-tns-ios.sh

@@ -10,6 +10,8 @@ PACKAGE_DIR="$DIST_DIR/package"
 FRAMEWORK_DIR="$PACKAGE_DIR/framework"
 INTERNAL_DIR="$FRAMEWORK_DIR/internal"
 
+# Start with a clean package directory
+rm -rf $PACKAGE_DIR
 mkdir -p "$INTERNAL_DIR"
 
 "$WORKSPACE/build/scripts/build-livesync-static-lib.sh"

build/scripts/run-tests.js

@@ -93,7 +93,7 @@ testrun.stdout.on('data', function(chunks) {
 
     chunks = leftover + chunks;
     chunks = chunks.replace(/\(lldb\)\s/g, '');
-    var lines = chunks.split('\n');
+    var lines = chunks.split(/\r?\n/);
     for(var i = 0; i < lines.length - 1; i++) {
         var line = lines[i];
 
@@ -106,7 +106,8 @@ testrun.stdout.on('data', function(chunks) {
         // if line.indexOf('App Start') reset the timeout function
         var index = line.indexOf(term);
         if (index <= 0) {
-            process.stdout.write(line + '\n');
+            if (line)
+                process.stdout.write(line + '\n');
         } else {
             if (line.indexOf("CONSOLE LOG") !== 0) {
                 // Each line is logged by the debugger twice (to console and to logs)

src/WebKit.cmake

@@ -33,6 +33,9 @@ set(WEBKIT_CMAKE_ARGS
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     -DCMAKE_CXX_STANDARD=14
     -DCMAKE_CXX_STANDARD_REQUIRED=ON
+    # Override RelWithDebInfo configuration's defaults to the ones from NativeScript
+    -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+
 )
 
 include(ExternalProject)