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

Side by Side Diff: native_client_sdk/src/build_tools/sdk_tools/update_manifest.py

Issue 8801030: Fixed update_manifest to correctly accept format: pepper -b .. -B ..... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/tests/naclsdk_manifest_test.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 The Native Client 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 '''Utility to update the SDK manifest file in the build_tools directory''' 6 '''Utility to update the SDK manifest file in the build_tools directory'''
7 7
8 import optparse 8 import optparse
9 import os 9 import os
10 import re 10 import re
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 def _HandlePepper(self): 265 def _HandlePepper(self):
266 '''Handles the pepper bundles''' 266 '''Handles the pepper bundles'''
267 options = self.options 267 options = self.options
268 match = BUNDLE_PEPPER_MATCHER.match(options.bundle_name) 268 match = BUNDLE_PEPPER_MATCHER.match(options.bundle_name)
269 if match is not None: 269 if match is not None:
270 options.bundle_version = int(match.group(1)) 270 options.bundle_version = int(match.group(1))
271 if options.bundle_version is None: 271 if options.bundle_version is None:
272 raise Error('Need to specify a bundle version') 272 raise Error('Need to specify a bundle version')
273 if options.bundle_revision is None: 273 if options.bundle_revision is None:
274 raise Error('Need to specify a bundle revision') 274 raise Error('Need to specify a bundle revision')
275 if options.bundle_name == 'pepper':
276 self.options.bundle_name = 'pepper_%s' % options.bundle_version
275 if options.desc is None: 277 if options.desc is None:
276 options.desc = ('Chrome %s bundle, revision %s' % 278 options.desc = ('Chrome %s bundle, revision %s' %
277 (options.bundle_version, options.bundle_revision)) 279 (options.bundle_version, options.bundle_revision))
278 root_url = '%s/pepper_%s_%s' % (options.root_url, options.bundle_version, 280 root_url = '%s/pepper_%s_%s' % (options.root_url, options.bundle_version,
279 options.bundle_revision) 281 options.bundle_revision)
280 options.mac_arch_url = '/'.join([root_url, 'naclsdk_mac.tgz']) 282 options.mac_arch_url = '/'.join([root_url, 'naclsdk_mac.tgz'])
281 options.linux_arch_url = '/'.join([root_url, 'naclsdk_linux.tgz']) 283 options.linux_arch_url = '/'.join([root_url, 'naclsdk_linux.tgz'])
282 options.win_arch_url = '/'.join([root_url, 'naclsdk_win.exe']) 284 options.win_arch_url = '/'.join([root_url, 'naclsdk_win.exe'])
283 285
284 def HandleBundles(self): 286 def HandleBundles(self):
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 385
384 manifest_file = UpdateSDKManifestFile(options) 386 manifest_file = UpdateSDKManifestFile(options)
385 manifest_file.HandleBundles() 387 manifest_file.HandleBundles()
386 manifest_file.UpdateWithOptions() 388 manifest_file.UpdateWithOptions()
387 389
388 return 0 390 return 0
389 391
390 392
391 if __name__ == '__main__': 393 if __name__ == '__main__':
392 sys.exit(main(sys.argv[1:])) 394 sys.exit(main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/tests/naclsdk_manifest_test.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698