Update build_distrib - restore sample apps in cef prebuilt directories

cztomczak · cztomczak · commit 92b1895acd9a · 2018-08-02T13:49:55.000+02:00
diff --git a/tools/automate.py b/tools/automate.py
@@ -744,7 +744,9 @@ def create_prebuilt_binaries():
             "build_cefclient", "tests", "cefclient",
             Options.build_type,
             "cefclient" + APP_EXT)
-    if LINUX and os.path.exists(cefclient):
+    if not MAC:
+        assert os.path.exists(cefclient)
+    if LINUX:
         # On Windows resources/*.html files are embedded inside exe
         cefclient_files = os.path.join(
                 src,
@@ -759,14 +761,18 @@ def create_prebuilt_binaries():
             "build_cefclient", "tests", "cefsimple",
             Options.build_type,
             "cefsimple" + APP_EXT)
+    if not MAC:
+        assert os.path.exists(cefsimple)
 
     # ceftests
     ceftests = os.path.join(
             src,
             "build_cefclient", "tests", "ceftests",
             Options.build_type,
             "ceftests" + APP_EXT)
-    if LINUX and os.path.exists(ceftests):
+    if not MAC:
+        assert os.path.exists(ceftests)
+    if LINUX:
         # On Windows resources/*.html files are embedded inside exe
         ceftests_files = os.path.join(
                 src,
@@ -776,8 +782,7 @@ def create_prebuilt_binaries():
         cpdir(ceftests_files, os.path.join(bindir, "ceftests_files"))
 
     def copy_app(app):
-        if os.path.exists(app):
-            if os.path.isdir(app):
+            if MAC:
                 # On Mac app is a directory
                 shutil.copytree(app,
                                 os.path.join(bindir,
diff --git a/tools/common.py b/tools/common.py
@@ -4,13 +4,15 @@
 
 # Common stuff for tools such as automate.py, build.py, etc.
 
+import atexit
 import glob
 import os
 import platform
 import re
 import shutil
 import struct
 import sys
+import tempfile
 
 # These sample apps will be deleted when creating setup/wheel packages
 CEF_SAMPLE_APPS = ["cefclient", "cefsimple", "ceftests", "chrome-sandbox"]
@@ -268,26 +270,47 @@ def get_python_include_path():
                 return results[0]
     return ".\\" if WINDOWS else "./"
 
+g_deleted_sample_apps = []
+
 
 def delete_cef_sample_apps(caller_script, bin_dir):
     """Delete CEF sample apps to reduce package size."""
+    atexit.register(restore_cef_sample_apps, caller_script)
     for sample_app_name in CEF_SAMPLE_APPS:
         sample_app = os.path.join(bin_dir, sample_app_name + APP_EXT)
         # Not on all platforms sample apps may be available
         if os.path.exists(sample_app):
             print("[{script}] Delete {sample_app}"
                   .format(script=os.path.basename(caller_script),
                           sample_app=os.path.basename(sample_app)))
-            if os.path.isdir(sample_app):
-                shutil.rmtree(sample_app)
-            else:
-                os.remove(sample_app)
+            tmpdir = tempfile.mkdtemp()
+            g_deleted_sample_apps.append((bin_dir,
+                                          os.path.basename(sample_app),
+                                          tmpdir))
+            shutil.move(sample_app, tmpdir)
             # Also delete subdirs eg. cefclient_files/, ceftests_files/
             files_subdir = os.path.join(bin_dir, sample_app_name + "_files")
             if os.path.isdir(files_subdir):
-                print("[build_distrib.py] Delete directory: {dir}/"
-                      .format(dir=os.path.basename(files_subdir)))
-                shutil.rmtree(files_subdir)
+                print("[{script}] Delete directory: {dir}/"
+                      .format(script=os.path.basename(caller_script),
+                              dir=os.path.basename(files_subdir)))
+                tmpdir = tempfile.mkdtemp()
+                g_deleted_sample_apps.append((bin_dir,
+                                              os.path.basename(files_subdir),
+                                              tmpdir))
+                shutil.move(files_subdir, tmpdir)
+
+
+def restore_cef_sample_apps(caller_script):
+    for deleted in g_deleted_sample_apps:
+        bin_dir = deleted[0]
+        tmp = os.path.join(deleted[2], deleted[1])
+        print("[{script}] Restore: {path}"
+              .format(script=os.path.basename(caller_script),
+                      path=os.path.join(bin_dir, deleted[1])))
+        shutil.move(tmp, bin_dir)
+        shutil.rmtree(deleted[2])
+    del g_deleted_sample_apps[0:len(g_deleted_sample_apps)]
 
 
 def _detect_cef_binaries_libraries_dir():
