From: machenbach Date: Thu, 26 Feb 2015 12:39:40 +0000 (-0800) Subject: Make landmines delete all generated build artifacts. X-Git-Tag: upstream/4.7.83~4163 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03cef94a4908c2dc1a1c41987bc834923be4eb6e;p=platform%2Fupstream%2Fv8.git Make landmines delete all generated build artifacts. BUG=chromium:403263 LOG=n Review URL: https://codereview.chromium.org/963433002 Cr-Commit-Position: refs/heads/master@{#26877} --- diff --git a/build/landmines.py b/build/landmines.py index d855315..97c6390 100755 --- a/build/landmines.py +++ b/build/landmines.py @@ -166,17 +166,27 @@ def clobber_if_necessary(new_landmines): for f in os.listdir(out_dir): path = os.path.join(out_dir, f) if os.path.basename(out_dir) == 'build': - # Soft version of chromium's clobber. Only delete build directories not - # files in windows' build dir as the folder shares some checked out - # files and directories. + # Only delete build directories and files for MSVS builds as the folder + # shares some checked out files and directories. if (os.path.isdir(path) and re.search(r'(?:[Rr]elease)|(?:[Dd]ebug)', f)): delete_build_dir(path) + elif (os.path.isfile(path) and + (path.endswith('.sln') or + path.endswith('.vcxproj') or + path.endswith('.vcxproj.user'))): + os.unlink(path) else: if os.path.isfile(path): os.unlink(path) elif os.path.isdir(path): delete_build_dir(path) + if os.path.basename(out_dir) == 'xcodebuild': + # Xcodebuild puts an additional project file structure into build, + # while the output folder is xcodebuild. + project_dir = os.path.join(SRC_DIR, 'build', 'all.xcodeproj') + if os.path.exists(project_dir) and os.path.isdir(project_dir): + delete_build_dir(project_dir) # Save current set of landmines for next time. with open(landmines_path, 'w') as f: