Fix pdb file bug and bug with unlinking outputs.
authorDavid Anderson <dvander@alliedmods.net>
Fri Nov 15 19:11:42 2013 -0800 (2013-11-15)
changeset 185559cd75c3c35
parent 174 5a661ca94c11
child 186 3e40d9c651f1
child 187 5a6d0d4b6007
Fix pdb file bug and bug with unlinking outputs.
ambuild2/frontend/amb2/gen.py
ambuild2/frontend/cpp.py
ambuild2/task.py
     1.1 --- a/ambuild2/frontend/amb2/gen.py	Tue Nov 12 02:33:12 2013 -0800
     1.2 +++ b/ambuild2/frontend/amb2/gen.py	Fri Nov 15 19:11:42 2013 -0800
     1.3 @@ -377,7 +377,7 @@
     1.4        for outgoing in self.db.query_strong_outgoing(cmd_entry):
     1.5          if outgoing not in must_link:
     1.6            self.db.drop_strong_edge(cmd_entry, outgoing)
     1.7 -          self.old_outputs.add(outgoing)
     1.8 +          self.db.drop_output(outgoing)
     1.9          else:
    1.10            must_link.remove(outgoing)
    1.11  
     2.1 --- a/ambuild2/frontend/cpp.py	Tue Nov 12 02:33:12 2013 -0800
     2.2 +++ b/ambuild2/frontend/cpp.py	Fri Nov 15 19:11:42 2013 -0800
     2.3 @@ -356,7 +356,7 @@
     2.4      self.outputFile = name
     2.5      self.argv = argv
     2.6      if self.linker.pdbSuffix:
     2.7 -      self.pdbFile = self.name
     2.8 +      self.pdbFile = self.name + self.linker.pdbSuffix
     2.9      else:
    2.10        self.pdbFile = None
    2.11  
     3.1 --- a/ambuild2/task.py	Tue Nov 12 02:33:12 2013 -0800
     3.2 +++ b/ambuild2/task.py	Fri Nov 15 19:11:42 2013 -0800
     3.3 @@ -96,7 +96,12 @@
     3.4      new_timestamps = []
     3.5      if response['ok']:
     3.6        for output in message['task_outputs']:
     3.7 -        new_timestamps.append((output, os.path.getmtime(output)))
     3.8 +        try:
     3.9 +          new_timestamps.append((output, os.path.getmtime(output)))
    3.10 +        except:
    3.11 +          response['ok'] = False
    3.12 +          response['stderr'] += 'Expected output file, but not found: {0}'.format(output)
    3.13 +          break
    3.14  
    3.15      # Send a message back to the master process to update the DAG and spew
    3.16      # stdout/stderr if needed.