tools/grit/grit/node/misc.py - 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

Unified Diff: tools/grit/grit/node/misc.py

Issue 7995013: Allow non-absolute path for variables. This fixes grit to do variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 3 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:

Index: tools/grit/grit/node/misc.py

diff --git a/tools/grit/grit/node/misc.py b/tools/grit/grit/node/misc.py

index 46eae172222c00eb896701f6c9d9ad7c79df0fd3..5bc34b4f89f9a225ec7420ece54bf88ae968d9b7 100644

--- a/tools/grit/grit/node/misc.py

+++ b/tools/grit/grit/node/misc.py

@@ -34,11 +34,13 @@ def _ReadFirstIdsFromFile(filename, defines):

# parameter of the .grd file rather than of the resource_ids file.

src_root_dir = os.path.abspath(os.path.join(os.path.dirname(filename),

first_ids_dict['SRCDIR']))

+ # Special case for testing.

+ if first_ids_dict['SRCDIR'] == '':

+ src_root_dir = ''

Evan Martin 2011/09/22 18:54:39 Would it work to use '.' here? Might make the tes

def ReplaceVariable(matchobj):

for key, value in defines.iteritems():

if matchobj.group(1) == key:

- value = os.path.join(src_root_dir, value)

value = os.path.abspath(value)[len(src_root_dir) + 1:]

return value

return ''

« no previous file with comments | « tools/grit/grit/grd_reader_unittest.py ('k') | tools/grit/grit/node/misc_unittest.py » ('j') | no next file with comments »