diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-16 21:49:00 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-16 21:49:00 +0200 |
commit | 8c6c0d9b82f46e808eeff658e73ee241ea58f2a0 (patch) | |
tree | b109f2cd841f03008bf84448a8db81e465c0ac19 /generators.py | |
parent | d5f7207e2ea2bbeebfdbb08fdfa478ad7ab713db (diff) | |
download | meson-8c6c0d9b82f46e808eeff658e73ee241ea58f2a0.zip meson-8c6c0d9b82f46e808eeff658e73ee241ea58f2a0.tar.gz meson-8c6c0d9b82f46e808eeff658e73ee241ea58f2a0.tar.bz2 |
Fix regeneration rule so it is not triggered needlessly.
Diffstat (limited to 'generators.py')
-rwxr-xr-x | generators.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/generators.py b/generators.py index 2da5d68..bf44bd7 100755 --- a/generators.py +++ b/generators.py @@ -267,7 +267,9 @@ class NinjaGenerator(Generator): c = (ninja_quote(self.environment.get_builder_command()), ninja_quote(self.environment.get_source_dir()), ninja_quote(self.environment.get_build_dir())) - outfile.write(" command = '%s' '%s' '%s' -G ninja\n\n" % c) + outfile.write(" command = '%s' '%s' '%s' -G ninja\n" % c) + outfile.write(' description = Regenerating build files\n') + outfile.write(' generator = 1\n\n') def generate_static_link_rules(self, outfile): static_linker = self.build.static_linker @@ -419,12 +421,14 @@ class NinjaGenerator(Generator): default = 'default all\n\n' outfile.write(build) outfile.write(default) + deps = [ ninja_quote(os.path.join(self.build_to_src, df)) \ for df in self.interpreter.get_build_def_files()] depstr = ' '.join(deps) buildregen = 'build build.ninja: REGENERATE_BUILD | %s\n\n' % depstr - ignore_missing = 'build %s: phony\n\n' % depstr outfile.write(buildregen) + + ignore_missing = 'build %s: phony\n\n' % depstr outfile.write(ignore_missing) class ShellGenerator(Generator): |