Fix creating zip distribution on Windows.

diff --git a/script/create-dist.py b/script/create-dist.py
index a948def25548f9925d758a3b89de6c8a21164616..0081bc37285b40d6fa1276b46700402a04da3464 100755 (executable)
--- a/script/create-dist.py
+++ b/script/create-dist.py
@@ -136,10 +136,9 @@ def create_zip():
   zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
 
   with scoped_cwd(DIST_DIR):
-    files = TARGET_BINARIES[TARGET_PLATFORM] +  \
-            TARGET_DIRECTORIES[TARGET_PLATFORM] + \
-            ['LICENSE', 'version']
-    make_zip(zip_file, files)
+    files = TARGET_BINARIES[TARGET_PLATFORM] +  ['LICENSE', 'version']
+    dirs = TARGET_DIRECTORIES[TARGET_PLATFORM]
+    make_zip(zip_file, files, dirs)
 
 
 def create_header_tarball():

diff --git a/script/lib/util.py b/script/lib/util.py
index 411bce8a2f88991022127680579dfe42c116e434..af71468652d598fa9b49ef4b51a31e69812adae8 100644 (file)
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -64,14 +64,19 @@ def extract_zip(zip_path, destination):
     with zipfile.ZipFile(zip_path) as z:
       z.extractall(destination)
 
-def make_zip(zip_file_path, files):
+def make_zip(zip_file_path, files, dirs):
   safe_unlink(zip_file_path)
   if sys.platform == 'darwin':
+    files += dirs
     subprocess.check_call(['zip', '-r', '-y', zip_file_path] + files)
   else:
     zip_file = zipfile.ZipFile(zip_file_path, "w")
     for filename in files:
       zip_file.write(filename, filename)
+    for dirname in dirs:
+      for root, _, filenames in os.walk(dirname):
+        for f in filenames:
+          zip_file.write(os.path.join(root, f))
     zip_file.close()