diff options
| -rw-r--r-- | mesonbuild/environment.py | 1 | ||||
| -rw-r--r-- | mesonbuild/scripts/regen_checker.py | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 47414ca..b9552a9 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -127,6 +127,7 @@ class Environment(): self.first_invocation = False except FileNotFoundError: self.coredata = coredata.CoreData(options) + self.coredata.meson_script_file = self.meson_script_file self.first_invocation = True if self.coredata.cross_file: self.cross_info = CrossBuildInfo(self.coredata.cross_file) diff --git a/mesonbuild/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py index 2e974d8..f65f3bd 100644 --- a/mesonbuild/scripts/regen_checker.py +++ b/mesonbuild/scripts/regen_checker.py @@ -33,25 +33,28 @@ def need_regen(regeninfo, regen_timestamp): Vs2010Backend.touch_regen_timestamp(regeninfo.build_dir) return False -def regen(regeninfo): +def regen(regeninfo, mesonscript, backend): scriptdir = os.path.split(__file__)[0] - mesonscript = os.path.join(scriptdir, '../../', 'meson') cmd = [sys.executable, mesonscript, '--internal', 'regenerate', regeninfo.build_dir, regeninfo.source_dir, - '--backend=vs2010'] + '--backend=' + backend] subprocess.check_call(cmd) def run(args): private_dir = args[0] dumpfile = os.path.join(private_dir, 'regeninfo.dump') + coredata = os.path.join(private_dir, 'coredata.dat') regeninfo = pickle.load(open(dumpfile, 'rb')) + coredata = pickle.load(open(coredata, 'rb')) + mesonscript = coredata.meson_script_file + backend = coredata.get_builtin_option('backend') regen_timestamp = os.stat(dumpfile).st_mtime if need_regen(regeninfo, regen_timestamp): - regen(regeninfo) + regen(regeninfo, mesonscript, backend) sys.exit(0) if __name__ == '__main__': |