From 64e90528a37914bc420074b9cb70956a23037f9c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 14 Jun 2017 16:33:34 +0200 Subject: [PATCH] fix build dependencies checking (python modules) --- prepare.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/prepare.py b/prepare.py index 1c4196f17..8544b151a 100755 --- a/prepare.py +++ b/prepare.py @@ -142,16 +142,16 @@ class DesktopPreparator(prepare.Preparator): 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 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') 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