From 32c837a082f9bf8f88791a091a10544a0a1af7fd Mon Sep 17 00:00:00 2001 From: ArturKlajnerok Date: Tue, 20 Jun 2017 20:04:56 +0200 Subject: [PATCH 1/2] Removing test-driver symlink in ios third party install script When ios-install-third-party script installs google glog library it creates a symlinks that breaks production release bundeling --- scripts/ios-install-third-party.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ios-install-third-party.sh b/scripts/ios-install-third-party.sh index 2aabd7fe8dfb2d..75792f215e8b6e 100755 --- a/scripts/ios-install-third-party.sh +++ b/scripts/ios-install-third-party.sh @@ -25,6 +25,9 @@ function fetch_and_unpack () { exit 1 fi cd "$dir" + if [ -h "test-driver" ]; then + rm test-driver + fi eval "${cmd:-true}") fi } From 75651f7f1482b1f3afb6f13f2383771616bdd881 Mon Sep 17 00:00:00 2001 From: ArturKlajnerok Date: Wed, 21 Jun 2017 01:36:34 +0200 Subject: [PATCH 2/2] Removing test-driver symlink as part of glog configure script When ios-install-third-party script installs google glog library it creates a symlinks that breaks production release bundeling --- scripts/ios-configure-glog.sh | 5 +++++ scripts/ios-install-third-party.sh | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/ios-configure-glog.sh b/scripts/ios-configure-glog.sh index 92b7f31d154c5a..e6420f3fea1495 100755 --- a/scripts/ios-configure-glog.sh +++ b/scripts/ios-configure-glog.sh @@ -7,6 +7,11 @@ if [ -z "$ACTION" ] || [ -z "$BUILD_DIR" ]; then export CXX="$CC" fi +# Remove automake symlink if it exists +if [ -h "test-driver" ]; then + rm test-driver +fi + ./configure --host arm-apple-darwin # Fix build for tvOS diff --git a/scripts/ios-install-third-party.sh b/scripts/ios-install-third-party.sh index 75792f215e8b6e..2aabd7fe8dfb2d 100755 --- a/scripts/ios-install-third-party.sh +++ b/scripts/ios-install-third-party.sh @@ -25,9 +25,6 @@ function fetch_and_unpack () { exit 1 fi cd "$dir" - if [ -h "test-driver" ]; then - rm test-driver - fi eval "${cmd:-true}") fi }