From 514157053272861c60aef873cb0927e16fd47cd4 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Thu, 21 Sep 2017 17:28:51 +0200 Subject: [PATCH] init dev_group_chat branch --- .gitmodules | 9 +++++++ linphone.xcodeproj/project.pbxproj | 38 ++++++++++++++++++++++++++---- submodules/bcmatroska2 | 2 +- submodules/cmake-builder | 2 +- submodules/externals/libxsd | 1 + submodules/externals/soci | 1 + submodules/externals/xerces-c | 1 + submodules/linphone | 2 +- submodules/ortp | 2 +- 9 files changed, 50 insertions(+), 8 deletions(-) create mode 160000 submodules/externals/libxsd create mode 160000 submodules/externals/soci create mode 160000 submodules/externals/xerces-c diff --git a/.gitmodules b/.gitmodules index d4527eeb8..f49a12d25 100644 --- a/.gitmodules +++ b/.gitmodules @@ -111,3 +111,12 @@ [submodule "submodules/bcmatroska2"] path = submodules/bcmatroska2 url = git://git.linphone.org/bcmatroska2.git +[submodule "submodules/externals/libxsd"] + path = submodules/externals/libxsd + url = git://git.linphone.org/libxsd +[submodule "submodules/externals/xerces-c"] + path = submodules/externals/xerces-c + url = git://git.linphone.org/xerces-c +[submodule "submodules/externals/soci"] + path = submodules/externals/soci + url = git://git.linphone.org/soci diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index c615a74c2..204a66318 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -828,6 +828,20 @@ remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1; remoteInfo = KIFFrameworkConsumerTests; }; + 8C7898421F58439900E8A740 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8CD87D4C1EF5105800ACA260; + remoteInfo = LinphoneManager; + }; + 8C7898441F58439900E8A740 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8CD87D541EF5105900ACA260; + remoteInfo = LinphoneManagerTests; + }; F08F119119C09C6B007D70C2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -2302,6 +2316,8 @@ 63058A071B4E816A00EFAE36 /* KIF.framework */, 633FC7C81CD7466400774B8B /* KIFFrameworkConsumer.app */, 633FC7CA1CD7466400774B8B /* KIFFrameworkConsumerTests.xctest */, + 8C7898431F58439900E8A740 /* LinphoneManager.framework */, + 8C7898451F58439900E8A740 /* LinphoneManagerTests.xctest */, ); name = Products; sourceTree = ""; @@ -3226,6 +3242,20 @@ remoteRef = 633FC7C91CD7466400774B8B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 8C7898431F58439900E8A740 /* LinphoneManager.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = LinphoneManager.framework; + remoteRef = 8C7898421F58439900E8A740 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8C7898451F58439900E8A740 /* LinphoneManagerTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = LinphoneManagerTests.xctest; + remoteRef = 8C7898441F58439900E8A740 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -4490,7 +4520,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = Z2V957B3D6; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)/liblinphone-sdk/x86_64-apple-darwin.ios/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/Frameworks", @@ -4588,7 +4618,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = Z2V957B3D6; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)/liblinphone-sdk/x86_64-apple-darwin.ios/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/Frameworks", @@ -4685,7 +4715,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = Z2V957B3D6; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)/liblinphone-sdk/x86_64-apple-darwin.ios/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/Frameworks", @@ -4782,7 +4812,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = Z2V957B3D6; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)/liblinphone-sdk/x86_64-apple-darwin.ios/lib", "$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/Frameworks", diff --git a/submodules/bcmatroska2 b/submodules/bcmatroska2 index 46f30179f..f4b87c521 160000 --- a/submodules/bcmatroska2 +++ b/submodules/bcmatroska2 @@ -1 +1 @@ -Subproject commit 46f30179fcc9d00f35f7d0ef8eacce0a204e4d07 +Subproject commit f4b87c521a513b540f34a72ef82a52364929d0be diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 404cd8694..5bcddfbf5 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 404cd869464fa591c2a11fb91242c2983f73270f +Subproject commit 5bcddfbf5d3433723919cd540cd23040e3b88255 diff --git a/submodules/externals/libxsd b/submodules/externals/libxsd new file mode 160000 index 000000000..97dfa5b7a --- /dev/null +++ b/submodules/externals/libxsd @@ -0,0 +1 @@ +Subproject commit 97dfa5b7af486a2730aa66ef4b2b04259c9ab21b diff --git a/submodules/externals/soci b/submodules/externals/soci new file mode 160000 index 000000000..908c7eb8f --- /dev/null +++ b/submodules/externals/soci @@ -0,0 +1 @@ +Subproject commit 908c7eb8f421601e6eb7b77e1131a35bcbe374fa diff --git a/submodules/externals/xerces-c b/submodules/externals/xerces-c new file mode 160000 index 000000000..9c15b9917 --- /dev/null +++ b/submodules/externals/xerces-c @@ -0,0 +1 @@ +Subproject commit 9c15b9917507c584eadace89636b91af27b59b9c diff --git a/submodules/linphone b/submodules/linphone index 07845c193..b06df6331 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 07845c193914bdbaddf1e6f85fbb0bda5ebadd55 +Subproject commit b06df6331a109f74a3eb7063ee6914b68549e8a0 diff --git a/submodules/ortp b/submodules/ortp index 90c00439f..b05a8e716 160000 --- a/submodules/ortp +++ b/submodules/ortp @@ -1 +1 @@ -Subproject commit 90c00439f72ba5826f7d62d1fdc98d4a42752f8d +Subproject commit b05a8e716b6ea920924dd1a6920ebb2d50c3a533