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

Unified Diff: native_client_sdk/src/build_tools/nacl-mono-archive.py

Issue 10156003: [NaCl SDK] Build naclmono packages based on the sdk manifest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: merge with HEAD Created 8 years, 8 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: native_client_sdk/src/build_tools/nacl-mono-archive.py
===================================================================
--- native_client_sdk/src/build_tools/nacl-mono-archive.py (revision 133727)
+++ native_client_sdk/src/build_tools/nacl-mono-archive.py (working copy)
@@ -21,9 +21,9 @@
help='Tarfile path',
dest='tar_path',
default='naclmono_%pepperrev%.bz2')
- parser.add_option('--sdk-revision',
- help='SDK Revision',
- dest='sdk_revision',
+ parser.add_option('--upload-path',
+ help='Upload path (nativeclient-mirror/nacl/nacl_sdk/XXX)',
+ dest='upload_path',
default=None)
parser.add_option('--pepper-revision',
help='Pepper revision',
@@ -35,8 +35,8 @@
dest='skip_upload')
(options, args) = parser.parse_args(args[1:])
- if not options.sdk_revision:
- buildbot_common.ErrorExit('--sdk-revision is required')
+ if not options.upload_path:
+ buildbot_common.ErrorExit('--upload-path is required')
if not options.pepper_revision:
buildbot_common.ErrorExit('--pepper-revision is required')
@@ -45,8 +45,6 @@
install_folders = ['bin', 'etc', 'include', 'lib', 'lib32', 'share']
- root_dir = 'mono_pepper_' + options.pepper_revision
-
buildbot_common.BuildStep('Archive Build')
tar_file = None
buildbot_common.RemoveFile(options.tar_path)
@@ -54,14 +52,14 @@
tar_file = tarfile.open(options.tar_path, mode='w:bz2')
for subfolder in install_folders:
tar_file.add(os.path.join(options.install_dir, subfolder),
- arcname=os.path.join(root_dir, subfolder))
+ arcname=subfolder)
finally:
if tar_file:
tar_file.close()
if not options.skip_upload:
buildbot_common.Archive(os.path.basename(options.tar_path),
- 'nativeclient-mirror/nacl/nacl_sdk/%s' % options.sdk_revision,
+ 'nativeclient-mirror/nacl/nacl_sdk/%s' % options.upload_path,
cwd=os.path.dirname(os.path.abspath(options.tar_path)))
if __name__ == '__main__':
« no previous file with comments | « native_client_sdk/src/build_tools/buildbot_run.py ('k') | native_client_sdk/src/build_tools/nacl-mono-buildbot.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698