Store verbosity in Environment

Author: jimporter

bfg9000/driver.py

@@ -79,6 +79,7 @@ def environment_from_args(args):
         backend_version=backend.version(),
         srcdir=args.srcdir,
         builddir=args.builddir,
+        verbose=args.verbose,
     )
 
     return env, backend
@@ -122,6 +123,7 @@ def __call__(self, parser, namespace, values, option_string=None):
             namespace.builddir = None
 
         if getattr(namespace, 'srcdir', None):
+            namespace.verbose = False
             env, backend = environment_from_args(namespace)
             parser = build.fill_user_help(env, parser)
 

bfg9000/environment.py

@@ -124,7 +124,7 @@ def from_json(cls, data):
 
 
 class Environment:
-    version = 17
+    version = 18
     envfile = '.bfg_environ'
 
     Mode = shell.Mode
@@ -136,10 +136,12 @@ def __new__(cls, *args, **kwargs):
         env.__tools = {}
         return env
 
-    def __init__(self, bfgdir, backend, backend_version, srcdir, builddir):
+    def __init__(self, bfgdir, backend, backend_version, srcdir, builddir,
+                 verbose=False):
         self.bfgdir = bfgdir.as_directory()
         self.backend = backend
         self.backend_version = backend_version
+        self.verbose = verbose
 
         self.host_platform = platforms.host.platform_info()
         self.target_platform = platforms.target.platform_info()
@@ -260,6 +262,7 @@ def save(self, path):
                     'bfgdir': self.bfgdir.to_json(),
                     'backend': self.backend,
                     'backend_version': str(self.backend_version),
+                    'verbose': self.verbose,
 
                     'host_platform': self.host_platform.to_json(),
                     'target_platform': self.target_platform.to_json(),
@@ -379,6 +382,12 @@ def load(cls, path):
 
         # ----- bfg v0.7.0 -----
 
+        # v18 adds verbose field.
+        if version < 18:
+            data['verbose'] = False
+
+        # ----- bfg v0.8.0 -----
+
         # Now that we've upgraded, initialize the Environment object.
         env = cls.__new__(cls)
 
@@ -387,7 +396,7 @@ def load(cls, path):
             data['target_platform']
         )
 
-        for i in ('backend', 'extra_args'):
+        for i in ('backend', 'extra_args', 'compdb', 'verbose'):
             setattr(env, i, data[i])
 
         for i in ('bfgdir', 'srcdir', 'builddir'):
@@ -402,6 +411,5 @@ def load(cls, path):
         env.mopack = [Path.from_json(i) for i in data['mopack']]
         env.variables = EnvVarDict.from_json(data['variables'])
         env.library_mode = LibraryMode(*data['library_mode'])
-        env.compdb = data['compdb']
 
         return env