From f9ca103ecbd3d52acc9d104ef80c1a59ef2bcb51 Mon Sep 17 00:00:00 2001 From: Tadeu Zagallo Date: Tue, 8 Sep 2015 06:44:28 -0700 Subject: [PATCH] [ReactNative][Profiler] Update OSS build script to work with new makefile Summary: There was some recent changes to the Makefile, but the open source build phase script wasn't update. Update it to copy the files to the right location. --- JSCLegacyProfiler/Makefile | 9 ++++----- React/React.xcodeproj/project.pbxproj | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/JSCLegacyProfiler/Makefile b/JSCLegacyProfiler/Makefile index 4b36fbfac..7121d6e27 100644 --- a/JSCLegacyProfiler/Makefile +++ b/JSCLegacyProfiler/Makefile @@ -4,7 +4,7 @@ SDK_PATH = /Applications/Xcode.app/Contents/Developer/Platforms/$1.platform/Deve SDK_VERSION = $(shell plutil -convert json -o - $(call SDK_PATH,iPhoneOS)/SDKSettings.plist | awk -f parseSDKVersion.awk) -CERT ?= "iPhone Developer" +CERT ?= iPhone Developer ARCHS = x86_64 arm64 armv7 i386 @@ -29,10 +29,9 @@ endif /tmp/RCTJSCProfiler: mkdir -p $@ -.PRECIOUS: RCTJSCProfiler.ios8.dylib RCTJSCProfiler.ios8.dylib: RCTJSCProfiler_unsigned.ios8.dylib cp $< $@ - codesign -f -s "${CERT}" $@ || rm $@ + codesign -f -s "${CERT}" $@ .PRECIOUS: RCTJSCProfiler_unsigned.ios8.dylib RCTJSCProfiler_unsigned.ios8.dylib: $(patsubst %,RCTJSCProfiler_%.ios8.dylib,$(ARCHS)) @@ -77,7 +76,7 @@ libyajl_%.a: download/yajl-2.1.0 .PRECIOUS: download/yajl-2.1.0 download/yajl-2.1.0: download/yajl-2.1.0.tar.gz - tar -zxvf $< -C download + tar -zxvf $< -C download > /dev/null mkdir -p download/yajl-2.1.0/build && cd download/yajl-2.1.0/build && cmake .. .PRECIOUS: download/yajl-2.1.0.tar.gz @@ -87,7 +86,7 @@ download/yajl-2.1.0.tar.gz: .PRECIOUS: download/% download/%: download/%.tar.gz - tar -zxvf $< -C `dirname $@` + tar -zxvf $< -C `dirname $@` > /dev/null .PRECIOUS: %.tar.gz %.tar.gz: diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index ce803446d..276e3943d 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -589,7 +589,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [[ \"$CONFIGURATION\" == \"Debug\" ]] && [[ -d \"/tmp/RCTJSCProfiler\" ]]; then\n find \"${CONFIGURATION_BUILD_DIR}\" -name '*.app' | xargs -I{} sh -c 'mkdir -p \"$1/Frameworks\" && cp -r /tmp/RCTJSCProfiler/* \"$1/Frameworks\"' -- {}\nfi"; + shellScript = "if [[ \"$CONFIGURATION\" == \"Debug\" ]] && [[ -d \"/tmp/RCTJSCProfiler\" ]]; then\n find \"${CONFIGURATION_BUILD_DIR}\" -name '*.app' | xargs -I{} sh -c 'cp -r /tmp/RCTJSCProfiler \"$1\"' -- {}\nfi"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */