[jhbuild] meson: fix clean/build/install if configure is skipped



commit 73b433d89cd4c2496e9d44659a486d4ea0e2a20c
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun Oct 9 11:21:06 2016 -0500

    meson: fix clean/build/install if configure is skipped
    
    This makes 'jhbuild buildone' work again. We need to always check for
    the ninja binary.

 jhbuild/modtypes/meson.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/modtypes/meson.py b/jhbuild/modtypes/meson.py
index 6e648cf..a42c6c8 100644
--- a/jhbuild/modtypes/meson.py
+++ b/jhbuild/modtypes/meson.py
@@ -52,6 +52,7 @@ class MesonModule(MakeModule, DownloadableModule):
         self.skip_install_phase = skip_install_phase
         self.force_non_srcdir_builds = True
         self.supports_install_destdir = True
+        self.find_ninja()
 
     def find_ninja(self):
         for f in ['ninja', 'ninja-build']:
@@ -100,7 +101,6 @@ class MesonModule(MakeModule, DownloadableModule):
         prefix = os.path.expanduser(buildscript.config.prefix)
         if not inpath('meson', os.environ['PATH'].split(os.pathsep)):
             raise CommandError(_('%s not found') % 'meson')
-        self.find_ninja()
         baseargs = '--prefix %s --libdir %s' % (prefix, self.get_libdir())
         mesonargs = self.get_mesonargs()
         cmd = 'meson %s %s %s' % (baseargs, mesonargs, srcdir)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]