[jhbuild] meson: Use meson-private/coredata.dat to detect a valid build directory



commit b1d2ebdef165435c048c59192a32ba69d4f2c6dd
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Fri Jun 9 21:27:17 2017 +0800

    meson: Use meson-private/coredata.dat to detect a valid build directory
    
    Meson creates meson-log and meson-private in a build directory even if it fails
    to generate build files. When the user try to build the failed module again,
    jhbuild skips configure phase and ninja fails because build.ninja cannot be
    found. To avoid wrongly skipping configure phase, we should use
    meson-private/coredata.dat to detect a valid build directory, which is the last
    file written during build files generation.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782811

 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 d694a3b..7b54061 100644
--- a/jhbuild/modtypes/meson.py
+++ b/jhbuild/modtypes/meson.py
@@ -121,7 +121,7 @@ class MesonModule(MakeModule, DownloadableModule):
 
         srcdir = self.get_srcdir(buildscript)
         builddir = self.get_builddir(buildscript)
-        meson_marker_path = os.path.join(builddir, 'meson-private')
+        meson_marker_path = os.path.join(builddir, 'meson-private', 'coredata.dat')
         if not os.path.exists(meson_marker_path):
             return False
 


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