diff --git a/scripts/pyinstaller/hook-plugin_loader.py b/scripts/pyinstaller/hook-plugin_loader.py deleted file mode 100755 index b2c206f..0000000 --- a/scripts/pyinstaller/hook-plugin_loader.py +++ /dev/null @@ -1,24 +0,0 @@ -import plugin_loader - -# Hey PyInstaller? Yeah you! Take a look at these plugins! I know they're not actually imported anywhere but you -# better believe that they will be a runtime, so, if you wouldn't mind, it'd be fantastic if you pretended that -# they're imported normally and pick up *their* imports. OK? Great. Fantastic. - -print("Hooking plugins for pyinstaller") - -loader = plugin_loader.PluginLoader() - -tmp = [] - -for py_file in plugin_loader.PLUGINPATH.glob("*.py"): - mod = plugin_loader.PluginLoader.load_module_lazy(py_file) - try: - mod_artifacts = mod.__artifacts__ - except AttributeError: - pass # any unconverted plugins still get checked out so they don't break the loader during runtime - - tmp.append("scripts.artifacts." + mod.__name__) # TODO this is a hack, if we ever move plugins this breaks - -print(f"{len(tmp)} plugins loaded as hidden imports") - -hiddenimports = list(tmp) diff --git a/scripts/pyinstaller/rleapp.spec b/scripts/pyinstaller/rleapp.spec index 682dda9..fa8aee4 100755 --- a/scripts/pyinstaller/rleapp.spec +++ b/scripts/pyinstaller/rleapp.spec @@ -12,9 +12,7 @@ a = Analysis( hiddenimports=[ # Artifacts are bundled as data files and imported from disk at runtime, # so PyInstaller's import-graph analysis never sees what they import. - # hook-plugin_loader.py was meant to cover this but targets a bare - # 'plugin_loader' module that no longer exists (it moved to - # scripts.plugin_loader), so it never fires. Collect the packages + # Collect the packages # artifacts import wholesale; a missing submodule here is a startup # crash in the frozen build only. pdfminer is imported lazily by the # Kik artifact with a graceful fallback, so without it the frozen diff --git a/scripts/pyinstaller/rleappGUI.spec b/scripts/pyinstaller/rleappGUI.spec index afe9764..955f263 100755 --- a/scripts/pyinstaller/rleappGUI.spec +++ b/scripts/pyinstaller/rleappGUI.spec @@ -12,9 +12,7 @@ a = Analysis( hiddenimports=[ # Artifacts are bundled as data files and imported from disk at runtime, # so PyInstaller's import-graph analysis never sees what they import. - # hook-plugin_loader.py was meant to cover this but targets a bare - # 'plugin_loader' module that no longer exists (it moved to - # scripts.plugin_loader), so it never fires. Collect the packages + # Collect the packages # artifacts import wholesale; a missing submodule here is a startup # crash in the frozen build only. pdfminer is imported lazily by the # Kik artifact with a graceful fallback, so without it the frozen diff --git a/scripts/pyinstaller/rleappGUI_Linux.spec b/scripts/pyinstaller/rleappGUI_Linux.spec index fd0e42d..069cbfb 100644 --- a/scripts/pyinstaller/rleappGUI_Linux.spec +++ b/scripts/pyinstaller/rleappGUI_Linux.spec @@ -14,9 +14,7 @@ a = Analysis( hiddenimports=[ # Artifacts are bundled as data files and imported from disk at runtime, # so PyInstaller's import-graph analysis never sees what they import. - # hook-plugin_loader.py was meant to cover this but targets a bare - # 'plugin_loader' module that no longer exists (it moved to - # scripts.plugin_loader), so it never fires. Collect the packages + # Collect the packages # artifacts import wholesale; a missing submodule here is a startup # crash in the frozen build only. pdfminer is imported lazily by the # Kik artifact with a graceful fallback, so without it the frozen diff --git a/scripts/pyinstaller/rleappGUI_macOS.spec b/scripts/pyinstaller/rleappGUI_macOS.spec index df4a836..baa212b 100755 --- a/scripts/pyinstaller/rleappGUI_macOS.spec +++ b/scripts/pyinstaller/rleappGUI_macOS.spec @@ -10,9 +10,7 @@ a = Analysis( hiddenimports=[ # Artifacts are bundled as data files and imported from disk at runtime, # so PyInstaller's import-graph analysis never sees what they import. - # hook-plugin_loader.py was meant to cover this but targets a bare - # 'plugin_loader' module that no longer exists (it moved to - # scripts.plugin_loader), so it never fires. Collect the packages + # Collect the packages # artifacts import wholesale; a missing submodule here is a startup # crash in the frozen build only. pdfminer is imported lazily by the # Kik artifact with a graceful fallback, so without it the frozen diff --git a/scripts/pyinstaller/rleapp_Linux.spec b/scripts/pyinstaller/rleapp_Linux.spec index 7e9056c..cf267f6 100644 --- a/scripts/pyinstaller/rleapp_Linux.spec +++ b/scripts/pyinstaller/rleapp_Linux.spec @@ -10,9 +10,7 @@ a = Analysis( hiddenimports=[ # Artifacts are bundled as data files and imported from disk at runtime, # so PyInstaller's import-graph analysis never sees what they import. - # hook-plugin_loader.py was meant to cover this but targets a bare - # 'plugin_loader' module that no longer exists (it moved to - # scripts.plugin_loader), so it never fires. Collect the packages + # Collect the packages # artifacts import wholesale; a missing submodule here is a startup # crash in the frozen build only. pdfminer is imported lazily by the # Kik artifact with a graceful fallback, so without it the frozen diff --git a/scripts/pyinstaller/rleapp_macOS.spec b/scripts/pyinstaller/rleapp_macOS.spec index 17dedfa..0786c01 100644 --- a/scripts/pyinstaller/rleapp_macOS.spec +++ b/scripts/pyinstaller/rleapp_macOS.spec @@ -10,9 +10,7 @@ a = Analysis( hiddenimports=[ # Artifacts are bundled as data files and imported from disk at runtime, # so PyInstaller's import-graph analysis never sees what they import. - # hook-plugin_loader.py was meant to cover this but targets a bare - # 'plugin_loader' module that no longer exists (it moved to - # scripts.plugin_loader), so it never fires. Collect the packages + # Collect the packages # artifacts import wholesale; a missing submodule here is a startup # crash in the frozen build only. pdfminer is imported lazily by the # Kik artifact with a graceful fallback, so without it the frozen