Better rid of 'forbidden modules' and related folders.

part of CURA-11622
This commit is contained in:
Remco Burema 2024-12-10 17:30:27 +01:00
parent 5e59458893
commit 55f59b7971
2 changed files with 3 additions and 2 deletions

View File

@ -163,7 +163,7 @@ pyinstaller:
- [ "qt", "lab", "animat" ] - [ "qt", "lab", "animat" ]
- [ "qt", "mqtt" ] - [ "qt", "mqtt" ]
- [ "qt", "net", "auth" ] - [ "qt", "net", "auth" ]
- [ "qt", "quick3d" ] - [ "quick3d" ]
- [ "qt", "timeline" ] - [ "qt", "timeline" ]
- [ "qt", "virt", "key" ] - [ "qt", "virt", "key" ]
- [ "qt", "wayland", "compos" ] - [ "qt", "wayland", "compos" ]

View File

@ -179,6 +179,7 @@ class CuraConan(ConanFile):
"qtmqtt", "qtmqtt",
"qtnetworkauth", "qtnetworkauth",
"qtquick3d", "qtquick3d",
"quick3d",
"qtquick3dphysics", "qtquick3dphysics",
"qtquicktimeline", "qtquicktimeline",
"qtvirtualkeyboard", "qtvirtualkeyboard",
@ -207,7 +208,7 @@ class CuraConan(ConanFile):
to_remove_files.append(pathname) to_remove_files.append(pathname)
for dirname in dir_: for dirname in dir_:
for forbidden in prohibited: for forbidden in prohibited:
if forbidden.lower() == str(dirname).lower(): if forbidden.lower() in str(dirname).lower():
pathname = os.path.join(root, dirname) pathname = os.path.join(root, dirname)
to_remove_dirs.append(pathname) to_remove_dirs.append(pathname)
break break