Index: infra/scripts/legacy/scripts/slave/build_directory.py |
diff --git a/infra/scripts/legacy/scripts/slave/build_directory.py b/infra/scripts/legacy/scripts/slave/build_directory.py |
index d7aa35b378dbd1acada18b5609d37693c02cd1e0..d0686f551c6160cc07069308676a6e65dc5c679e 100644 |
--- a/infra/scripts/legacy/scripts/slave/build_directory.py |
+++ b/infra/scripts/legacy/scripts/slave/build_directory.py |
@@ -33,20 +33,6 @@ def AreNinjaFilesNewerThanXcodeFiles(src_dir=None): |
return IsFileNewerThanFile(ninja_path, xcode_path) |
-def AreNinjaFilesNewerThanMSVSFiles(src_dir=None): |
- """Returns True if the generated ninja files are newer than the generated |
- msvs files. |
- |
- Parameters: |
- src_dir: The path to the src directory. If None, it's assumed to be |
- at src/ relative to the current working directory. |
- """ |
- src_dir = src_dir or 'src' |
- ninja_path = os.path.join(src_dir, 'out', 'Release', 'build.ninja') |
- msvs_path = os.path.join(src_dir, 'build', 'all.sln') |
- return IsFileNewerThanFile(ninja_path, msvs_path) |
- |
- |
def GetBuildOutputDirectory(src_dir=None, cros_board=None): |
"""Returns the path to the build directory, relative to the checkout root. |
@@ -71,41 +57,6 @@ def GetBuildOutputDirectory(src_dir=None, cros_board=None): |
return os.path.join(src_dir, 'xcodebuild') |
if sys.platform == 'cygwin' or sys.platform.startswith('win'): |
- if AreNinjaFilesNewerThanMSVSFiles(src_dir): |
- return os.path.join(src_dir, 'out') |
- return os.path.join(src_dir, 'build') |
+ return os.path.join(src_dir, 'out') |
raise NotImplementedError('Unexpected platform %s' % sys.platform) |
- |
- |
-def RmtreeExceptNinjaOrGomaFiles(build_output_dir): |
- """Recursively removes everything but ninja files from a build directory.""" |
- for root, _, files in os.walk(build_output_dir, topdown=False): |
- for f in files: |
- # For .manifest in particular, gyp windows ninja generates manifest |
- # files at generation time but clobber nukes at the beginning of |
- # compile, so make sure not to delete those generated files, otherwise |
- # compile will fail. |
- if (f.endswith('.ninja') or f.endswith('.manifest') or |
- f == 'args.gn' or |
- f.startswith('msvc') or # VS runtime DLLs. |
- f.startswith('pgort') or # VS PGO runtime DLL. |
- f in ('gyp-mac-tool', 'gyp-win-tool', |
- 'environment.x86', 'environment.x64')): |
- continue |
- # Keep goma related files. |
- if f == '.goma_deps': |
- continue |
- os.unlink(os.path.join(root, f)) |
- # Delete the directory if empty; this works because the walk is bottom-up. |
- try: |
- os.rmdir(root) |
- except OSError, e: |
- if e.errno in (39, 41, 66): |
- # If the directory isn't empty, ignore it. |
- # On Windows, os.rmdir will raise WindowsError with winerror 145, |
- # which e.errno is 41. |
- # On Linux, e.errno is 39. |
- pass |
- else: |
- raise |