add pre-release support

xueeinstein · ghostoy · commit 65a7761b68be · 2015-05-26T23:00:31.000+08:00
diff --git a/tools/make-nw-headers.py b/tools/make-nw-headers.py
@@ -2,6 +2,7 @@
 import os
 import tarfile
 import sys
+import getnwisrelease
 import getnwversion
 import shutil
 import distutils.core
@@ -25,6 +26,8 @@ def update_uvh(tmp_dir, header_files):
 tmp_dir = os.path.normpath(os.path.join(nw_root, 'tmp'))
 
 nw_version = getnwversion.nw_version
+if getnwisrelease.release == 0:
+    nw_version += getnwisrelease.postfix
 
 #parse command line arguments
 '''
diff --git a/tools/package_binaries.py b/tools/package_binaries.py
@@ -12,7 +12,7 @@
 
 from subprocess import call
 
-steps = ['nw', 'chromedriver', 'symbol', 'others']
+steps = ['nw', 'chromedriver', 'symbol', 'headers', 'others']
 ################################
 # Parse command line args
 parser = argparse.ArgumentParser(description='Package nw binaries.')
@@ -33,8 +33,6 @@
 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
@@ -201,26 +199,48 @@ def generate_target_symbols(platform_name, arch, version):
         exit(-1)
     return target
 
-def generate_target_others(platform_name, arch, version):
+def generate_target_headers(platform_name, arch, version):
+    # here, call make_nw_header tool to generate headers
+    # then, move to binaries_location
     target = {}
     target['output'] = ''
     target['compress'] = None
-    if platform_name == 'win':
-        target['input'] = ['nw.exp', 'nw.lib']
-    elif platform_name == 'linux' :
+    if platform_name == 'osx':
         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'
+            nw_headers_name = 'nw-headers-v' + version + '.tar.gz'
+            nw_headers_path = os.path.join(os.path.dirname(__file__), \
+                    os.pardir, 'tmp', nw_headers_name)
+            if os.path.isfile(os.path.join(binaries_location, nw_headers_name)):
+                os.remove(os.path.join(binaries_location, nw_headers_name))
+            shutil.move(nw_headers_path, binaries_location)
+            target['input'].append(nw_headers_name)
         else:
+            #TODO, handle err
             print 'nw-headers generate failed'
+    elif platform_name == 'win':
+        target['input'] = []
+    elif platform_name == 'linux':
+        target['input'] = []
+    else:
+        print 'Unsupported platform: ' + platform_name
+        exit(-1)
+    return target
+
+def generate_target_others(platform_name, arch, version):
+    target = {}
+    target['output'] = ''
+    target['compress'] = None
+    if platform_name == 'win':
+        target['input'] = ['nw.exp', 'nw.lib']
+    elif platform_name == 'linux' :
+        target['input'] = []
     else:
         target['input'] = []
     return target
@@ -282,14 +302,6 @@ 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
@@ -327,6 +339,7 @@ def make_packages(targets):
 generators['nw'] = generate_target_nw
 generators['chromedriver'] = generate_target_chromedriver
 generators['symbol'] = generate_target_symbols
+generators['headers'] = generate_target_headers
 generators['others'] = generate_target_others
 ################################
 # Process targets
