Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(628)

Unified Diff: tools/mb/mb.py

Issue 1204863002: Fix various windows-isms in the MB gen code paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mb_mkdir
Patch Set: s/\\/os.sep/ Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index 35c0e9124fd6ab70b40947ff7fe0650207e6d086..7f9aab69fa61f18178c0b66c8da13a08ccb61e9a 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -350,7 +350,10 @@ class MetaBuildWrapper(object):
ret, _, _ = self.Run(cmd)
for target in swarming_targets:
- deps_path = self.ToAbsPath(path, target + '.runtime_deps')
+ if sys.platform == 'win32':
+ deps_path = self.ToAbsPath(path, target + '.exe.runtime_deps')
+ else:
+ deps_path = self.ToAbsPath(path, target + '.runtime_deps')
if not self.Exists(deps_path):
raise MBErr('did not generate %s' % deps_path)
@@ -372,9 +375,9 @@ class MetaBuildWrapper(object):
{
'args': [
'--isolated',
- self.ToSrcRelPath('%s/%s.isolated' % (path, target)),
+ self.ToSrcRelPath('%s%s%s.isolated' % (path, os.sep, target)),
'--isolate',
- self.ToSrcRelPath('%s/%s.isolate' % (path, target)),
+ self.ToSrcRelPath('%s%s%s.isolate' % (path, os.sep, target)),
],
'dir': self.chromium_src_dir,
'version': 1,
@@ -557,7 +560,7 @@ class MetaBuildWrapper(object):
"""Returns a relative path from the top of the repo."""
# TODO: Support normal paths in addition to source-absolute paths.
assert(path.startswith('//'))
- return path[2:]
+ return path[2:].replace('/', os.sep)
def ParseGYPConfigPath(self, path):
rpath = self.ToSrcRelPath(path)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698