Move verbosities

Move verbosities to support silent build mode.
Verbosity level 4 was the first unused.
All verborsity levels prior to 4 are increased by 1.

(cherry picked from commit 2ac1510)

Author: yulyugin

mbuild/dag.py

@@ -854,7 +854,7 @@ def _scan_headers(self, xinput, header_paths, assumed_directory=None):
             # headers is all the files that fn includes directly. One
             # level scan
             headers = scanner.mbuild_scan(fn, header_paths)
-            if verbose(3):
+            if verbose(4):
                 for hr in headers:
                     if hr.system:
                         sys="System   "
@@ -880,18 +880,18 @@ def _scan_headers(self, xinput, header_paths, assumed_directory=None):
                         # we are expecting to build.
                         ah = self._find_rec_for_missing_file(hr.file_name, assumed_directory)
                         if ah:
-                            if verbose(3):
+                            if verbose(4):
                                 msgb("FOUND DEP REC FOR MISSING HEADER. WE WILL BUILD IT")
                             hr.file_name = ah.file_name
                             scanned_header = False
                         elif not self._check_required_file(hr.file_name):
-                            if verbose(3):
+                            if verbose(4):
                                 msgb("MISSING HEADER NOT REQUIRED")
                             continue
                         elif assumed_directory:
                             ofn = hr.file_name
                             hr.file_name = util.join(assumed_directory, ofn)
-                            if verbose(3):
+                            if verbose(4):
                                 msgb("ASSUMING",
                                      "%s is in %s" % (ofn, assumed_directory))
 

mbuild/doxygen.py

@@ -85,12 +85,12 @@ def _find_doxygen(env):
               base.msgb('DOXYGEN',"Could not find cygwin's doxygen," +
                           "trying doxygen from PATH")
         elif env['build_os'] == 'lin':
-           if base.verbose(1):
+           if base.verbose(2):
               base.msgb("CHECKING FOR", doxygen_cmd_intel)
            if  os.path.exists(doxygen_cmd_intel):
               doxygen_cmd = doxygen_cmd_intel
         elif env['build_os'] == 'mac':
-           if base.verbose(1):
+           if base.verbose(2):
               base.msgb("CHECKING FOR", doxygen_cmd_mac)
            if  os.path.exists(doxygen_cmd_mac):
               doxygen_cmd = doxygen_cmd_mac
@@ -99,7 +99,7 @@ def _find_doxygen(env):
 
     doxygen_cmd = env.escape_string(doxygen_cmd)
     doxygen_okay = False
-    if base.verbose(1):
+    if base.verbose(2):
         base.msgb('Checking doxygen version','...')
     if base.check_python_version(2,4):
         try:
@@ -108,7 +108,7 @@ def _find_doxygen(env):
             if retval==0:
                 if len(output) > 0:
                     first_line = output[0].strip()
-                    if base.verbose(1):
+                    if base.verbose(2):
                         base.msgb("Doxygen version", first_line)
                     doxygen_okay = _doxygen_version_okay(first_line, 1,4,6)
             else:
@@ -223,7 +223,7 @@ def _build_doxygen_main(args, env):
 
     cmd   = env['DOXYGEN'] + ' ' + \
             env.escape_string(env['doxygen_config_customized'])
-    if base.verbose(1):
+    if base.verbose(2):
         base.msgb("RUN DOXYGEN", cmd)    
     (retval, output, error_output) = util.run_command(cmd)
 
@@ -292,7 +292,7 @@ def _make_doxygen_reference_manual(env, doxygen_inputs, subs, work_queue,
        phase = "DOXYGEN"
        if not okay:
            base.die("[%s] failed. dying..." % phase)
-       if base.verbose(1):
+       if base.verbose(2):
            base.msgb(phase, "build succeeded")
 
 

mbuild/env.py

@@ -345,7 +345,7 @@ def verbose_startup(self):
         if self._emitted_startup_msg:
             return
         self._emitted_startup_msg = True
-        if verbose(1):
+        if verbose(2):
             msgb("INVOKED", " ".join(sys.argv))
             msgb("START TIME", self.env['start_time_str'])
             msgb("CURRENT DIRECTORY", os.getcwd())
@@ -1024,7 +1024,7 @@ def process_user_settings(self):
                      'Setting jobs to 1 because we could not detect' + 
                      ' the number of CPUs')
 
-        if verbose(1):
+        if verbose(2):
             # print host_cpu here because it may be overridden for
             # cross compilations
             msgb("HOST_CPU", self.env['host_cpu'])
@@ -1317,7 +1317,7 @@ def set_compiler_env(self, compiler_family=None):
             die("Compiler family not recognized. Need gnu or ms")
 
         if self.env['use_yasm']:
-            if verbose(1):
+            if verbose(2):
                 msgb("USE YASM")
             build_env.yasm_support(self)
 

mbuild/util.py

@@ -62,48 +62,48 @@ def find_python(env):
     return pycmd                     
 def copy_file(src,tgt):
     """Copy src to tgt."""
-    if verbose(1):
+    if verbose(2):
         msgb("COPY", tgt + " <- " + src)
     shutil.copy(src,tgt)
 def move_file(src,tgt):
     """Move/Rename src to tgt."""
-    if verbose(1):
+    if verbose(2):
         msgb("MOVE", src + " -> " + tgt)
     shutil.move(src,tgt)
 def symlink(env,src,tgt):
     """Make a symlink from src to target. Not available on windows."""
     if env.on_windows():
         die("symlink() not available on windows")
-    if verbose(1):
+    if verbose(2):
         msgb("SYMLINK", src + " -> " + tgt)
     os.symlink(src,tgt)
 
 def copy_tree(src,tgt, ignore_patterns=None, symlinks=False):
     """Copy the tree at src to tgt. This will first remove tgt if it
     already exists."""
-    if verbose(1):
+    if verbose(2):
         msgb("COPYTREE", tgt + " <- " + src)
     if not os.path.exists(src):
         error_msg("SRC TREE DOES NOT EXIST", src)
         raise Exception
     if os.path.exists(tgt):
-        if verbose(1):
+        if verbose(2):
             msgb("Removing existing target tree", tgt)
         shutil.rmtree(tgt, ignore_errors=True)
-    if verbose(1):
+    if verbose(2):
         msgb("Copying to tree", tgt)
     if ignore_patterns:
         sp = shutil.ignore_patterns(ignore_patterns)
     else:
         sp = None
     shutil.copytree(src,tgt,ignore=sp, symlinks=symlinks)
-    if verbose(1):
+    if verbose(2):
         msgb("Done copying tree", tgt)
 
 def cmkdir(path_to_dir):
     """Make a directory if it does not exist"""
     if not os.path.exists(path_to_dir):
-        if verbose(1):
+        if verbose(2):
             msgb("MKDIR", path_to_dir)
         os.makedirs(path_to_dir)
 def list2string(ls):
@@ -125,8 +125,7 @@ def remove_file(fn, env=None, quiet=True):
        make_writable(fn)
     if os.path.exists(fn) or os.path.lexists(fn):
        if not quiet:
-           if verbose(1):
-               vmsgb(1, "REMOVING", fn)
+           vmsgb(2, "REMOVING", fn)
        os.unlink(fn)
     return (0, [])
 def remove_tree(dir_name, env=None, dangerous=False):
@@ -148,13 +147,13 @@ def _important_file(dir_name):
                 return True
         return False
 
-    vmsgb(1, "CHECKING", dir_name)
+    vmsgb(2, "CHECKING", dir_name)
     if os.path.exists(dir_name):
        if not dangerous and _important_file(dir_name):
            s = 'Did not remove directory {} because of a .svn/.git subdirectory'.format(dir_name)
            warn(s)
            return (1, [ s ])
-       vmsgb(1, "REMOVING", dir_name)
+       vmsgb(2, "REMOVING", dir_name)
        make_writable(dir_name)
        shutil.rmtree(dir_name, ignore_errors = True)
     return (0, [])
@@ -282,8 +281,7 @@ def qdip(fn):
 
 def touch(fn):
     """Open a file for append. Write nothing to it"""
-    if verbose():
-        vmsgb(1, "TOUCH", fn)
+    vmsgb(1, "TOUCH", fn)
     f=open(fn,"a")
     f.close()
 

mbuild/work_queue.py

@@ -339,7 +339,7 @@ def _pretty_cmd_str(self):
    def dump(self, tab_output=False, show_output=True):
       s = []
       nl = '\n'
-      if verbose(1):
+      if verbose(2):
          pass
       elif self.failed():
          pass
@@ -640,15 +640,15 @@ def _stop_daemons(self):
       for i in range(self.max_parallelism):
          t = command_t()
          t.terminator = True
-         if verbose(3):
+         if verbose(4):
             msgb("SENT TERMINATOR", str(i))
          self._start_a_job(t)
 
    def _join_threads(self):
       """Use this when not running threads in daemon-mode"""
       for t in self.threads:
          t.join()
-         if verbose(3):
+         if verbose(4):
             msgb("WORKER THREAD TERMINATED")
       self.threads = []
 
@@ -779,7 +779,7 @@ def _start_more_jobs(self):
          cmd = ready.popleft()
          # FIXME: small concern that this could be slow
          self.pending_commands.remove(cmd)
-         if verbose(2):
+         if verbose(3):
             msgb("LAUNCHING", cmd.dump_cmd())
          self._start_a_job(cmd)
          self.pending -= 1
@@ -933,7 +933,7 @@ def _build_blind_threads(self,
          if started:
              c = self._wait_for_jobs()
          if c:
-            if verbose(3):
+            if verbose(4):
                msgb("JOB COMPLETED")
             if c.failed():
                self.errors += 1
@@ -952,7 +952,7 @@ def _build_blind_threads(self,
             c._complete()
             # Command objects can depend on each other
             # directly. Enable execution of dependent commands.
-            if verbose(3):
+            if verbose(4):
                msgb("ADD CMD-AFTERS")
             self.add(c._check_afters())
             # Or we might find new commands from the file DAG.
@@ -988,7 +988,7 @@ def _build_blind_no_threads(self, die_on_errors=True,
             _worker_one_task(self.out_queue, self.back_queue)
             c = self._wait_for_jobs()
             if c:
-               if verbose(3):
+               if verbose(4):
                   msgb("JOB COMPLETED")
                if c.failed():
                   okay = False
@@ -1002,7 +1002,7 @@ def _build_blind_no_threads(self, die_on_errors=True,
                   c._complete()
                   # Command objects can depende on each other
                   # directly. Enable execution of dependent commands.
-                  if verbose(3):
+                  if verbose(4):
                      msgb("ADD CMD-AFTERS")
                   self.add(c._check_afters())
                   # Or we might find new commands from the file DAG.