witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

ios9: fix project compilation for xcode7/ios9 and disable bitcode for yet. Warning: VPX build is broken yet

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-17 16:51:38 +02:00
parent 87f7fa5fbf
commit 539090b635
21 changed files with 93 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/ContactsViewController.m
View file

@ -303,7 +303,7 @@ static UICompositeViewDescription *compositeDescription = nil;
} }
- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar { - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
[self searchBar:searchBar textDidChange:nil]; [self searchBar:searchBar textDidChange:@""];
[searchBar resignFirstResponder]; [searchBar resignFirstResponder];
} }

2
Classes/PhoneMainView.m
View file

@ -226,7 +226,7 @@ static RootViewManager *rootViewManagerInstance = nil;
} }
} }
- (NSUInteger)supportedInterfaceOrientations { - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
if ([LinphoneManager runningOnIpad] || [mainViewController currentViewSupportsLandscape]) if ([LinphoneManager runningOnIpad] || [mainViewController currentViewSupportsLandscape])
return UIInterfaceOrientationMaskAll; return UIInterfaceOrientationMaskAll;
else { else {

3
Classes/Utils/FastAddressBook.m
View file

@ -137,8 +137,7 @@ static void sync_address_book(ABAddressBookRef addressBook, CFDictionaryRef info
} }
+ (BOOL)isAuthorized { + (BOOL)isAuthorized {
return !ABAddressBookGetAuthorizationStatus || return ABAddressBookGetAuthorizationStatus() == kABAuthorizationStatusAuthorized;
ABAddressBookGetAuthorizationStatus() == kABAuthorizationStatusAuthorized;
} }
- (FastAddressBook *)init { - (FastAddressBook *)init {

1
Classes/Utils/FileTransferDelegate.m
View file

@ -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 // 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 // second time so we have to unset message BEFORE calling this
linphone_chat_message_cancel_file_transfer(msg); linphone_chat_message_cancel_file_transfer(msg);
linphone_chat_message_unref(msg);
} }
_data = nil; _data = nil;
LOGI(@"%p Destroying", self); LOGI(@"%p Destroying", self);

2
Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.h
View file

@ -58,5 +58,5 @@
- (UIImage *)cellImage; - (UIImage *)cellImage;
- (UIImage *)highlightedCellImage; - (UIImage *)highlightedCellImage;
- (BOOL)adjustsFontSizeToFitWidth; - (BOOL)adjustsFontSizeToFitWidth;
- (UITextAlignment)textAlignment; - (NSTextAlignment)textAlignment;
@end @end

27
Classes/Utils/InAppSettingsKit/Models/IASKSpecifier.m
View file

@ -251,20 +251,19 @@
return !boxedResult || [boxedResult boolValue]; return !boxedResult || [boxedResult boolValue];
} }
- (UITextAlignment)textAlignment - (NSTextAlignment)textAlignment {
{ if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentLeft]) {
if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentLeft]) { return NSTextAlignmentLeft;
return UITextAlignmentLeft; } else if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentCenter]) {
} else if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentCenter]) { return NSTextAlignmentCenter;
return UITextAlignmentCenter; } else if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentRight]) {
} else if ([[_specifierDict objectForKey:kIASKTextLabelAlignment] isEqualToString:kIASKTextLabelAlignmentRight]) { return NSTextAlignmentRight;
return UITextAlignmentRight;
}
if ([self.type isEqualToString:kIASKButtonSpecifier] && !self.cellImage) {
return UITextAlignmentCenter;
} else if ([self.type isEqualToString:kIASKPSMultiValueSpecifier] || [self.type isEqualToString:kIASKPSTitleValueSpecifier]) {
return UITextAlignmentRight;
} }
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 @end

3
Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj
View file

@ -223,7 +223,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0610; LastUpgradeCheck = 0700;
}; };
buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "NinePatch" */; buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "NinePatch" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -306,6 +306,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "Don't Code Sign"; CODE_SIGN_IDENTITY = "Don't Code Sign";
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
GCC_THUMB_SUPPORT = NO; GCC_THUMB_SUPPORT = NO;

3
Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj
View file

@ -317,7 +317,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = { 0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0610; LastUpgradeCheck = 0700;
}; };
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "XMLRPC" */; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "XMLRPC" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -403,6 +403,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 07127C590F4266F4009C7476 /* CommonDevelopment.xcconfig */; baseConfigurationReference = 07127C590F4266F4009C7476 /* CommonDevelopment.xcconfig */;
buildSettings = { buildSettings = {
ENABLE_TESTABILITY = YES;
GCC_THUMB_SUPPORT = NO; GCC_THUMB_SUPPORT = NO;
IPHONEOS_DEPLOYMENT_TARGET = 4.0; IPHONEOS_DEPLOYMENT_TARGET = 4.0;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;

2
LiblinphoneTester/LinphoneTester-Info.plist
View file

@ -13,7 +13,7 @@
<key>CFBundleIcons~ipad</key> <key>CFBundleIcons~ipad</key>
<dict/> <dict/>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}</string> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>

10
Resources/Images.xcassets/AppIcon.appiconset/Contents.json
View file

@ -10,11 +10,21 @@
"size" : "29x29", "size" : "29x29",
"scale" : "2x" "scale" : "2x"
}, },
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{ {
"idiom" : "iphone", "idiom" : "iphone",
"size" : "40x40", "size" : "40x40",
"scale" : "2x" "scale" : "2x"
}, },
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{ {
"size" : "57x57", "size" : "57x57",
"idiom" : "iphone", "idiom" : "iphone",

2
TestsLiblinphone/LinphoneTesterTests-Info.plist
View file

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string> <string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}</string> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>

2
TestsUI/Info.plist
View file

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.linphone.$(PRODUCT_NAME:rfc1034identifier)</string> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>

2
linphone-Info.plist
View file

@ -11,7 +11,7 @@
<key>CFBundleIcons~ipad</key> <key>CFBundleIcons~ipad</key>
<dict/> <dict/>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.linphone.phone</string> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLocalizations</key> <key>CFBundleLocalizations</key>

29
linphone.xcodeproj/project.pbxproj
View file

@ -117,7 +117,6 @@
63058A281B4E821E00EFAE36 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63058A151B4E821E00EFAE36 /* Main_iPad.storyboard */; }; 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 */; }; 63058A291B4E821E00EFAE36 /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63058A171B4E821E00EFAE36 /* Main_iPhone.storyboard */; };
63058A2A1B4E821E00EFAE36 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A1A1B4E821E00EFAE36 /* DetailViewController.m */; }; 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 */; }; 63058A2C1B4E821E00EFAE36 /* LogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A1F1B4E821E00EFAE36 /* LogsViewController.m */; };
63058A2D1B4E821E00EFAE36 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A201B4E821E00EFAE36 /* main.m */; }; 63058A2D1B4E821E00EFAE36 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A201B4E821E00EFAE36 /* main.m */; };
63058A2E1B4E821E00EFAE36 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A221B4E821E00EFAE36 /* MasterViewController.m */; }; 63058A2E1B4E821E00EFAE36 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63058A221B4E821E00EFAE36 /* MasterViewController.m */; };
@ -3247,7 +3246,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0610; LastUpgradeCheck = 0700;
TargetAttributes = { TargetAttributes = {
1D6058900D05DD3D006BFB54 = { 1D6058900D05DD3D006BFB54 = {
DevelopmentTeam = Z2V957B3D6; DevelopmentTeam = Z2V957B3D6;
@ -3951,7 +3950,6 @@
63058AE01B4E937300EFAE36 /* sounds in Resources */, 63058AE01B4E937300EFAE36 /* sounds in Resources */,
63058AE21B4E93A100EFAE36 /* tester_hosts in Resources */, 63058AE21B4E93A100EFAE36 /* tester_hosts in Resources */,
F84015C11939FE37006ABAB5 /* test_passed.png in Resources */, F84015C11939FE37006ABAB5 /* test_passed.png in Resources */,
63058A2B1B4E821E00EFAE36 /* LinphoneTester-Info.plist in Resources */,
63058A2F1B4E821E00EFAE36 /* TesterImages.xcassets in Resources */, 63058A2F1B4E821E00EFAE36 /* TesterImages.xcassets in Resources */,
63058A251B4E821E00EFAE36 /* InfoPlist.strings in Resources */, 63058A251B4E821E00EFAE36 /* InfoPlist.strings in Resources */,
63058A271B4E821E00EFAE36 /* Main_iPhone.strings in Resources */, 63058A271B4E821E00EFAE36 /* Main_iPhone.strings in Resources */,
@ -4657,6 +4655,7 @@
LINK_WITH_STANDARD_LIBRARIES = YES; LINK_WITH_STANDARD_LIBRARIES = YES;
ORDER_FILE = ""; ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
PRODUCT_NAME = linphone; PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO; SKIP_INSTALL = NO;
@ -4680,7 +4679,9 @@
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO; GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -4740,6 +4741,7 @@
LINK_WITH_STANDARD_LIBRARIES = YES; LINK_WITH_STANDARD_LIBRARIES = YES;
ORDER_FILE = ""; ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
PRODUCT_NAME = linphone; PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO; SKIP_INSTALL = NO;
@ -4763,7 +4765,9 @@
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO; GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -4823,6 +4827,7 @@
LINK_WITH_STANDARD_LIBRARIES = YES; LINK_WITH_STANDARD_LIBRARIES = YES;
ORDER_FILE = ""; ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
PRODUCT_NAME = linphone; PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO; SKIP_INSTALL = NO;
@ -4846,7 +4851,9 @@
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO; GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -4906,6 +4913,7 @@
LINK_WITH_STANDARD_LIBRARIES = YES; LINK_WITH_STANDARD_LIBRARIES = YES;
ORDER_FILE = ""; ORDER_FILE = "";
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
PRODUCT_NAME = linphone; PRODUCT_NAME = linphone;
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
SKIP_INSTALL = NO; SKIP_INSTALL = NO;
@ -4929,7 +4937,10 @@
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO; GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -4999,6 +5010,7 @@
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
); );
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester"; 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",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
); );
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester"; 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",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
); );
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester"; 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",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
); );
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/liblinphoneTester.app/liblinphoneTester";
@ -5205,6 +5220,7 @@
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
); );
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -5254,6 +5270,7 @@
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
); );
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -5304,6 +5321,7 @@
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
); );
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -5354,6 +5372,7 @@
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
); );
PRODUCT_BUNDLE_IDENTIFIER = "com.belledonne-communications.tester.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -5411,6 +5430,7 @@
XCTest, XCTest,
"-ObjC", "-ObjC",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.linphone.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone";
@ -5459,6 +5479,7 @@
XCTest, XCTest,
"-ObjC", "-ObjC",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.linphone.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone";
@ -5508,6 +5529,7 @@
XCTest, XCTest,
"-ObjC", "-ObjC",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.linphone.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone";
@ -5557,6 +5579,7 @@
XCTest, XCTest,
"-ObjC", "-ObjC",
); );
PRODUCT_BUNDLE_IDENTIFIER = "org.linphone.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/linphone.app/linphone";

13
linphone.xcodeproj/xcshareddata/xcschemes/LinphoneTester.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0620" LastUpgradeVersion = "0700"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -23,10 +23,10 @@
</BuildActionEntries> </BuildActionEntries>
</BuildAction> </BuildAction>
<TestAction <TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES" shouldUseLaunchSchemeArgsEnv = "YES">
buildConfiguration = "Debug">
<Testables> <Testables>
<TestableReference <TestableReference
skipped = "NO"> skipped = "NO">
@ -48,15 +48,18 @@
ReferencedContainer = "container:linphone.xcodeproj"> ReferencedContainer = "container:linphone.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<BuildableProductRunnable <BuildableProductRunnable
runnableDebuggingMode = "0"> runnableDebuggingMode = "0">
@ -72,10 +75,10 @@
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES" shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = "" savedToolIdentifier = ""
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<BuildableProductRunnable <BuildableProductRunnable
runnableDebuggingMode = "0"> runnableDebuggingMode = "0">

13
linphone.xcodeproj/xcshareddata/xcschemes/linphone.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0620" LastUpgradeVersion = "0700"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -37,10 +37,10 @@
</BuildActionEntries> </BuildActionEntries>
</BuildAction> </BuildAction>
<TestAction <TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES" shouldUseLaunchSchemeArgsEnv = "YES">
buildConfiguration = "Debug">
<Testables> <Testables>
<TestableReference <TestableReference
skipped = "NO"> skipped = "NO">
@ -62,15 +62,18 @@
ReferencedContainer = "container:linphone.xcodeproj"> ReferencedContainer = "container:linphone.xcodeproj">
</BuildableReference> </BuildableReference>
</MacroExpansion> </MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<BuildableProductRunnable <BuildableProductRunnable
runnableDebuggingMode = "0"> runnableDebuggingMode = "0">
@ -91,10 +94,10 @@
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES" shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = "" savedToolIdentifier = ""
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<BuildableProductRunnable <BuildableProductRunnable
runnableDebuggingMode = "0"> runnableDebuggingMode = "0">

1
linphone_Prefix.pch
View file

@ -9,7 +9,6 @@
#ifdef __IPHONE_8_0 #ifdef __IPHONE_8_0
// suppress these errors until we are ready to handle them // suppress these errors until we are ready to handle them
#pragma message "Ignoring designated initializer warnings"
#pragma clang diagnostic ignored "-Wobjc-designated-initializers" #pragma clang diagnostic ignored "-Wobjc-designated-initializers"
#else #else
// temporarily define an empty NS_DESIGNATED_INITIALIZER so we can use now, // temporarily define an empty NS_DESIGNATED_INITIALIZER so we can use now,

25
prepare.py
View file

@ -97,7 +97,6 @@ archs_device = ['arm64', 'armv7']
archs_simu = ['i386', 'x86_64'] archs_simu = ['i386', 'x86_64']
platforms = ['all', 'devices', 'simulators'] + archs_device + archs_simu platforms = ['all', 'devices', 'simulators'] + archs_device + archs_simu
class PlatformListAction(argparse.Action): class PlatformListAction(argparse.Action):
def __call__(self, parser, namespace, values, option_string=None): 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.") error("iOS SDK not found, please install Xcode from AppStore or equivalent.")
reterr = 1 reterr = 1
else: else:
sdk_platform_path = Popen( xcode_version = float(Popen("xcodebuild -version".split(" "), stdout=PIPE).stdout.read().split("\n")[0].split(" ")[1])
"xcrun --sdk iphonesimulator --show-sdk-platform-path".split(" "), stdout=PIPE, stderr=devnull).stdout.read()[:-1] if xcode_version < 7.0:
sdk_strings_path = "{}/{}".format(sdk_platform_path, "Developer/usr/bin/strings") sdk_platform_path = Popen(
if not os.path.isfile(sdk_strings_path): "xcrun --sdk iphonesimulator --show-sdk-platform-path".split(" "), stdout=PIPE, stderr=devnull).stdout.read()[:-1]
strings_path = find_executable("strings") sdk_strings_path = "{}/{}".format(sdk_platform_path, "Developer/usr/bin/strings")
error("strings binary missing, please run:\n\tsudo ln -s {} {}".format(strings_path, sdk_strings_path)) if not os.path.isfile(sdk_strings_path):
reterr = 1 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 return reterr
@ -383,9 +384,9 @@ veryclean: $(addprefix veryclean-,$(packages))
generate-dummy-%: generate-dummy-%:
\t@echo "[{archs}] Generating dummy $* static library." ; \\ \t@echo "[{archs}] Generating dummy $* static library." ; \\
\tprintf "void $*_init() {{}}" | tr '-' '_' > .dummy.c ; \\ \tprintf "void $*_init() {{}}" | tr '-' '_' > .dummy.c ; \\
\tfor arch in {archs}; do clang -c .dummy.c -arch $$arch -o .dummy-$$arch.a; done ; \\ \tfor arch in {archs}; do clang -flto -emit-llvm -c .dummy.c -arch $$arch -o .dummy-$$arch.tbd; done ; \\
\tlipo -create -output .dummy.a .dummy-*.a ; \\ \tlipo -create -output .dummy.tbd .dummy-*.tbd; \\
\trm .dummy-*.a .dummy.c \trm .dummy-*.tbd .dummy.c
lipo: lipo:
\tarchives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\ \tarchives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\
@ -414,7 +415,7 @@ lipo:
\t\tfi ; \\ \t\tfi ; \\
\t\tif ! test -f $$library_path ; then \\ \t\tif ! test -f $$library_path ; then \\
\t\t\t$(MAKE) generate-dummy-$$lib ; \\ \t\t\t$(MAKE) generate-dummy-$$lib ; \\
\t\t\tmv .dummy.a $$library_path ; \\ \t\t\tmv .dummy.tbd $$library_path ; \\
\t\tfi \\ \t\tfi \\
\tdone \tdone

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit b1707d976a90afa8079655ac1f9f0eef23dc5709 Subproject commit 5910d6bea58e9e4a4d6476aa31318f11f5ef1271

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 6f9dde2b9fd2dd64a0e0bab87cf3e0b30290da1d Subproject commit 6b49fb87e8df8fdc7d4002e69f882d08363207be

2
submodules/cunit

@ -1 +1 @@
Subproject commit f7c0fe0b5b03f5bc8addd45b359ea5c561d0a9d0 Subproject commit aa13f89d1115d809b0dff2f200e19036755bd3b4