Merge remote-tracking branch 'origin/nw12'

rogerwang · rogerwang · commit dd7d7ad353fa · 2015-03-09T14:24:07.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 0.12.0 / 03-05-2015
 =======================
 - Chromium updated to 41.0.2272.76
-- [Screen Selection] OSX and Win implementation (Thanks to Jefry <jefry.ted@vcube.co.jp>)
+- [Screen Selection] OSX and Win implementation (Thanks to Jefry)
 - Fix #3165: crash on auth in webview
 
 0.12.0-rc1 / 02-27-2015
diff --git a/tools/make-nw-headers.py b/tools/make-nw-headers.py
@@ -7,6 +7,17 @@
 import distutils.core
 import re
 
+def update_uvh(tmp_dir, header_files):
+  for file in header_files:
+    header_f = os.path.join(tmp_dir, 'node', 'src', file)
+    rfile = open(header_f, 'r')
+    old = rfile.read()
+    new = re.sub('third_party/node/deps/uv/include/uv.h', 'uv.h', old, 0)
+    wfile = open(header_f, 'w')
+    wfile.write(new)
+    wfile.close()
+  return
+
 script_dir = os.path.dirname(__file__)
 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)) 
@@ -21,7 +32,7 @@
 '''
 if '-t' in sys.argv:
   nw_version = sys.argv[sys.argv.index('-t') + 1]
-tarname = 'node-v' + nw_version + '.tar.gz'
+tarname = 'nw-headers-v' + nw_version + '.tar.gz'
 tarpath = os.path.join(tmp_dir, tarname)
 
 #make tmpdir
@@ -71,21 +82,13 @@
 if os.path.exists(os.path.join(tmp_dir, 'node', 'deps', 'npm', 'node_modules')):
   shutil.rmtree(os.path.join(tmp_dir, 'node', 'deps', 'npm', 'node_modules'))
 
-rfile = open(os.path.join(tmp_dir, 'node', 'src', 'node.h'), 'r')
-filer = rfile.read()
-sub = re.sub('third_party/node/deps/uv/include/uv.h', 'uv.h', filer, 0)
-rfile.close()
-wfile = open(os.path.join(tmp_dir, 'node', 'src', 'node.h'), 'w')
-wfile.write(sub)
-wfile.close()
+header_files = ['node.h', 'env.h', 'env-inl.h']
+update_uvh(tmp_dir, header_files)
 
 print 'copy file end'
 print 'Begin compress file'
 
-tar = tarfile.open(tarpath, 'w:gz')
-for dirpath, dirnames, filenames in os.walk(tmp_dir):
-  for name in filenames:
-    path = os.path.normpath(os.path.join(dirpath, name))
-    tar.add(path, path.replace(tmp_dir + os.sep, ''))
-tar.close()
-print 'compress end'
+with tarfile.open(tarpath, 'w:gz') as tar:
+  tar.add(os.path.join(tmp_dir, 'node'), arcname='node')
+
+print 'compress end'
