Make landmines work on local builds too

build/landmines.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
-This script runs every build as a hook. If it detects that the build should
-be clobbered, it will touch the file <build_dir>/.landmine_triggered. The
-various build scripts will then check for the presence of this file and clobber
-accordingly. The script will also emit the reasons for the clobber to stdout.
+This script runs every build as the first hook. If it detects that the build

[iannucci, 2014/08/12 18:34:08]

(See DEPS)

[scottmg, 2014/08/12 18:50:44]

Done.

+should be clobbered, it will remove the build directory.
 
 A landmine is tripped when a builder checks out a different revision, and the
 diff between the new landmines and the old ones is non-null. At this point, the
 build is clobbered.
 """
 
 import difflib
 import errno
+import gyp_environment
 import logging
 import optparse
 import os
+import shutil
 import sys
 import subprocess
 import time
 
 import landmine_utils
 
 
 SRC_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 
 
-def get_target_build_dir(build_tool, target, is_iphone=False):
+def get_build_dir(build_tool, is_iphone=False):
   """
   Returns output directory absolute path dependent on build and targets.
   Examples:
     r'c:\b\build\slave\win\build\src\out\Release'
     '/mnt/data/b/build/slave/linux/build/src/out/Debug'
     '/b/build/slave/ios_rel_device/build/src/xcodebuild/Release-iphoneos'

[iannucci, 2014/08/12 18:34:08]

these should probably change

[scottmg, 2014/08/12 18:50:43]

Done.

 
   Keep this function in sync with tools/build/scripts/slave/compile.py

[iannucci, 2014/08/12 18:34:09]

this may need to be done

[scottmg, 2014/08/12 18:50:44]

Yeah, there's a bunch of stuff in there alright. I think options.clobber is...
"fine". I guess that'll happen from the buildbot ui still. The landmines-based
setting of clobber won't ever happen now (because .landmines moved and there's
no .landmines_triggered) so I'll just remove that code in a follow up. (Sound
right-ish?)

   """
   ret = None
   if build_tool == 'xcode':
-    ret = os.path.join(SRC_DIR, 'xcodebuild',
-        target + ('-iphoneos' if is_iphone else ''))
+    ret = os.path.join(SRC_DIR, 'xcodebuild')
   elif build_tool in ['make', 'ninja', 'ninja-ios']:  # TODO: Remove ninja-ios.
-    ret = os.path.join(SRC_DIR, 'out', target)
+    ret = os.path.join(SRC_DIR, 'out')
   elif build_tool in ['msvs', 'vs', 'ib']:
-    ret = os.path.join(SRC_DIR, 'build', target)
+    ret = os.path.join(SRC_DIR, 'build')
   else:
     raise NotImplementedError('Unexpected GYP_GENERATORS (%s)' % build_tool)
   return os.path.abspath(ret)
 
 
-def set_up_landmines(target, new_landmines):
+def clobber_if_necessary(new_landmines):
   """Does the work of setting, planting, and triggering landmines."""
-  out_dir = get_target_build_dir(landmine_utils.builder(), target,
-                                 landmine_utils.platform() == 'ios')
-
-  landmines_path = os.path.join(out_dir, '.landmines')
+  out_dir = get_build_dir(landmine_utils.builder())
+  landmines_path = os.path.normpath(os.path.join(out_dir, '..', '.landmines'))
   try:
     os.makedirs(out_dir)
   except OSError as e:
     if e.errno == errno.EEXIST:
       pass
 
   if os.path.exists(landmines_path):
-    triggered = os.path.join(out_dir, '.landmines_triggered')
     with open(landmines_path, 'r') as f:
       old_landmines = f.readlines()
     if old_landmines != new_landmines:
       old_date = time.ctime(os.stat(landmines_path).st_ctime)
       diff = difflib.unified_diff(old_landmines, new_landmines,
           fromfile='old_landmines', tofile='new_landmines',
           fromfiledate=old_date, tofiledate=time.ctime(), n=0)
+      sys.stdout.write('Clobbering due to:\n')
+      sys.stdout.writelines(diff)
 
-      with open(triggered, 'w') as f:
-        f.writelines(diff)
-    elif os.path.exists(triggered):
-      # Remove false triggered landmines.
-      os.remove(triggered)
+      # Clobber.
+      shutil.rmtree(out_dir)
+
+  # Save current set of landmines for next time.
   with open(landmines_path, 'w') as f:
     f.writelines(new_landmines)
 
 
 def process_options():
   """Returns a list of landmine emitting scripts."""
   parser = optparse.OptionParser()
   parser.add_option(
       '-s', '--landmine-scripts', action='append',
       default=[os.path.join(SRC_DIR, 'build', 'get_landmines.py')],
@@ skipping 20 matching lines @@
   else:
     return options.landmine_scripts
 
 
 def main():
   landmine_scripts = process_options()
 
   if landmine_utils.builder() in ('dump_dependency_json', 'eclipse'):
     return 0
 
-  for target in ('Debug', 'Release', 'Debug_x64', 'Release_x64'):
-    landmines = []
-    for s in landmine_scripts:
-      proc = subprocess.Popen([sys.executable, s, '-t', target],
-                              stdout=subprocess.PIPE)
-      output, _ = proc.communicate()
-      landmines.extend([('%s\n' % l.strip()) for l in output.splitlines()])
-    set_up_landmines(target, landmines)
+  gyp_environment.SetEnvironment()
+
+  landmines = []
+  for s in landmine_scripts:
+    proc = subprocess.Popen([sys.executable, s], stdout=subprocess.PIPE)
+    output, _ = proc.communicate()
+    landmines.extend([('%s\n' % l.strip()) for l in output.splitlines()])
+  clobber_if_necessary(landmines)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())