From 460c399c3db7e6ef94bb92a2c0f991c899c5612c Mon Sep 17 00:00:00 2001 From: REIS Benjamin Date: Fri, 2 Sep 2016 15:00:59 +0200 Subject: [PATCH] fix sdk_download.sh --- Classes/AboutView.m | 1 - Classes/Base.lproj/AboutView.xib | 121 +++++++++++++++-------------- Tools/sdk_download.sh | 9 +-- linphone.xcodeproj/project.pbxproj | 7 +- 4 files changed, 71 insertions(+), 67 deletions(-) diff --git a/Classes/AboutView.m b/Classes/AboutView.m index dda1604ec..7cbd64eee 100644 --- a/Classes/AboutView.m +++ b/Classes/AboutView.m @@ -26,7 +26,6 @@ #pragma mark - UICompositeViewDelegate Functions static UICompositeViewDescription *compositeDescription = nil; - + (UICompositeViewDescription *)compositeViewDescription { if (compositeDescription == nil) { compositeDescription = [[UICompositeViewDescription alloc] init:self.class diff --git a/Classes/Base.lproj/AboutView.xib b/Classes/Base.lproj/AboutView.xib index 5dc9bf2d2..9df203587 100644 --- a/Classes/Base.lproj/AboutView.xib +++ b/Classes/Base.lproj/AboutView.xib @@ -1,8 +1,9 @@ - + - + + @@ -22,24 +23,24 @@ - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - - - + @@ -285,6 +283,11 @@ - + + + + + + diff --git a/Tools/sdk_download.sh b/Tools/sdk_download.sh index dbb3f872d..6cc8b3eb3 100755 --- a/Tools/sdk_download.sh +++ b/Tools/sdk_download.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x function die { echo "$@" @@ -7,7 +7,6 @@ function die { if [ $# != 1 ]; then die "error: please provide liblinphone SDK version to download (for instance 3.13.9)" - exit 1 fi root_path="$(dirname $0)/.." @@ -20,10 +19,10 @@ if [ ! -d "$root_path"/liblinphone-sdk ]; then fi if [ ! -d "$sdk_path" ]; then - if ! which wget &>/dev/null; then - wget https://www.linphone.org/releases/ios/$sdk_version.zip -O "$sdk_path".zip + if which wget &>/dev/null; then + wget https://www.linphone.org/snapshots/ios/$sdk_version.zip -O "$sdk_path".zip elif which curl &>/dev/null; then - curl -# https://www.linphone.org/releases/ios/$sdk_version.zip > "$sdk_path".zip + curl -# https://www.linphone.org/snapshots/ios/$sdk_version.zip > "$sdk_path".zip else return 1 fi || die "error: cannot download liblinphone SDK from linphone.org. Please check the README.md" diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index d2f6bbc55..671f3f6aa 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -3130,7 +3130,6 @@ LastUpgradeCheck = 0800; TargetAttributes = { 1D6058900D05DD3D006BFB54 = { - DevelopmentTeam = Z2V957B3D6; SystemCapabilities = { com.apple.InAppPurchase = { enabled = 1; @@ -3819,7 +3818,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ ! -f \"$SRCROOT/liblinphone-sdk/apple-darwin/share/linphone/rootca.pem\" ]; then\necho '********************************************************************'\necho 'warning: Liblinphone SDK missing! Downloading it (latest release)...'\n$SRCROOT/Tools/sdk_download.sh \"latest\"\necho '********************************************************************'\nexit 1\nfi"; + shellScript = "if [ ! -f \"$SRCROOT/liblinphone-sdk/apple-darwin/share/linphone/rootca.pem\" ]; then\necho '********************************************************************'\necho 'warning: Liblinphone SDK missing! Downloading it (latest release)...'\n$SRCROOT/Tools/sdk_download.sh \"latest\"\necho '********************************************************************'\nfi"; }; 63DCC71D1A07B08E00916627 /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -4462,6 +4461,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; @@ -4550,6 +4550,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; @@ -4636,6 +4637,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; @@ -4723,6 +4725,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO;