From a8846e0432e7cd07ca39ee7c900fa0e354efde03 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 30 Apr 2015 15:36:54 +0800 Subject: [PATCH 1/2] Also upload headers to iojs's locations --- script/upload-checksums.py | 3 +++ script/upload-node-headers.py | 21 ++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/script/upload-checksums.py b/script/upload-checksums.py index 4c1cfe9e8779..c71425126363 100755 --- a/script/upload-checksums.py +++ b/script/upload-checksums.py @@ -39,8 +39,11 @@ def parse_args(): def get_files_list(version): return [ 'node-{0}.tar.gz'.format(version), + 'iojs-{0}.tar.gz'.format(version), 'node.lib', 'x64/node.lib', + 'win-x86/iojs.lib', + 'win-x64/iojs.lib', ] diff --git a/script/upload-node-headers.py b/script/upload-node-headers.py index 86335b2b63db..628f3c2ead97 100755 --- a/script/upload-node-headers.py +++ b/script/upload-node-headers.py @@ -38,10 +38,13 @@ def main(): safe_mkdir(DIST_DIR) args = parse_args() - dist_headers_dir = os.path.join(DIST_DIR, 'node-{0}'.format(args.version)) + node_headers_dir = os.path.join(DIST_DIR, 'node-{0}'.format(args.version)) + iojs_headers_dir = os.path.join(DIST_DIR, 'iojs-{0}'.format(args.version)) - copy_headers(dist_headers_dir) - create_header_tarball(dist_headers_dir) + copy_headers(node_headers_dir) + create_header_tarball(node_headers_dir) + copy_headers(iojs_headers_dir) + create_header_tarball(iojs_headers_dir) # Upload node's headers to S3. bucket, access_key, secret_key = s3_config() @@ -107,18 +110,26 @@ def upload_node(bucket, access_key, secret_key, version): if PLATFORM == 'win32': if get_target_arch() == 'ia32': node_lib = os.path.join(DIST_DIR, 'node.lib') + iojs_lib = os.path.join(DIST_DIR, 'win-x86', 'iojs.lib') else: node_lib = os.path.join(DIST_DIR, 'x64', 'node.lib') - safe_mkdir(os.path.dirname(node_lib)) + iojs_lib = os.path.join(DIST_DIR, 'win-x64', 'iojs.lib') + safe_mkdir(os.path.dirname(node_lib)) + safe_mkdir(os.path.dirname(iojs_lib)) - # Copy atom.lib to node.lib + # Copy atom.lib to node.lib and iojs.lib. atom_lib = os.path.join(OUT_DIR, 'node.dll.lib') shutil.copy2(atom_lib, node_lib) + shutil.copy2(atom_lib, iojs_lib) # Upload the node.lib. s3put(bucket, access_key, secret_key, DIST_DIR, 'atom-shell/dist/{0}'.format(version), [node_lib]) + # Upload the iojs.lib. + s3put(bucket, access_key, secret_key, DIST_DIR, + 'atom-shell/dist/{0}'.format(version), [iojs_lib]) + if __name__ == '__main__': sys.exit(main()) From dec7c40fd889f0dbecc9ddc6733fbb22bb22795c Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 30 Apr 2015 16:01:54 +0800 Subject: [PATCH 2/2] Also upload iojs-*-.tar.gz --- script/upload-node-headers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/upload-node-headers.py b/script/upload-node-headers.py index 628f3c2ead97..38cb2f7e16f5 100755 --- a/script/upload-node-headers.py +++ b/script/upload-node-headers.py @@ -106,6 +106,8 @@ def upload_node(bucket, access_key, secret_key, version): with scoped_cwd(DIST_DIR): s3put(bucket, access_key, secret_key, DIST_DIR, 'atom-shell/dist/{0}'.format(version), glob.glob('node-*.tar.gz')) + s3put(bucket, access_key, secret_key, DIST_DIR, + 'atom-shell/dist/{0}'.format(version), glob.glob('iojs-*.tar.gz')) if PLATFORM == 'win32': if get_target_arch() == 'ia32':