diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index f9fb8df77..06a46ff92 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4628,7 +4628,6 @@ "$(SRCROOT)/Classes/Utils/XMLRPC/", ); INFOPLIST_FILE = "linphone-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "$(SRCROOT)/liblinphone-sdk/apple-darwin/lib", @@ -4714,7 +4713,6 @@ "$(SRCROOT)/Classes/Utils/XMLRPC/", ); INFOPLIST_FILE = "linphone-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", @@ -4800,7 +4798,6 @@ "$(SRCROOT)/Classes/Utils/XMLRPC/", ); INFOPLIST_FILE = "linphone-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", @@ -4886,7 +4883,6 @@ "$(SRCROOT)/Classes/Utils/XMLRPC/", ); INFOPLIST_FILE = "linphone-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ( "$(BUILT_PRODUCTS_DIR)", "$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins", @@ -4982,7 +4978,6 @@ Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "TestsLiblinphone/LinphoneTesterTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", @@ -5028,7 +5023,6 @@ Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "TestsLiblinphone/LinphoneTesterTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", @@ -5074,7 +5068,6 @@ Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "TestsLiblinphone/LinphoneTesterTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", @@ -5120,7 +5113,6 @@ Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "TestsLiblinphone/LinphoneTesterTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", @@ -5173,7 +5165,6 @@ Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "LiblinphoneTester/LinphoneTester-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", @@ -5220,7 +5211,6 @@ Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "LiblinphoneTester/LinphoneTester-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", @@ -5267,7 +5257,6 @@ Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "LiblinphoneTester/LinphoneTester-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", @@ -5314,7 +5303,6 @@ Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "LiblinphoneTester/LinphoneTester-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib", diff --git a/prepare.py b/prepare.py index e193288ba..0118d71e0 100755 --- a/prepare.py +++ b/prepare.py @@ -136,20 +136,29 @@ def gpl_disclaimer(platforms): "\n***************************************************************************") -def extract_libs_list(): +def extract_from_xcode_project_with_regex(regex): l = [] - # name = libspeexdsp.a; path = "liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; - regex = re.compile("name = (\")*(lib(\S+))\.a(\")*; path = \"liblinphone-sdk/apple-darwin/") f = open('linphone.xcodeproj/project.pbxproj', 'r') lines = f.readlines() f.close() for line in lines: m = regex.search(line) if m is not None: - l += [m.group(2)] + l += [m.group(1)] return list(set(l)) +def extract_deployment_target(): + regex = re.compile("IPHONEOS_DEPLOYMENT_TARGET = (.*);") + return extract_from_xcode_project_with_regex(regex)[0] + + +def extract_libs_list(): + # name = libspeexdsp.a; path = "liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; + regex = re.compile("name = \"*(lib\S+)\.a(\")*; path = \"liblinphone-sdk/apple-darwin/") + return extract_from_xcode_project_with_regex(regex) + + missing_dependencies = {} @@ -521,6 +530,7 @@ def main(argv=None): if check_tools() != 0: return 1 + additional_args += ["-DLINPHONE_IOS_DEPLOYMENT_TARGET=" + extract_deployment_target()] additional_args += ["-DLINPHONE_BUILDER_DUMMY_LIBRARIES=" + ' '.join(extract_libs_list())] if args.debug_verbose is True: additional_args += ["-DENABLE_DEBUG_LOGS=YES"] diff --git a/submodules/belle-sip b/submodules/belle-sip index c93a01615..ccad67c61 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit c93a01615811bccdcfbc65aad7247babd1356d72 +Subproject commit ccad67c61fdcd202f7ae02eda4142bbaf3add1c1 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 3c0a669dd..3496824d2 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 3c0a669ddb8af68fc1253ba21d521051f48ee79a +Subproject commit 3496824d2c6fe7f3e0a5acd8dca02569d6ef16bd