From d1c58024c619ef1596e700f4e21e76ffb1523e19 Mon Sep 17 00:00:00 2001 From: Andreas Kleber Date: Wed, 20 Jul 2022 12:32:44 +0200 Subject: [PATCH 1/4] add conan.tools.scm as hidden-import to pyinstaller (#11677) --- pyinstaller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyinstaller.py b/pyinstaller.py index 9b7cb4b9df5..b3e17251fc4 100644 --- a/pyinstaller.py +++ b/pyinstaller.py @@ -98,7 +98,7 @@ def pyinstall(source_folder): "--hidden-import=conan.tools.files --hidden-import=conan.tools.gnu " "--hidden-import=conan.tools.google --hidden-import=conan.tools.intel " "--hidden-import=conan.tools.layout --hidden-import=conan.tools.premake " - "--hidden-import=conan.tools.qbs") + "--hidden-import=conan.tools.qbs --hidden-import=conan.tools.scm") if platform.system() != "Windows": hidden += " --hidden-import=setuptools.msvc" win_ver = "" From 512c1dc6eb6a7d999dd4b770ff2801ca03ca9dae Mon Sep 17 00:00:00 2001 From: Carlos Zoido Date: Mon, 8 Aug 2022 13:30:46 +0200 Subject: [PATCH 2/4] add system, remove dupe gnu (#11805) --- pyinstaller.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyinstaller.py b/pyinstaller.py index b3e17251fc4..022db9af1cd 100644 --- a/pyinstaller.py +++ b/pyinstaller.py @@ -95,10 +95,11 @@ def pyinstall(source_folder): "--hidden-import=conan.tools.gnu --hidden-import=conan.tools.cmake " "--hidden-import=conan.tools.meson --hidden-import=conan.tools.apple " "--hidden-import=conan.tools.build --hidden-import=conan.tools.env " - "--hidden-import=conan.tools.files --hidden-import=conan.tools.gnu " + "--hidden-import=conan.tools.files " "--hidden-import=conan.tools.google --hidden-import=conan.tools.intel " "--hidden-import=conan.tools.layout --hidden-import=conan.tools.premake " - "--hidden-import=conan.tools.qbs --hidden-import=conan.tools.scm") + "--hidden-import=conan.tools.qbs --hidden-import=conan.tools.scm " + "--hidden-import=conan.tools.system") if platform.system() != "Windows": hidden += " --hidden-import=setuptools.msvc" win_ver = "" From a058815c8055c60548b2c74c29e5eea14464885c Mon Sep 17 00:00:00 2001 From: Carlos Zoido Date: Mon, 8 Aug 2022 15:40:59 +0200 Subject: [PATCH 3/4] add hidden import (#11806) --- pyinstaller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyinstaller.py b/pyinstaller.py index 022db9af1cd..bb72153451e 100644 --- a/pyinstaller.py +++ b/pyinstaller.py @@ -99,7 +99,7 @@ def pyinstall(source_folder): "--hidden-import=conan.tools.google --hidden-import=conan.tools.intel " "--hidden-import=conan.tools.layout --hidden-import=conan.tools.premake " "--hidden-import=conan.tools.qbs --hidden-import=conan.tools.scm " - "--hidden-import=conan.tools.system") + "--hidden-import=conan.tools.system --hidden-import=conan.tools.system.package_manager") if platform.system() != "Windows": hidden += " --hidden-import=setuptools.msvc" win_ver = "" From 9ea3f8fdcba9450fac2e9641c44689a61fac6541 Mon Sep 17 00:00:00 2001 From: Carlos Zoido Date: Tue, 9 Aug 2022 08:11:30 +0200 Subject: [PATCH 4/4] add conan.errors (#11817) --- pyinstaller.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyinstaller.py b/pyinstaller.py index bb72153451e..61f020fca9d 100644 --- a/pyinstaller.py +++ b/pyinstaller.py @@ -90,7 +90,8 @@ def pyinstall(source_folder): hidden = ("--hidden-import=glob " # core stdlib "--hidden-import=pathlib " "--hidden-import=distutils.dir_util " - # The conan.tools integration + # Modules that can be imported in ConanFile conan.tools and errors + "--hidden-import=conan.errors " "--hidden-import=conan.tools.microsoft " "--hidden-import=conan.tools.gnu --hidden-import=conan.tools.cmake " "--hidden-import=conan.tools.meson --hidden-import=conan.tools.apple " @@ -99,7 +100,7 @@ def pyinstall(source_folder): "--hidden-import=conan.tools.google --hidden-import=conan.tools.intel " "--hidden-import=conan.tools.layout --hidden-import=conan.tools.premake " "--hidden-import=conan.tools.qbs --hidden-import=conan.tools.scm " - "--hidden-import=conan.tools.system --hidden-import=conan.tools.system.package_manager") + "--hidden-import=conan.tools.system --hidden-import=conan.tools.system.package_manager") if platform.system() != "Windows": hidden += " --hidden-import=setuptools.msvc" win_ver = ""