diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index f013f3496..ddcf92ce6 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -303,7 +303,7 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar { - [self searchBar:searchBar textDidChange:nil]; + [self searchBar:searchBar textDidChange:@""]; [searchBar resignFirstResponder]; } diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index c9d48d9e7..84900a280 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -226,7 +226,7 @@ static RootViewManager *rootViewManagerInstance = nil; } } -- (NSUInteger)supportedInterfaceOrientations { +- (UIInterfaceOrientationMask)supportedInterfaceOrientations { if ([LinphoneManager runningOnIpad] || [mainViewController currentViewSupportsLandscape]) return UIInterfaceOrientationMaskAll; else { diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index aa076ea62..fc4694d45 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -137,8 +137,7 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info } + (BOOL)isAuthorized { - return !ABAddressBookGetAuthorizationStatus || - ABAddressBookGetAuthorizationStatus() == kABAuthorizationStatusAuthorized; + return ABAddressBookGetAuthorizationStatus() == kABAuthorizationStatusAuthorized; } - (FastAddressBook *)init { diff --git a/Classes/Utils/FileTransferDelegate.m b/Classes/Utils/FileTransferDelegate.m index f9fdf0d07..613966092 100644 --- a/Classes/Utils/FileTransferDelegate.m +++ b/Classes/Utils/FileTransferDelegate.m @@ -196,7 +196,6 @@ static LinphoneBuffer *linphone_iphone_file_transfer_send(LinphoneChatMessage *m // when we cancel file transfer, this will automatically trigger NotDelivered callback... recalling ourself a // second time so we have to unset message BEFORE calling this linphone_chat_message_cancel_file_transfer(msg); - linphone_chat_message_unref(msg); } _data = nil; LOGI(@"%p Destroying", self); diff --git a/Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.h b/Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.h index 131352104..233c6bf1f 100755 --- a/Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.h +++ b/Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.h @@ -58,5 +58,5 @@ - (UIImage *)cellImage; - (UIImage *)highlightedCellImage; - (BOOL)adjustsFontSizeToFitWidth; -- (UITextAlignment)textAlignment; +- (NSTextAlignment)textAlignment; @end diff --git a/Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.m b/Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.m index 9a4f7b338..471ae2eb3 100755 --- a/Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.m +++ b/Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.m @@ -251,20 +251,19 @@ return !boxedResult || [boxedResult boolValue]; } -- (UITextAlignment)textAlignment -{ - if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentLeft]) { - return UITextAlignmentLeft; - } else if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentCenter]) { - return UITextAlignmentCenter; - } else if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentRight]) { - return UITextAlignmentRight; - } - if ([self.type isEqualToString:kIASKButtonSpecifier] && !self.cellImage) { - return UITextAlignmentCenter; - } else if ([self.type isEqualToString:kIASKPSMultiValueSpecifier] || [self.type isEqualToString:kIASKPSTitleValueSpecifier]) { - return UITextAlignmentRight; +- (NSTextAlignment)textAlignment { + if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentLeft]) { + return NSTextAlignmentLeft; + } else if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentCenter]) { + return NSTextAlignmentCenter; + } else if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentRight]) { + return NSTextAlignmentRight; } - return UITextAlignmentLeft; + if ([self.type isEqualToString:kIASKButtonSpecifier] && !self.cellImage) { + return NSTextAlignmentCenter; + } else if ([self.type isEqualToString:kIASKPSMultiValueSpecifier] || [self.type isEqualToString:kIASKPSTitleValueSpecifier]) { + return NSTextAlignmentRight; + } + return NSTextAlignmentLeft; } @end diff --git a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj index b0d12a599..5c6982b70 100755 --- a/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj +++ b/Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj @@ -223,7 +223,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0700; }; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "NinePatch" */; compatibilityVersion = "Xcode 3.2"; @@ -306,6 +306,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "Don't Code Sign"; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_THUMB_SUPPORT = NO; diff --git a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj index c4e28e185..eb98eaae4 100755 --- a/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj +++ b/Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj @@ -317,7 +317,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0700; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "XMLRPC" */; compatibilityVersion = "Xcode 3.2"; @@ -403,6 +403,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 07127C590F4266F4009C7476 /* CommonDevelopment.xcconfig */; buildSettings = { + ENABLE_TESTABILITY = YES; GCC_THUMB_SUPPORT = NO; IPHONEOS_DEPLOYMENT_TARGET = 4.0; ONLY_ACTIVE_ARCH = YES; diff --git a/LiblinphoneTester/LinphoneTester-Info.plist b/LiblinphoneTester/LinphoneTester-Info.plist index 80088103a..e6e68329c 100644 --- a/LiblinphoneTester/LinphoneTester-Info.plist +++ b/LiblinphoneTester/LinphoneTester-Info.plist @@ -13,7 +13,7 @@ CFBundleIcons~ipad CFBundleIdentifier - com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/Resources/Images.xcassets/AppIcon.appiconset/Contents.json index 80ca25902..2982bf4af 100644 --- a/Resources/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Resources/Images.xcassets/AppIcon.appiconset/Contents.json @@ -10,11 +10,21 @@ "size" : "29x29", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "40x40", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, { "size" : "57x57", "idiom" : "iphone", diff --git a/TestsLiblinphone/LinphoneTesterTests-Info.plist b/TestsLiblinphone/LinphoneTesterTests-Info.plist index 8715e636e..169b6f710 100644 --- a/TestsLiblinphone/LinphoneTesterTests-Info.plist +++ b/TestsLiblinphone/LinphoneTesterTests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/TestsUI/Info.plist b/TestsUI/Info.plist index fddcb8263..ba72822e8 100644 --- a/TestsUI/Info.plist +++ b/TestsUI/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.linphone.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/linphone-Info.plist b/linphone-Info.plist index 04f0fcf6b..cefdb0428 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -11,7 +11,7 @@ CFBundleIcons~ipad CFBundleIdentifier - org.linphone.phone + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleLocalizations diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index ee679de1a..ea1612557 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -117,7 +117,6 @@ 63058A281B4E821E00EFAE36 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63058A151B4E821E00EFAE36 /* Main_iPad.storyboard */; }; 63058A291B4E821E00EFAE36 /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63058A171B4E821E00EFAE36 /* Main_iPhone.storyboard */; }; 63058A2A1B4E821E00EFAE36 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A1A1B4E821E00EFAE36 /* DetailViewController.m */; }; - 63058A2B1B4E821E00EFAE36 /* LinphoneTester-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 63058A1C1B4E821E00EFAE36 /* LinphoneTester-Info.plist */; }; 63058A2C1B4E821E00EFAE36 /* LogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A1F1B4E821E00EFAE36 /* LogsViewController.m */; }; 63058A2D1B4E821E00EFAE36 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A201B4E821E00EFAE36 /* main.m */; }; 63058A2E1B4E821E00EFAE36 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A221B4E821E00EFAE36 /* MasterViewController.m */; }; @@ -3247,7 +3246,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0700; TargetAttributes = { 1D6058900D05DD3D006BFB54 = { DevelopmentTeam = Z2V957B3D6; @@ -3951,7 +3950,6 @@ 63058AE01B4E937300EFAE36 /* sounds in Resources */, 63058AE21B4E93A100EFAE36 /* tester_hosts in Resources */, F84015C11939FE37006ABAB5 /* test_passed.png in Resources */, - 63058A2B1B4E821E00EFAE36 /* LinphoneTester-Info.plist in Resources */, 63058A2F1B4E821E00EFAE36 /* TesterImages.xcassets in Resources */, 63058A251B4E821E00EFAE36 /* InfoPlist.strings in Resources */, 63058A271B4E821E00EFAE36 /* Main_iPhone.strings in Resources */, @@ -4657,6 +4655,7 @@ LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; PROVISIONING_PROFILE = ""; SKIP_INSTALL = NO; @@ -4680,7 +4679,9 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -4740,6 +4741,7 @@ LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; PROVISIONING_PROFILE = ""; SKIP_INSTALL = NO; @@ -4763,7 +4765,9 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -4823,6 +4827,7 @@ LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; PROVISIONING_PROFILE = ""; SKIP_INSTALL = NO; @@ -4846,7 +4851,9 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -4906,6 +4913,7 @@ LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone; PRODUCT_NAME = linphone; PROVISIONING_PROFILE = ""; SKIP_INSTALL = NO; @@ -4929,7 +4937,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; + ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -4999,6 +5010,7 @@ "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester"; @@ -5048,6 +5060,7 @@ "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester"; @@ -5098,6 +5111,7 @@ "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester"; @@ -5148,6 +5162,7 @@ "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester"; @@ -5205,6 +5220,7 @@ "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5254,6 +5270,7 @@ "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5304,6 +5321,7 @@ "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5354,6 +5372,7 @@ "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", ); + PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5411,6 +5430,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.linphone.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone"; @@ -5459,6 +5479,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.linphone.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone"; @@ -5508,6 +5529,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.linphone.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone"; @@ -5557,6 +5579,7 @@ XCTest, "-ObjC", ); + PRODUCT_BUNDLE_IDENTIFIER = "org.linphone.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone"; diff --git a/linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme b/linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme index 34838d717..03cb5e97d 100644 --- a/linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme +++ b/linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -48,15 +48,18 @@ ReferencedContainer = "container:linphone.xcodeproj"> + + @@ -72,10 +75,10 @@ diff --git a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme index f647fdabe..9781b8192 100644 --- a/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme +++ b/linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:linphone.xcodeproj"> + + @@ -91,10 +94,10 @@ diff --git a/linphone_Prefix.pch b/linphone_Prefix.pch index f0d42b96a..d3dac1750 100644 --- a/linphone_Prefix.pch +++ b/linphone_Prefix.pch @@ -9,7 +9,6 @@ #ifdef __IPHONE_8_0 // suppress these errors until we are ready to handle them -#pragma message "Ignoring designated initializer warnings" #pragma clang diagnostic ignored "-Wobjc-designated-initializers" #else // temporarily define an empty NS_DESIGNATED_INITIALIZER so we can use now, diff --git a/prepare.py b/prepare.py index b14456239..c34b27818 100755 --- a/prepare.py +++ b/prepare.py @@ -97,7 +97,6 @@ archs_device = ['arm64', 'armv7'] archs_simu = ['i386', 'x86_64'] platforms = ['all', 'devices', 'simulators'] + archs_device + archs_simu - class PlatformListAction(argparse.Action): def __call__(self, parser, namespace, values, option_string=None): @@ -238,13 +237,15 @@ def check_tools(): error("iOS SDK not found, please install Xcode from AppStore or equivalent.") reterr = 1 else: - sdk_platform_path = Popen( - "xcrun --sdk iphonesimulator --show-sdk-platform-path".split(" "), stdout=PIPE, stderr=devnull).stdout.read()[:-1] - sdk_strings_path = "{}/{}".format(sdk_platform_path, "Developer/usr/bin/strings") - if not os.path.isfile(sdk_strings_path): - strings_path = find_executable("strings") - error("strings binary missing, please run:\n\tsudo ln -s {} {}".format(strings_path, sdk_strings_path)) - reterr = 1 + xcode_version = float(Popen("xcodebuild -version".split(" "), stdout=PIPE).stdout.read().split("\n")[0].split(" ")[1]) + if xcode_version < 7.0: + sdk_platform_path = Popen( + "xcrun --sdk iphonesimulator --show-sdk-platform-path".split(" "), stdout=PIPE, stderr=devnull).stdout.read()[:-1] + sdk_strings_path = "{}/{}".format(sdk_platform_path, "Developer/usr/bin/strings") + if not os.path.isfile(sdk_strings_path): + strings_path = find_executable("strings") + error("strings binary missing, please run:\n\tsudo ln -s {} {}".format(strings_path, sdk_strings_path)) + reterr = 1 return reterr @@ -383,9 +384,9 @@ veryclean: $(addprefix veryclean-,$(packages)) generate-dummy-%: \t@echo "[{archs}] Generating dummy $* static library." ; \\ \tprintf "void $*_init() {{}}" | tr '-' '_' > .dummy.c ; \\ -\tfor arch in {archs}; do clang -c .dummy.c -arch $$arch -o .dummy-$$arch.a; done ; \\ -\tlipo -create -output .dummy.a .dummy-*.a ; \\ -\trm .dummy-*.a .dummy.c +\tfor arch in {archs}; do clang -flto -emit-llvm -c .dummy.c -arch $$arch -o .dummy-$$arch.tbd; done ; \\ +\tlipo -create -output .dummy.tbd .dummy-*.tbd; \\ +\trm .dummy-*.tbd .dummy.c lipo: \tarchives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\ @@ -414,7 +415,7 @@ lipo: \t\tfi ; \\ \t\tif ! test -f $$library_path ; then \\ \t\t\t$(MAKE) generate-dummy-$$lib ; \\ -\t\t\tmv .dummy.a $$library_path ; \\ +\t\t\tmv .dummy.tbd $$library_path ; \\ \t\tfi \\ \tdone diff --git a/submodules/belle-sip b/submodules/belle-sip index b1707d976..5910d6bea 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit b1707d976a90afa8079655ac1f9f0eef23dc5709 +Subproject commit 5910d6bea58e9e4a4d6476aa31318f11f5ef1271 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 6f9dde2b9..6b49fb87e 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 6f9dde2b9fd2dd64a0e0bab87cf3e0b30290da1d +Subproject commit 6b49fb87e8df8fdc7d4002e69f882d08363207be diff --git a/submodules/cunit b/submodules/cunit index f7c0fe0b5..aa13f89d1 160000 --- a/submodules/cunit +++ b/submodules/cunit @@ -1 +1 @@ -Subproject commit f7c0fe0b5b03f5bc8addd45b359ea5c561d0a9d0 +Subproject commit aa13f89d1115d809b0dff2f200e19036755bd3b4