Split the monolithic introspection file into chunks

1 files changed, 13 insertions, 2 deletions

diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index b10f826..67b58bc 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -308,6 +308,7 @@ def search_version(text):
 class Environment:
     private_dir = 'meson-private'
     log_dir = 'meson-logs'
+    info_dir = 'meson-info'
 
     def __init__(self, source_dir, build_dir, options):
         self.source_dir = source_dir
@@ -318,8 +319,10 @@ class Environment:
         if build_dir is not None:
             self.scratch_dir = os.path.join(build_dir, Environment.private_dir)
             self.log_dir = os.path.join(build_dir, Environment.log_dir)
+            self.info_dir = os.path.join(build_dir, Environment.info_dir)
             os.makedirs(self.scratch_dir, exist_ok=True)
             os.makedirs(self.log_dir, exist_ok=True)
+            os.makedirs(self.info_dir, exist_ok=True)
             try:
                 self.coredata = coredata.load(self.get_build_dir())
                 self.first_invocation = False
@@ -333,8 +336,16 @@ class Environment:
                     mlog.log('Reason:', mlog.red(str(e)))
                     coredata.read_cmd_line_file(self.build_dir, options)
                     self.create_new_coredata(options)
-                else:
-                    raise e
+                except MesonException as e:
+                    # If we stored previous command line options, we can recover from
+                    # a broken/outdated coredata.
+                    if os.path.isfile(coredata.get_cmd_line_file(self.build_dir)):
+                        mlog.warning('Regenerating configuration from scratch.')
+                        mlog.log('Reason:', mlog.red(str(e)))
+                        coredata.read_cmd_line_file(self.build_dir, options)
+                        self.create_new_coredata(options)
+                    else:
+                        raise e
         else:
             # Just create a fresh coredata in this case
             self.create_new_coredata(options)