Merge pull request #2213 from pupil-labs/develop

Pupil v3.5 Release Candidate 1

deployment/bundle_windows.bat

@@ -32,9 +32,13 @@ if not exist %release_dir% (
 	mkdir %release_dir%
 )
 
+echo Adding pupil_external to PATH
 set PATH=%PATH%;%~dp0..\pupil_external
-set PATH=%PATH%;C:\Python36\Lib\site-packages\scipy\.libs
-set PATH=%PATH%;C:\Python36\Lib\site-packages\zmq
+setlocal enabledelayedexpansion
+for /F "usebackq" %%s IN (`dir C:\Python36\Lib\site-packages\*.libs /S /B`) DO (
+echo Adding %%s to PATH
+set PATH=!PATH!;%%s
+)
 
 call :Bundle capture %current_tag%
 call :Bundle service %current_tag%

deployment/deploy_capture/bundle.spec

@@ -7,11 +7,14 @@ import os.path
 import pathlib
 import platform
 import sys
+import logging
 
 import numpy
 import pkg_resources
 from PyInstaller.utils.hooks import collect_submodules, collect_data_files
 
+logger = logging.getLogger(__name__)
+
 hidden_imports = []
 hidden_imports += collect_submodules("av")
 
@@ -150,7 +153,7 @@ elif platform.system() == "Linux":
         [("pyglui/pupil_icons.ttf", ui.get_pupil_icons_font_path(), "DATA")],
         apriltag_libs,
         glfw_binaries,
-        strip=True,
+        strip=False,
         upx=True,
         name="pupil_capture",
     )
@@ -209,6 +212,22 @@ elif platform.system() == "Windows":
         (lib.name, str(lib), "BINARY") for lib in vc_redist_path.glob("*.dll")
     ]
 
+    import site
+
+    delve_wheel_load_order_files = []
+    for site_pkgs in site.getsitepackages():
+        logger.info(f"Searching {site_pkgs} for .load-order files")
+        site_pkgs = pathlib.Path(site_pkgs)
+        for load_order in site_pkgs.glob("*\\.load-order-*"):
+            delve_wheel_load_order_files.append(
+                (
+                    str(load_order.relative_to(site_pkgs)),
+                    str(load_order),
+                    "DATA",
+                )
+            )
+    logger.debug(f"Found following load-order files: {delve_wheel_load_order_files}")
+
     coll = COLLECT(
         exe,
         a.binaries,
@@ -222,6 +241,7 @@ elif platform.system() == "Windows":
         glfw_binaries,
         vc_redist_libs,
         np_dll_list,
+        delve_wheel_load_order_files,
         strip=False,
         upx=True,
         name="Pupil Capture",

deployment/deploy_player/bundle.spec

@@ -7,11 +7,14 @@ import os.path
 import pathlib
 import platform
 import sys
+import logging
 
 import numpy
 import pkg_resources
 from PyInstaller.utils.hooks import collect_submodules, collect_data_files
 
+logger = logging.getLogger(__name__)
+
 hidden_imports = []
 hidden_imports += collect_submodules("av")
 
@@ -152,7 +155,7 @@ elif platform.system() == "Linux":
         [("pyglui/pupil_icons.ttf", ui.get_pupil_icons_font_path(), "DATA")],
         apriltag_libs,
         glfw_binaries,
-        strip=True,
+        strip=False,
         upx=True,
         name="pupil_player",
     )
@@ -208,6 +211,22 @@ elif platform.system() == "Windows":
         (lib.name, str(lib), "BINARY") for lib in vc_redist_path.glob("*.dll")
     ]
 
+    import site
+
+    delve_wheel_load_order_files = []
+    for site_pkgs in site.getsitepackages():
+        logger.info(f"Searching {site_pkgs} for .load-order files")
+        site_pkgs = pathlib.Path(site_pkgs)
+        for load_order in site_pkgs.glob("*\\.load-order-*"):
+            delve_wheel_load_order_files.append(
+                (
+                    str(load_order.relative_to(site_pkgs)),
+                    str(load_order),
+                    "DATA",
+                )
+            )
+    logger.debug(f"Found following load-order files: {delve_wheel_load_order_files}")
+
     coll = COLLECT(
         exe,
         a.binaries,
@@ -220,6 +239,7 @@ elif platform.system() == "Windows":
         glfw_binaries,
         vc_redist_libs,
         np_dll_list,
+        delve_wheel_load_order_files,
         strip=None,
         upx=True,
         name="Pupil Player",

deployment/deploy_service/bundle.spec

@@ -7,11 +7,14 @@ import os.path
 import pathlib
 import platform
 import sys
+import logging
 
 import numpy
 import pkg_resources
 from PyInstaller.utils.hooks import collect_submodules, collect_data_files
 
+logger = logging.getLogger(__name__)
+
 hidden_imports = []
 hidden_imports += collect_submodules("av")
 
@@ -129,7 +132,7 @@ elif platform.system() == "Linux":
         [("pyglui/Roboto-Regular.ttf", ui.get_roboto_font_path(), "DATA")],
         [("pyglui/pupil_icons.ttf", ui.get_pupil_icons_font_path(), "DATA")],
         glfw_binaries,
-        strip=True,
+        strip=False,
         upx=True,
         name="pupil_service",
     )
@@ -183,6 +186,22 @@ elif platform.system() == "Windows":
         (lib.name, str(lib), "BINARY") for lib in vc_redist_path.glob("*.dll")
     ]
 
+    import site
+
+    delve_wheel_load_order_files = []
+    for site_pkgs in site.getsitepackages():
+        logger.info(f"Searching {site_pkgs} for .load-order files")
+        site_pkgs = pathlib.Path(site_pkgs)
+        for load_order in site_pkgs.glob("*\\.load-order-*"):
+            delve_wheel_load_order_files.append(
+                (
+                    str(load_order.relative_to(site_pkgs)),
+                    str(load_order),
+                    "DATA",
+                )
+            )
+    logger.debug(f"Found following load-order files: {delve_wheel_load_order_files}")
+
     coll = COLLECT(
         exe,
         a.binaries,
@@ -195,6 +214,7 @@ elif platform.system() == "Windows":
         glfw_binaries,
         np_dll_list,
         vc_redist_libs,
+        delve_wheel_load_order_files,
         strip=False,
         upx=True,
         name="Pupil Service",

deployment/generate_msi_installer.py

@@ -165,7 +165,8 @@ def icon_data(self) -> str:
 
         <Package Id='*' Keywords='Installer'
         Description="{package_description}" Manufacturer='{manufacturer}'
-        InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+        InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252'
+        InstallScope='perMachine' />
 
         <Media Id='1' Cabinet='Cabinet.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
         <Property Id='DiskPrompt' Value="{package_description} Installer [1]" />