update package tool, support upload nw headers file

xueeinstein · ghostoy · commit a8a6f43a9650 · 2015-05-26T23:00:19.000+08:00
diff --git a/tools/make-nw-headers.py b/tools/make-nw-headers.py
@@ -22,7 +22,7 @@ def update_uvh(tmp_dir, header_files):
 nw_root  = os.path.normpath(os.path.join(script_dir, os.pardir))
 project_root = os.path.normpath(os.path.join(nw_root, os.pardir, os.pardir)) 
 third_party_dir = os.path.normpath(os.path.join(project_root, 'third_party'))
-tmp_dir = tmp_dir = os.path.normpath(os.path.join(nw_root, 'tmp'))
+tmp_dir = os.path.normpath(os.path.join(nw_root, 'tmp'))
 
 nw_version = getnwversion.nw_version
 
diff --git a/tools/package_binaries.py b/tools/package_binaries.py
@@ -10,6 +10,8 @@
 import tarfile
 import zipfile
 
+from subprocess import call
+
 steps = ['nw', 'chromedriver', 'symbol', 'others']
 ################################
 # Parse command line args
@@ -31,6 +33,8 @@
 nw_ver = None                   # x.xx
 dist_dir = None                 # .../out/Release/dist
 
+is_headers_ok = False           # record whether nw-headers generated
+
 step = args.step
 skip = args.skip
 binaries_location = args.path
@@ -203,8 +207,20 @@ def generate_target_others(platform_name, arch, version):
     target['compress'] = None
     if platform_name == 'win':
         target['input'] = ['nw.exp', 'nw.lib']
-    elif platform_name == 'osx' :
+    elif platform_name == 'linux' :
         target['input'] = []
+        # here , call make-nw-headers.py to generate nw headers
+        # after generated, move to dist_dir
+        make_nw_header = os.path.join(os.path.dirname(__file__), \
+                'make-nw-headers.py')
+        print make_nw_header
+        res = call(['python', make_nw_header])
+        if res == 0:
+            global is_headers_ok
+            is_headers_ok = True
+            print 'nw-headers generated'
+        else:
+            print 'nw-headers generate failed'
     else:
         target['input'] = []
     return target
@@ -266,6 +282,14 @@ def make_packages(targets):
 
     # now let's do it
     os.mkdir(dist_dir)
+    # here check whether nw headers generated
+    # if generated, mv to dist_dir
+    if is_headers_ok:
+        nw_headers_name = 'nw-headers-v' + nw_ver + '.tar.gz'
+        nw_headers_path = os.path.join(os.path.dirname(__file__), \
+                os.pardir, 'tmp', nw_headers_name)
+        print 'Moving "' + nw_headers_name + '"'
+        shutil.move(nw_headers_path, dist_dir)
     for t in targets:
         if len(t['input']) == 0:
             continue
