native_client_sdk/src/build_tools/build_sdk.py - Issue 52713007: [NaCL SDK] Roll naclports revision.

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: native_client_sdk/src/build_tools/build_sdk.py

Issue 52713007: [NaCL SDK] Roll naclports revision. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 2 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: native_client_sdk/src/build_tools/build_sdk.py

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py

index 49d1cbe30937acecf36e1691a012da32deda2a74..83d9136aff9d54e81b590b2e22137cd7fcb64e6f 100755

--- a/native_client_sdk/src/build_tools/build_sdk.py

+++ b/native_client_sdk/src/build_tools/build_sdk.py

@@ -54,7 +54,7 @@ import oshelpers

CYGTAR = os.path.join(NACL_DIR, 'build', 'cygtar.py')

NACLPORTS_URL = 'https://naclports.googlecode.com/svn/trunk/src'

-NACLPORTS_REV = 850

+NACLPORTS_REV = 954

binji 2013/10/31 16:34:36 CL comment says 951

Sam Clegg 2013/10/31 16:54:16 Done.

GYPBUILD_DIR = 'gypbuild'

@@ -820,10 +820,10 @@ def BuildStepBuildNaClPorts(pepper_ver, pepperdir):

"""Build selected naclports in all configurations."""

# TODO(sbc): currently naclports doesn't know anything about

# Debug builds so the Debug subfolders are all empty.

- bundle_dir = os.path.join(NACLPORTS_DIR, 'out', 'sdk_bundle')

env = dict(os.environ)

env['NACL_SDK_ROOT'] = pepperdir

+ env['PEPPER_DIR'] = os.path.dirname(pepperdir)

binji 2013/10/31 16:34:36 what is this for? (just curious)

Sam Clegg 2013/10/31 16:54:16 The script we are calling expects this to be set b

env['NACLPORTS_NO_ANNOTATE'] = "1"

env['NACLPORTS_NO_UPLOAD'] = "1"

@@ -831,6 +831,7 @@ def BuildStepBuildNaClPorts(pepper_ver, pepperdir):

buildbot_common.BuildStep('Build naclports')

buildbot_common.Run([build_script], env=env, cwd=NACLPORTS_DIR)

+ bundle_dir = os.path.join(NACLPORTS_DIR, 'out', 'sdk_bundle')

out_dir = os.path.join(bundle_dir, 'pepper_%s' % pepper_ver)

# Some naclports do not include a standalone LICENSE/COPYING file

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