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

Issue 294183004: Use relative path/dir msbuild variables to map $(InputDir) and $(InputPath) (Closed)

Created:
6 years, 7 months ago by Romain Pokrzywka
Modified:
6 years, 6 months ago
CC:
gyp-developer_googlegroups.com
Base URL:
https://chromium.googlesource.com/external/gyp.git@master
Visibility:
Public.

Description

Use relative path/dir msbuild variables to map $(InputDir) and $(InputPath) $(InputDir) and $(InputPath) assume relative paths, but they're mapped to %(RootDir)%(Directory) and %(FullPath) respectively. This makes gyp generate incorrect commands for non-external rules in VS, for example: -I ../foo/C:/bar/baz.h (based on a generated command when building content_shell in VS) MSBuild also provides variables for relative dir and path, so we should use those instead to map $(InputDir) and $(InputPath). Ran test/msvs and test/win test suites against VS2010 and VS2013, no regression. Since VS maintains the cwd when building, using relative paths shouldn't affect the current behavior. The only case where it might break things is if an external script/command expects absolute paths for its arguments. I haven't seen any instance of this while building content_shell and its dependencies. BUG= Patch from romain.pokrzywka@gmail.com. R=scottmg@chromium.org Committed: https://code.google.com/p/gyp/source/detail?r=1924

Patch Set 1 #

Patch Set 2 : Updated patch with test case #

Patch Set 3 : correct path for msvs_cygwin_dirs #

Patch Set 4 : Disabled new test for xcode and make generators (not supported yet) #

Patch Set 5 : Rebased against master HEAD #

Patch Set 6 : Fix for Mac trybot #

Unified diffs Side-by-side diffs Delta from patch set Stats (+78 lines, -18 lines) Patch
M pylib/gyp/MSVSSettings.py View 1 chunk +2 lines, -2 lines 0 comments Download
M pylib/gyp/generator/msvs.py View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M test/rules-dirname/gyptest-dirname.py View 1 2 3 4 5 2 chunks +16 lines, -3 lines 0 comments Download
M test/rules-dirname/src/subdir/input-rule-dirname.gyp View 1 2 4 chunks +59 lines, -12 lines 0 comments Download

Messages

Total messages: 13 (0 generated)
Romain Pokrzywka
6 years, 7 months ago (2014-05-22 01:22:09 UTC) #1
scottmg
This looks fine to me, but I'm not that familiar with these variables. Shez any ...
6 years, 7 months ago (2014-05-22 17:49:35 UTC) #2
Shezan Baig (Bloomberg)
I'm not familiar with these as well. A standalone test might help make it clearer ...
6 years, 7 months ago (2014-05-22 17:57:27 UTC) #3
Romain Pokrzywka
On 2014/05/22 17:57:27, Shezan Baig (Bloomberg) wrote: > I'm not familiar with these as well. ...
6 years, 7 months ago (2014-05-22 18:00:11 UTC) #4
Romain Pokrzywka
6 years, 7 months ago (2014-05-22 18:03:48 UTC) #5
Romain Pokrzywka
On 2014/05/22 17:57:27, Shezan Baig (Bloomberg) wrote: > I'm not familiar with these as well. ...
6 years, 7 months ago (2014-05-23 22:08:57 UTC) #6
scottmg
On 2014/05/23 22:08:57, Romain Pokrzywka wrote: > On 2014/05/22 17:57:27, Shezan Baig (Bloomberg) wrote: > ...
6 years, 7 months ago (2014-05-24 03:42:16 UTC) #7
Romain Pokrzywka
On 2014/05/24 03:42:16, scottmg wrote: > On 2014/05/23 22:08:57, Romain Pokrzywka wrote: > > On ...
6 years, 7 months ago (2014-05-27 17:24:16 UTC) #8
scottmg
On 2014/05/27 17:24:16, Romain Pokrzywka wrote: > On 2014/05/24 03:42:16, scottmg wrote: > > On ...
6 years, 7 months ago (2014-05-27 20:07:44 UTC) #9
Romain Pokrzywka
On 2014/05/27 20:07:44, scottmg wrote: > On 2014/05/27 17:24:16, Romain Pokrzywka wrote: > > On ...
6 years, 7 months ago (2014-05-27 22:11:17 UTC) #10
Romain Pokrzywka
On 2014/05/27 22:11:17, Romain Pokrzywka wrote: > On 2014/05/27 20:07:44, scottmg wrote: > > On ...
6 years, 7 months ago (2014-05-27 23:12:12 UTC) #11
scottmg
lgtm
6 years, 6 months ago (2014-05-28 05:07:23 UTC) #12
scottmg
6 years, 6 months ago (2014-05-28 05:08:11 UTC) #13
Message was sent while issue was closed.
Committed patchset #6 manually as r1924 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698