From b0446075ec8e7e3e1506610f03417da14d4a7b08 Mon Sep 17 00:00:00 2001 From: Hemmo Nieminen Date: Thu, 1 Mar 2018 00:08:37 +0200 Subject: Remove some unused variables. --- mesonbuild/backend/ninjabackend.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 8577bc7..ff8bbed 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os, pickle, re, shlex, subprocess, sys +import os, pickle, re, shlex, subprocess from collections import OrderedDict from pathlib import PurePath @@ -115,7 +115,6 @@ class NinjaBuildElement: (name, elems) = e should_quote = name not in raw_names line = ' %s = ' % name - noq_templ = "%s" newelems = [] for i in elems: if not should_quote or i == '&&': # Hackety hack hack @@ -1852,7 +1851,6 @@ rule FORTRAN_DEP_HACK infilelist = genlist.get_inputs() outfilelist = genlist.get_outputs() extra_dependencies = [os.path.join(self.build_to_src, i) for i in genlist.extra_depends] - source_target_dir = self.get_target_source_dir(target) for i in range(len(infilelist)): if len(generator.outputs) == 1: sole_output = os.path.join(self.get_target_private_dir(target), outfilelist[i]) @@ -1877,7 +1875,6 @@ rule FORTRAN_DEP_HACK # We have consumed output files, so drop them from the list of remaining outputs. if sole_output == '': outfilelist = outfilelist[len(generator.outputs):] - relout = self.get_target_private_dir(target) args = self.replace_paths(target, args, override_subdir=subdir) cmdlist = exe_arr + self.replace_extra_args(args, genlist) if generator.capture: -- cgit v1.1 From 7fb8e518b2666aa7eea0cf63b830884f2bfeb269 Mon Sep 17 00:00:00 2001 From: Hemmo Nieminen Date: Thu, 1 Mar 2018 00:25:12 +0200 Subject: Harmonize data pickling. Try to be more consistent on using save() and load() methods to pickle data. --- mesonbuild/backend/ninjabackend.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index ff8bbed..660b1a5 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2691,3 +2691,9 @@ rule FORTRAN_DEP_HACK elem = NinjaBuildElement(self.all_outputs, deps, 'phony', '') elem.write(outfile) + +def load(build_dir): + filename = os.path.join(build_dir, 'meson-private', 'install.dat') + with open(filename, 'rb') as f: + obj = pickle.load(f) + return obj -- cgit v1.1