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

Side by Side Diff: native_client_sdk/src/build_tools/build_projects.py

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove some unintended revert changes Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import multiprocessing 6 import multiprocessing
7 import optparse 7 import optparse
8 import os 8 import os
9 import sys 9 import sys
10 10
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 # Create the library output directories 97 # Create the library output directories
98 libdir = os.path.join(pepperdir, 'lib') 98 libdir = os.path.join(pepperdir, 'lib')
99 platform = getos.GetPlatform() 99 platform = getos.GetPlatform()
100 for config in configs: 100 for config in configs:
101 for arch in LIB_DICT[platform]: 101 for arch in LIB_DICT[platform]:
102 dirpath = os.path.join(libdir, '%s_%s_host' % (platform, arch), config) 102 dirpath = os.path.join(libdir, '%s_%s_host' % (platform, arch), config)
103 if clobber: 103 if clobber:
104 buildbot_common.RemoveDir(dirpath) 104 buildbot_common.RemoveDir(dirpath)
105 buildbot_common.MakeDir(dirpath) 105 buildbot_common.MakeDir(dirpath)
106 106
107 if toolchain == 'pnacl':
binji 2013/08/12 17:59:35 this seems to be in the wrong file. It should be i
sehr 2013/08/12 18:43:14 Done.
108 args.extend(['--browser_flag', '--enable-pnacl'])
109
107 landing_page = None 110 landing_page = None
108 for branch, projects in project_tree.iteritems(): 111 for branch, projects in project_tree.iteritems():
109 dirpath = os.path.join(pepperdir, branch) 112 dirpath = os.path.join(pepperdir, branch)
110 if clobber: 113 if clobber:
111 buildbot_common.RemoveDir(dirpath) 114 buildbot_common.RemoveDir(dirpath)
112 buildbot_common.MakeDir(dirpath) 115 buildbot_common.MakeDir(dirpath)
113 targets = [desc['NAME'] for desc in projects] 116 targets = [desc['NAME'] for desc in projects]
114 117
115 # Generate master make for this branch of projects 118 # Generate master make for this branch of projects
116 generate_make.GenerateMasterMakefile(pepperdir, 119 generate_make.GenerateMasterMakefile(pepperdir,
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 291
289 292
290 if __name__ == '__main__': 293 if __name__ == '__main__':
291 script_name = os.path.basename(sys.argv[0]) 294 script_name = os.path.basename(sys.argv[0])
292 try: 295 try:
293 sys.exit(main(sys.argv)) 296 sys.exit(main(sys.argv))
294 except parse_dsc.ValidationError as e: 297 except parse_dsc.ValidationError as e:
295 buildbot_common.ErrorExit('%s: %s' % (script_name, e)) 298 buildbot_common.ErrorExit('%s: %s' % (script_name, e))
296 except KeyboardInterrupt: 299 except KeyboardInterrupt:
297 buildbot_common.ErrorExit('%s: interrupted' % script_name) 300 buildbot_common.ErrorExit('%s: interrupted' % script_name)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698