Issue 7995013: Allow non-absolute path for variables. This fixes grit to do variable

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

Issue 7995013: Allow non-absolute path for variables. This fixes grit to do variable (Closed)

Created:
9 years, 3 months ago by Jói

Modified:
9 years, 3 months ago

Reviewers:
Evan Martin

CC:
chromium-reviews, pam+watch_chromium.org, Paweł Hajdan Jr., Ian Vollick

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

Description

Allow non-absolute path for variables. This fixes grit to do variable substitution in the resource_ids file correctly when it is invoked by ninja (which uses a relative path for this, whereas our gyp-generated make files use an absolute path). BUG=97420 TEST=this builds: ninja -C out/Debug chrome_extra_resources Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=102327

Patch Set 1 #

Total comments: 1

Created: 9 years, 3 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+10 lines, -7 lines)			Patch
M	tools/grit/grit/grd_reader_unittest.py	View	1 chunk	+4 lines, -3 lines	0 comments	Download
M	tools/grit/grit/node/misc.py	View	1 chunk	+3 lines, -1 line	1 comment	Download
M	tools/grit/grit/node/misc_unittest.py	View	1 chunk	+2 lines, -2 lines	0 comments	Download
M	tools/grit/grit/testdata/resource_ids	View	1 chunk	+1 line, -1 line	0 comments	Download

Messages

Total messages: 4 (0 generated)

Expand Messages | Collapse Messages

Evan Martin

http://codereview.chromium.org/7995013/diff/1/tools/grit/grit/node/misc.py File tools/grit/grit/node/misc.py (right): http://codereview.chromium.org/7995013/diff/1/tools/grit/grit/node/misc.py#newcode39 tools/grit/grit/node/misc.py:39: src_root_dir = '' Would it work to use '.' ...

9 years, 3 months ago (2011-09-22 18:54:38 UTC) #2

Jói

9 years, 3 months ago (2011-09-22 18:57:51 UTC) #4

> Would it work to use '.' here?  Might make the tests easier to follow.

Not without further changes, or the first character of all substituted
variables would be chopped off.  The current approach mimics the
essence of the logic before r102276.

Cheers,
Jói



On Thu, Sep 22, 2011 at 6:54 PM, <evan@chromium.org> wrote:
>
> http://codereview.chromium.org/7995013/diff/1/tools/grit/grit/node/misc.py
> File tools/grit/grit/node/misc.py (right):
>
>
http://codereview.chromium.org/7995013/diff/1/tools/grit/grit/node/misc.py#ne...
> tools/grit/grit/node/misc.py:39: src_root_dir = ''
> Would it work to use '.' here?  Might make the tests easier to follow.
>
> http://codereview.chromium.org/7995013/

Expand Messages | Collapse Messages