site_scons/site_tools/naclsdk.py - Issue 341973003: ARM HW bots: looks for FEATURE_VERSION in the right place

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: site_scons/site_tools/naclsdk.py

Issue 341973003: ARM HW bots: looks for FEATURE_VERSION in the right place (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: Created 6 years, 6 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: site_scons/site_tools/naclsdk.py

diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py

index 4279b95d97e6fff1a86b310e7a95d1f95abed230..8871705664c67b88b517f443f259adb18e7b16e9 100755

--- a/site_scons/site_tools/naclsdk.py

+++ b/site_scons/site_tools/naclsdk.py

@@ -678,6 +678,9 @@ def generate(env):

version = int(SCons.Script.ARGUMENTS['toolchain_feature_version'])

else:

version_file = os.path.join(root, 'FEATURE_VERSION')

+ if not os.path.exists(version_file):

jvoung (off chromium) 2014/06/18 18:54:11 Leave a comment about why you check the fallback?

+ version_file = os.path.join(os.path.dirname(root), 'pnacl_translator',

+ 'FEATURE_VERSION')

if os.path.exists(version_file):

with open(version_file, 'r') as fh:

version = int(fh.read())

« no previous file with comments | « no previous file | no next file » | no next file with comments »