From 94e103798d50b84add3c69cd565f8273f3b30892 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 13 Oct 2015 16:27:05 +0200
Subject: [PATCH] Use the projects grouping feature of linphone-cmake-builder.

---
 prepare.py                 | 78 +++++---------------------------------
 submodules/belle-sip       |  2 +-
 submodules/bzrtp           |  2 +-
 submodules/cmake-builder   |  2 +-
 submodules/libilbc-rfc3951 |  2 +-
 submodules/linphone        |  2 +-
 submodules/msamr           |  2 +-
 submodules/msilbc          |  2 +-
 submodules/msopenh264      |  2 +-
 submodules/mssilk          |  2 +-
 submodules/mswebrtc        |  2 +-
 submodules/msx264          |  2 +-
 12 files changed, 21 insertions(+), 79 deletions(-)

diff --git a/prepare.py b/prepare.py
index ab521b38a..9ca12476a 100755
--- a/prepare.py
+++ b/prepare.py
@@ -50,6 +50,7 @@ class IOSTarget(prepare.Target):
         self.toolchain_file = 'toolchains/toolchain-ios-' + arch + '.cmake'
         self.output = 'liblinphone-sdk/' + arch + '-apple-darwin.ios'
         self.additional_args = [
+	    '-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES',
             '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' +
             current_path + '/submodules'
         ]
@@ -278,56 +279,16 @@ def generate_makefile(platforms, generator):
         arch_targets += """
 {arch}: {arch}-build
 
-{arch}-build: $(addprefix {arch}-build-, $(packages))
+{arch}-build:
+\t{generator} WORK/ios-{arch}/cmake
 \t@echo "Done"
 
-{arch}-clean: $(addprefix {arch}-clean-, $(packages))
+WORK/ios-{arch}/build.done:
+\t$(MAKE) {arch}-build && touch WORK/ios-{arch}/build.done
+
+{arch}-dev: WORK/ios-{arch}/build.done
+\t{generator} WORK/ios-{arch}/Build/linphone_builder
 \t@echo "Done"
-
-{arch}-veryclean: $(addprefix {arch}-veryclean-, $(packages))
-\t@echo "Done"
-
-{arch}-build-%: package-in-list-%
-\trm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-update; \\
-\t{generator} WORK/ios-{arch}/cmake EP_$*
-
-{arch}-clean-%: package-in-list-%
-\t{generator} WORK/ios-{arch}/Build/$* clean; \\
-\trm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-build; \\
-\trm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-install;
-
-{arch}-veryclean-%: package-in-list-%
-\ttest -f WORK/ios-{arch}/Build/$*/install_manifest.txt && \\
-\tcat WORK/ios-{arch}/Build/$*/install_manifest.txt | xargs rm; \\
-\trm -rf WORK/ios-{arch}/Build/$*/*; \\
-\trm -f WORK/ios-{arch}/Stamp/EP_$*/*; \\
-\techo "Run 'make {arch}-build-$*' to rebuild $* correctly.";
-
-{arch}-veryclean-ffmpeg:
-\t{generator} WORK/ios-{arch}/Build/ffmpeg uninstall; \\
-\trm -rf WORK/ios-{arch}/Build/ffmpeg/*; \\
-\trm -f WORK/ios-{arch}/Stamp/EP_ffmpeg/*; \\
-\techo "Run 'make {arch}-build-ffmpeg' to rebuild ffmpeg correctly.";
-
-{arch}-clean-openh264:
-\tcd WORK/ios-{arch}/Build/openh264; \\
-\t$(MAKE) -f ../../../../submodules/externals/openh264/Makefile clean; \\
-\trm -f WORK/ios-{arch}/Stamp/EP_openh264/EP_openh264-build; \\
-\trm -f WORK/ios-{arch}/Stamp/EP_openh264/EP_openh264-install;
-
-{arch}-veryclean-openh264:
-\trm -rf liblinphone-sdk/{arch}-apple-darwin.ios/include/wels; \\
-\trm -f liblinphone-sdk/{arch}-apple-darwin.ios/lib/libopenh264.*; \\
-\trm -rf WORK/ios-{arch}/Build/openh264/*; \\
-\trm -f WORK/ios-{arch}/Stamp/EP_openh264/*; \\
-\techo "Run 'make {arch}-build-openh264' to rebuild openh264 correctly.";
-
-{arch}-veryclean-vpx:
-\trm -rf liblinphone-sdk/{arch}-apple-darwin.ios/include/vpx; \\
-\trm -f liblinphone-sdk/{arch}-apple-darwin.ios/lib/libvpx.*; \\
-\trm -rf WORK/ios-{arch}/Build/vpx/*; \\
-\trm -f WORK/ios-{arch}/Stamp/EP_vpx/*; \\
-\techo "Run 'make {arch}-build-vpx' to rebuild vpx correctly.";
 """.format(arch=arch, generator=generator)
     multiarch = ""
     for arch in platforms[1:]:
@@ -341,33 +302,14 @@ def generate_makefile(platforms, generator):
 """.format(first_arch=platforms[0], arch=arch)
     makefile = """
 archs={archs}
-packages={packages}
 LINPHONE_IPHONE_VERSION=$(shell git describe --always)
 
 .PHONY: all
 .SILENT: sdk
-#turn off parallelism because it is not yet handled properly
-.NOTPARALLEL:
 all: build
 
-package-in-list-%:
-\tif ! grep -q " $* " <<< " $(packages) "; then \\
-\t\techo "$* not in list of available packages: $(packages)"; \\
-\t\texit 3; \\
-\tfi
-
-build-%: package-in-list-% $(addsuffix -build-%, $(archs))
-\t@echo "Build of $* terminated"
-
-clean-%: package-in-list-% $(addsuffix -clean, $(archs))
-\t@echo "Clean of $* terminated"
-
-veryclean-%: package-in-list-% $(addsuffix -veryclean, $(archs))
-\t@echo "Veryclean of $* terminated"
-
-clean: $(addprefix clean-,$(packages))
-
-veryclean: $(addprefix veryclean-,$(packages))
+dev: $(addsuffix -dev, $(archs))
+\t$(MAKE) sdk
 
 sdk:
 \tfor arch in $(archs); do {generator} WORK/ios-$$arch/cmake EP_dummy_libraries; done && \\
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 0efd4dfd5..c9e603882 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 0efd4dfd5b37fb28ba1ecbabcc8d37defddfd517
+Subproject commit c9e603882c3b6bd2b387f17ba8c003ffb4f218fe
diff --git a/submodules/bzrtp b/submodules/bzrtp
index 7f0b84802..4c9fc9539 160000
--- a/submodules/bzrtp
+++ b/submodules/bzrtp
@@ -1 +1 @@
-Subproject commit 7f0b84802a6e1d1f99efb95de4d9b460069a3f23
+Subproject commit 4c9fc9539a06483da62938e8ae0ea48b18d026e6
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index e5ddd8925..cde0af647 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit e5ddd892561b0c5df25b7036bd9229fe6a6ea81a
+Subproject commit cde0af647557dd73a74d868779b7906c78b31e0d
diff --git a/submodules/libilbc-rfc3951 b/submodules/libilbc-rfc3951
index a6bb1eb6d..91b61e39f 160000
--- a/submodules/libilbc-rfc3951
+++ b/submodules/libilbc-rfc3951
@@ -1 +1 @@
-Subproject commit a6bb1eb6dab5541cdded6a1f0326539234954c5d
+Subproject commit 91b61e39fb9c5d3dc78691f3d6e4f1d65c8b0d2a
diff --git a/submodules/linphone b/submodules/linphone
index 4e3ea86c9..2bc233d95 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 4e3ea86c90cf125f1348dc4f296540d1696e5851
+Subproject commit 2bc233d95b367c2cbd00240a0703de0f5b3c7b37
diff --git a/submodules/msamr b/submodules/msamr
index c2a0886a9..e56ef9f86 160000
--- a/submodules/msamr
+++ b/submodules/msamr
@@ -1 +1 @@
-Subproject commit c2a0886a9350004e3da94d968cae9978c7472a9d
+Subproject commit e56ef9f86989bafa9a0e808ed4b34c2264c6e10d
diff --git a/submodules/msilbc b/submodules/msilbc
index b5a2b0702..bf4815c4c 160000
--- a/submodules/msilbc
+++ b/submodules/msilbc
@@ -1 +1 @@
-Subproject commit b5a2b070259ef0c4f404fa8ca87752b8b1259d76
+Subproject commit bf4815c4cf9574afeae7c6b28347b747085019fc
diff --git a/submodules/msopenh264 b/submodules/msopenh264
index 9be271700..78ed115b5 160000
--- a/submodules/msopenh264
+++ b/submodules/msopenh264
@@ -1 +1 @@
-Subproject commit 9be271700b377a251b95e9d8dbe0e8b878a403ac
+Subproject commit 78ed115b583ee43473f982d370d85d2f86754dac
diff --git a/submodules/mssilk b/submodules/mssilk
index dd9dd3e81..49306ca45 160000
--- a/submodules/mssilk
+++ b/submodules/mssilk
@@ -1 +1 @@
-Subproject commit dd9dd3e81719972232d9d4df7bc5e7c5282722bb
+Subproject commit 49306ca4566480e08a0b64f1323bfc9f354d41bf
diff --git a/submodules/mswebrtc b/submodules/mswebrtc
index eecba24b5..9f7b3128b 160000
--- a/submodules/mswebrtc
+++ b/submodules/mswebrtc
@@ -1 +1 @@
-Subproject commit eecba24b5559c89e123991ab1f32f35649b7ebe8
+Subproject commit 9f7b3128b9c6b396c89d784ba5ddfa68be05607a
diff --git a/submodules/msx264 b/submodules/msx264
index e8fd6adb5..2e9b11b82 160000
--- a/submodules/msx264
+++ b/submodules/msx264
@@ -1 +1 @@
-Subproject commit e8fd6adb59e9015c1bfe58e364565016ef26122c
+Subproject commit 2e9b11b8255a305adcc8e94ff3f77b6a2c08418e