Flush stdout to inform buildbot that it is not hang.

libm · libm · commit 05023a3a249e · 2014-06-07T11:18:16.000+08:00
Added retry and let 'node-webkit-' bundle to be uploaded first.
diff --git a/tools/aws_uploader.py b/tools/aws_uploader.py
@@ -4,6 +4,8 @@
 import datetime
 import json
 import os
+import sys
+import time
 
 
 # Set timeout, for retry
@@ -53,24 +55,41 @@
     print 'Cannot find packages!'
     exit(-1)
 
+# move node-webkit- to the top of the list.
+for i in range(len(file_list)):
+    fname = file_list[i]
+    if fname.startswith('node-webkit-v'):
+        del file_list[i]
+        file_list.insert(0,fname)
+        break
 
 def print_progress(transmitted, total):
     print ' %d%% transferred of total: %d bytes.' % (transmitted*100/total, total)
+    sys.stdout.flush()
 
 
 def aws_upload(upload_path, file_list):
     conn = boto.connect_s3()
     print 'Connecting to S3 ...'
+    sys.stdout.flush()
     bucket = conn.get_bucket(bucket_name)
     print 'Uploading to: ' + upload_path
     for f in file_list:
         print 'Uploading "' + f + '" ...'
+        sys.stdout.flush()
         # use '/' for s3
         key = bucket.new_key(upload_path + '/' + f)
         key.set_contents_from_filename(filename=os.path.join(dist_dir, f), cb=print_progress, num_cb=50, replace=True)
 
-aws_upload(upload_path, file_list)
-print 'Done.'
+for retry in range(3):
+    try:
+        aws_upload(upload_path, file_list)
+        break
+    except Exception, e:
+        print e
+        sys.stdout.flush()
+        time.sleep(30) #wait for 30s and try again.
 
+print 'Done.'
 
 # vim: et:ts=4:sw=4
diff --git a/tools/package_binaries.py b/tools/package_binaries.py
@@ -111,6 +111,8 @@ def generate_target_nw(platform_name, arch, version):
                            'libGLESv2.dll',
                            'nw.exe',
                            'nw.pak',
+                           'nw.exp',
+                           'nw.lib',
                            'nwsnapshot.exe',
                            'credits.html',
                            ]

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ def generate_target_nw(platform_name, arch, version):`
`111`	`111`	`'libGLESv2.dll',`
`112`	`112`	`'nw.exe',`
`113`	`113`	`'nw.pak',`
	`114`	`+ 'nw.exp',`
	`115`	`+ 'nw.lib',`
`114`	`116`	`'nwsnapshot.exe',`
`115`	`117`	`'credits.html',`
`116`	`118`	`]`