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

Unified Diff: pylib/gyp/generator/ninja.py

Issue 9422025: Fix copy steps for win32 ninja (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 8 years, 10 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: pylib/gyp/generator/ninja.py
===================================================================
--- pylib/gyp/generator/ninja.py (revision 1211)
+++ pylib/gyp/generator/ninja.py (working copy)
@@ -213,7 +213,7 @@
path = path.replace(INTERMEDIATE_DIR,
os.path.join(product_dir or '', int_dir))
- return path
+ return os.path.normpath(path)
def ExpandRuleVariables(self, path, root, dirname, source, ext, name):
path = path.replace(generator_default_variables['RULE_INPUT_ROOT'], root)
@@ -1183,7 +1183,7 @@
master_ninja.rule(
'copy',
description='COPY $in $out',
- command='mklink /h $out $in >nul')
+ command='cmd /c mklink /h $out $in >nul || mklink /h /j $out $in >nul')
else:
master_ninja.rule(
'copy',
« 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