From 2aa0d0d515c7093e342d40a9ac426aa6ea004a76 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 13 Jun 2016 14:26:38 +0200 Subject: [PATCH] Add some check of tools in prepare.py. --- prepare.py | 21 +++++++++++++++++++++ submodules/cmake-builder | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index b86c95236..7488ada15 100755 --- a/prepare.py +++ b/prepare.py @@ -118,6 +118,27 @@ class DesktopPreparator(prepare.Preparator): self.additional_args += ["-DCMAKE_SKIP_INSTALL_RPATH=YES"] self.additional_args += ["-DENABLE_RELATIVE_PREFIX=YES"] + def check_tools(self): + ret = prepare.Preparator.check_tools(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) + 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'): diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 2b9f1cff1..605f5df0f 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 2b9f1cff1a509ac081e1d3aeda934f36ad61411d +Subproject commit 605f5df0f2fd6c42dbd0f4c55ac119fb152930f5