Update tools

cztomczak · cztomczak · commit 175a58a8f668 · 2018-08-27T20:18:44.000+02:00
diff --git a/src/browser.pyx b/src/browser.pyx
@@ -576,6 +576,10 @@ cdef class PyBrowser:
             # On Windows with empty window_info structure the devtools
             # window doesn't appear.
             window_info.SetAsPopup(
+                    # TODO:
+                    # According to docs this returns NULL for non-popup
+                    # windows, so looks like we shouldn't use that and
+                    # either pass NULL or GetWindowHandle().
                     <CefWindowHandle>self.GetOpenerWindowHandle(),
                     PyToCefStringValue("DevTools"))
         cdef CefBrowserSettings settings
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
@@ -199,6 +199,28 @@ def clean_build_directories():
 
     # Delete cef binaries and libraries dirs
     if not NO_AUTOMATE:
+        # Delete cef binlib dir only if cef_binary dir exists,
+        # otherwise you will end up with cef binlib directory
+        # deleted and script failing further when calling
+        # automate.py --prebuilt-cef.
+        version = get_cefpython_version()
+        # 32-bit
+        if not MAC:
+            postfix2 = get_cef_postfix2_for_arch("32bit")
+            cef_binary_dir = "cef_binary_{cef_version}_{postfix2}"\
+                             .format(cef_version=version["CEF_VERSION"],
+                                     postfix2=postfix2)
+            if len(glob.glob(cef_binary_dir)) != 1:
+                raise Exception("Directory not found: "+cef_binary_dir)
+        # 64-bit
+        postfix2 = get_cef_postfix2_for_arch("64bit")
+        cef_binary_dir = "cef_binary_{cef_version}_windows64"\
+                         .format(cef_version=version["CEF_VERSION"],
+                                 postfix2=postfix2)
+        if len(glob.glob(cef_binary_dir)) != 1:
+            raise Exception("Directory not found: "+cef_binary_dir)
+
+        # Delete
         delete_cef_binaries_libraries_dir("32bit")
         delete_cef_binaries_libraries_dir("64bit")
 
diff --git a/tools/common.py b/tools/common.py
@@ -289,6 +289,7 @@ def get_python_include_path():
                 return results[0]
     return ".\\" if WINDOWS else "./"
 
+
 g_deleted_sample_apps = []
 
 
diff --git a/tools/requirements.py b/tools/requirements.py
@@ -1,7 +1,7 @@
 """
 Installs Python dependencies using the pip tool.
 See the requirements.txt file.
-pip install --upgrade -r ../tools/requirements.txt
+python -m pip install --upgrade -r ../tools/requirements.txt
 """
 
 from common import *
@@ -13,7 +13,8 @@ def main():
     if sys.executable.startswith("/usr/"):
         args.append("sudo")
     requirements = os.path.join(TOOLS_DIR, "requirements.txt")
-    args.extend(["pip", "install", "--upgrade", "-r", requirements])
+    args.extend([sys.executable, "-m", "pip", "install", "--upgrade",
+                 "-r", requirements])
     retcode = subprocess.call(args)
     sys.exit(retcode)
 
