Commit 087b822d authored by Erwan Croze's avatar Erwan Croze 👋🏻
Browse files

Merge remote-tracking branch 'origin' into dev_screensharing

parents 96a69c59 95810e28
......@@ -2,3 +2,6 @@ WORK
OUTPUT
Makefile
submodules/tunnel
record_for_lc_*.wav
.bc_tester_utils.tmp
prepare.conf.user
......@@ -75,9 +75,6 @@
[submodule "submodules/externals/antlr3"]
path = submodules/externals/antlr3
url = git://git.linphone.org/antlr3.git
[submodule "submodules/cunit"]
path = submodules/cunit
url = git://git.linphone.org/cunit.git
[submodule "submodules/externals/v4l-utils"]
path = submodules/externals/v4l-utils
url = git://linuxtv.org/v4l-utils.git
......@@ -89,3 +86,9 @@
path = submodules/externals/zlib
url = git://git.linphone.org/zlib
ignore = dirty
[submodule "submodules/externals/openh264"]
path = submodules/externals/openh264
url = https://github.com/cisco/openh264
[submodule "submodules/bcunit"]
path = submodules/bcunit
url = git://git.linphone.org/bcunit.git
......@@ -118,6 +118,29 @@ class DesktopPreparator(prepare.Preparator):
self.additional_args += ["-DCMAKE_SKIP_INSTALL_RPATH=YES"]
self.additional_args += ["-DENABLE_RELATIVE_PREFIX=YES"]
def check_environment(self):
ret = prepare.Preparator.check_environment(self)
if platform.system() == 'Windows':
ret |= not self.check_is_installed('mingw-get', 'MinGW (https://sourceforge.net/projects/mingw/files/Installer/)')
if "python" in self.args.target or "python-raspberry" in self.args.target:
if platform.system() == 'Windows':
doxygen_prog = 'doxygen (http://www.stack.nl/~dimitri/doxygen/download.html)'
graphviz_prog = 'graphviz (http://graphviz.org/Download.php)'
else:
doxygen_prog = 'doxygen'
graphviz_prog = 'graphviz'
ret |= not self.check_is_installed('doxygen', doxygen_prog)
ret |= not self.check_is_installed('dot', graphviz_prog)
ret |= not self.check_python_module_is_present('pystache')
ret |= not self.check_python_module_is_present('wheel')
return ret
def show_missing_dependencies(self):
if self.missing_dependencies:
error("The following binaries are missing: {}. Please install these packages:\n\t{}".format(
" ".join(self.missing_dependencies.keys()),
" ".join(self.missing_dependencies.values())))
def clean(self):
prepare.Preparator.clean(self)
if os.path.isfile('Makefile'):
......@@ -127,7 +150,7 @@ class DesktopPreparator(prepare.Preparator):
if os.path.isdir('OUTPUT') and not os.listdir('OUTPUT'):
os.rmdir('OUTPUT')
def generate_makefile(self, generator):
def generate_makefile(self, generator, project_file=''):
targets = self.args.target
targets_str = ""
for target in targets:
......@@ -135,9 +158,9 @@ class DesktopPreparator(prepare.Preparator):
{target}: {target}-build
{target}-build:
\t{generator} WORK/{target}/cmake
\t{generator} WORK/{target}/cmake/{project_file}
\t@echo "Done"
""".format(target=target, generator=generator)
""".format(target=target, generator=generator, project_file=project_file)
makefile = """
targets={targets}
......@@ -165,7 +188,7 @@ help: help-prepare-options
\t@echo ""
\t@echo "Available targets: {targets}"
\t@echo ""
""".format(targets=' '.join(targets), targets_str=targets_str, options=' '.join(sys.argv), generator=generator)
""".format(targets=' '.join(targets), targets_str=targets_str, options=' '.join(self.argv), generator=generator)
f = open('Makefile', 'w')
f.write(makefile)
f.close()
......@@ -175,8 +198,8 @@ help: help-prepare-options
def main():
preparator = DesktopPreparator()
preparator.parse_args()
if preparator.check_tools() != 0:
preparator.show_missing_dependencies()
if preparator.check_environment() != 0:
preparator.show_environment_errors()
return 1
return preparator.run()
......
bcg729 @ c95f8533
Subproject commit ae055773810b0681adbeb74b14dfdfe775186664
Subproject commit c95f85337a3adbbc2d38c89e860dfe72413eed4b
bctoolbox @ 381df010
Subproject commit 61c9bc688d5f0a4646a1964c53660901445ac9bc
Subproject commit 381df01040121f427c5d1a533cee017be033487a
bcunit @ 53b8f5fe
Subproject commit 53b8f5fed434857af9934b377f21adfc6c334bd6
belcard @ 7ba5c18d
Subproject commit eb2cc780c7a2c7bbb39ea0012e5a8446d2bf8f2e
Subproject commit 7ba5c18d4e8d12baafb33d2146006d573245ff65
belle-sip @ 374a1ae8
Subproject commit a3bc353c545da6e0dd98403d8801be2e618f3e2c
Subproject commit 374a1ae8be6eea497df54e90041b11d81bb32cdf
belr @ aedc70d9
Subproject commit 3818822fc418b90a8edeb506b5498aa6bbcee7ff
Subproject commit aedc70d9503206b2023e575318ea5d12d710bf1f
bzrtp @ 883d1cd5
Subproject commit b8033c8dc960b8fd446e3e68d37749828cf7f808
Subproject commit 883d1cd5b00ff8bdebdb65dc420d0c60e7edef1c
cmake-builder @ fa5df6ba
Subproject commit c90bfc659eb182a0dc4f68e45e87ef631ec6732b
Subproject commit fa5df6ba04dbafb5a0341622d55294f488432224
cunit @ 0a0a9c60
Subproject commit 0a0a9c60f5a1b899ae26b705fa5224ef25377982
antlr3 @ ac1069cf
Subproject commit 52075ffb35975c6901e924b4a763b6fb23abd623
Subproject commit ac1069cf214b15b86272cbc6ded5916d7d2f85ec
bv16-floatingpoint @ aa1828ca
Subproject commit 6899f2759c7b19d5402335d3a937c53020abfeca
Subproject commit aa1828cab91d6c17a74edd293c6c263f20196473
Subproject commit 2610ab183249aee91862d2ad065f61db89107b34
srtp @ d79ae951
Subproject commit befc23777e07efba36ffd7bda73f22c92d4e2475
Subproject commit d79ae95126baa3cec83097469e97525a1d9e2d50
linphone @ f6efda30
Subproject commit 205c19fdb020811e70fb20036b5a00897ef34950
Subproject commit f6efda301089c6c3b8d1e49d52e7a1d0c0ddb286
msamr @ dd3b2d0a
Subproject commit 529440c3ee4a71565ee0db4df7e26811cf4b8506
Subproject commit dd3b2d0a767421c4c7e9b8cf28fe9d2ca5c8a45b
msopenh264 @ b079dd5c
Subproject commit dfc65508b0dec9b4d1b321b0546cf50d12afad3c
Subproject commit b079dd5c32bf2012e852b9b3ed3135d04ebd0964
mssilk @ 28b96fa8
Subproject commit 3723a870ca008a088767a8ecff60cc0b568b75e9
Subproject commit 28b96fa8401d95c720e1539aa09c11bdee6a1e25
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment