From 3294240b9fbd2737f7de9ad15ba16f8ae95e5156 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 20 Oct 2015 15:48:00 +0200 Subject: [PATCH] Update submodules + simplify Makefile generated by prepare.py. --- prepare.py | 92 +++----------------------------------- submodules/bcg729 | 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, 16 insertions(+), 98 deletions(-) diff --git a/prepare.py b/prepare.py index b7d1196ee..8739890bc 100755 --- a/prepare.py +++ b/prepare.py @@ -50,6 +50,8 @@ class IOSTarget(prepare.Target): self.toolchain_file = 'toolchains/toolchain-ios-' + arch + '.cmake' self.output = 'liblinphone-sdk/' + arch + '-apple-darwin.ios' self.additional_args = [ + '-DCMAKE_INSTALL_MESSAGE=LAZY', + '-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES', '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + current_path + '/submodules' ] @@ -270,64 +272,14 @@ def install_git_hook(): def generate_makefile(platforms, generator): - packages = os.listdir('WORK/ios-' + platforms[0] + '/Build') - packages.remove('dummy_libraries') - packages.sort() arch_targets = "" for arch in platforms: 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)) -\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,36 +293,13 @@ 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)) - sdk: -\tfor arch in $(archs); do {generator} WORK/ios-$$arch/cmake EP_dummy_libraries; done && \\ \tarchives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\ \trm -rf liblinphone-sdk/apple-darwin && \\ \tmkdir -p liblinphone-sdk/apple-darwin && \\ @@ -429,7 +358,6 @@ help: help-prepare-options \t@echo "(please read the README.md file first)" \t@echo "" \t@echo "Available architectures: {archs}" -\t@echo "Available packages: {packages}" \t@echo "" \t@echo "Available targets:" \t@echo "" @@ -438,19 +366,9 @@ help: help-prepare-options \t@echo " * zipsdk: generates a ZIP archive of liblinphone-sdk/apple-darwin containing the SDK. Use this only after SDK is built." \t@echo " * zipres: creates a tar.gz file with all the resources (images)" \t@echo "" -\t@echo "=== Advanced usage ===" -\t@echo "" -\t@echo " * build-[package]: builds the package for all architectures" -\t@echo " * clean-[package]: cleans package compilation for all architectures" -\t@echo " * veryclean-[package]: cleans the package for all architectures" -\t@echo "" -\t@echo " * [{arch_opts}]-build-[package]: builds a package for the selected architecture" -\t@echo " * [{arch_opts}]-clean-[package]: cleans package compilation for the selected architecture" -\t@echo " * [{arch_opts}]-veryclean-[package]: cleans the package for the selected architecture" -\t@echo "" """.format(archs=' '.join(platforms), arch_opts='|'.join(platforms), first_arch=platforms[0], options=' '.join(sys.argv), - arch_targets=arch_targets, packages=' '.join(packages), + arch_targets=arch_targets, multiarch=multiarch, generator=generator) f = open('Makefile', 'w') f.write(makefile) diff --git a/submodules/bcg729 b/submodules/bcg729 index dc37a9a01..06d0bfe52 160000 --- a/submodules/bcg729 +++ b/submodules/bcg729 @@ -1 +1 @@ -Subproject commit dc37a9a01a9b69f49b6339cd2f5d999fcf584a89 +Subproject commit 06d0bfe525d7ba0246020408ecb62d13b7e4c868 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 b15272b1b..92f86c8a2 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit b15272b1bc3394ae5ed06300bd5babd05a4a94db +Subproject commit 92f86c8a2c7b0adb461e945ca508b8ef5aa5db3c 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 c10bceadc..c302fb92e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c10bceadcbe0ab668d07fbb539a435bf9e0ebebe +Subproject commit c302fb92e91a22937fbd3291e01b1eb4d976737f 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 0722c480d..78ed115b5 160000 --- a/submodules/msopenh264 +++ b/submodules/msopenh264 @@ -1 +1 @@ -Subproject commit 0722c480d61746e9ab36f76b04ab2f3210890d07 +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 3a9b5a9ff..2e9b11b82 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit 3a9b5a9ff79ea45b9f8f03d03d4a4a9213dc2c5d +Subproject commit 2e9b11b8255a305adcc8e94ff3f77b6a2c08418e