Skip to content

Commit c1ff759

Browse files
authored
Fix/pyinstaller (#17809)
* fix pyinstaller * fix pyinstaller
1 parent 68e03bb commit c1ff759

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

pyinstaller.py

+19-9
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,26 @@ def pyinstall(source_folder, onefile=False):
105105
# Modules that can be imported in ConanFile conan.tools and errors
106106
"--collect-submodules=conan.cli.commands "
107107
"--hidden-import=conan.errors "
108-
"--hidden-import=conan.tools.microsoft "
109-
"--hidden-import=conan.tools.gnu --hidden-import=conan.tools.cmake "
110-
"--hidden-import=conan.tools.meson --hidden-import=conan.tools.apple "
111-
"--hidden-import=conan.tools.build --hidden-import=conan.tools.env "
108+
"--hidden-import=conan.tools.android "
109+
"--hidden-import=conan.tools.apple "
110+
"--hidden-import=conan.tools.build "
111+
"--hidden-import=conan.tools.cmake "
112+
"--hidden-import=conan.tools.env "
112113
"--hidden-import=conan.tools.files "
113-
"--hidden-import=conan.tools.google --hidden-import=conan.tools.intel "
114-
"--hidden-import=conan.tools.layout --hidden-import=conan.tools.premake "
115-
"--hidden-import=conan.tools.qbs --hidden-import=conan.tools.scm "
116-
"--hidden-import=conan.tools.system --hidden-import=conan.tools.system.package_manager")
114+
"--hidden-import=conan.tools.gnu "
115+
"--hidden-import=conan.tools.google "
116+
"--hidden-import=conan.tools.intel "
117+
"--hidden-import=conan.tools.layout "
118+
"--hidden-import=conan.tools.meson "
119+
"--hidden-import=conan.tools.microsoft "
120+
"--hidden-import=conan.tools.premake "
121+
"--hidden-import=conan.tools.qbs "
122+
"--hidden-import=conan.tools.ros "
123+
"--hidden-import=conan.tools.sbom "
124+
"--hidden-import=conan.tools.scm "
125+
"--hidden-import=conan.tools.scons "
126+
"--hidden-import=conan.tools.system "
127+
"--hidden-import=conan.tools.system.package_manager")
117128

118129
if not os.path.exists(pyinstaller_path):
119130
os.mkdir(pyinstaller_path)
@@ -128,7 +139,6 @@ def pyinstall(source_folder, onefile=False):
128139
file.write(content)
129140
win_ver = ["--version-file", win_ver_file]
130141

131-
132142
if onefile:
133143
distpath = os.path.join(pyinstaller_path, "dist", "conan")
134144
else:

0 commit comments

Comments
 (0)