pylib/gyp/generator/msvs.py - Issue 294183004: Use relative path/dir msbuild variables to map $(InputDir) and $(InputPath)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 294183004: Use relative path/dir msbuild variables to map $(InputDir) and $(InputPath) (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master

Patch Set: Fix for Mac trybot Created 6 years, 7 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

Index: pylib/gyp/generator/msvs.py

diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py

index 64991d4248427fe865f2effed2771036d6d1a346..e786c0b8c96fa96982e8f40106b3961200b96366 100644

--- a/pylib/gyp/generator/msvs.py

+++ b/pylib/gyp/generator/msvs.py

@@ -284,7 +284,7 @@ def _BuildCommandLineForRuleRaw(spec, cmd, cygwin_shell, has_input_path,

if [x for x in cmd if '$(InputDir)' in x]:

input_dir_preamble = (

'set INPUTDIR=$(InputDir)\n'

- 'set INPUTDIR=%INPUTDIR:$(ProjectDir)=%\n'

+ 'if NOT DEFINED INPUTDIR set INPUTDIR=.\\\n'

'set INPUTDIR=%INPUTDIR:~0,-1%\n'

)

else:

« no previous file with comments | « pylib/gyp/MSVSSettings.py ('k') | test/rules-dirname/gyptest-dirname.py » ('j') | no next file with comments »