Skip to content

Move VCRuntime from DLLs folder to Main #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rickprice merged 1 commit into from
Sep 6, 2024
Merged

Move VCRuntime from DLLs folder to Main #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions PC/layout/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
TCLTK_DIRS_ONLY = FileNameSet("tkinter", "turtledemo")
TCLTK_FILES_ONLY = FileNameSet("turtle.py")

EXCLUDE_FROM_PYDS = FileStemSet("python*", "pyshellext")
EXCLUDE_FROM_PYDS = FileStemSet("python*", "pyshellext", "vcruntime*")
EXCLUDE_FROM_LIB = FileNameSet("*.pyc", "__pycache__", "*.pickle")
EXCLUDE_FROM_PACKAGED_LIB = FileNameSet("readme.txt")
EXCLUDE_FROM_COMPILE = FileNameSet("badsyntax_*", "bad_*")
Expand Down Expand Up @@ -142,6 +142,14 @@ def in_build(f, dest="", new_name=None):
for item in in_build(PYTHON_DLL_NAME):
yield item

# Explicitly move vcruntime.dlls to the Main directory so they are available at startup
found_any = False
for dest, src in rglob(ns.build, "vcruntime*.dll"):
found_any = True
yield dest, src
if not found_any:
log_error("Failed to locate vcruntime DLL in the build.")

yield "LICENSE", "LICENSE"

for dest, src in rglob(ns.build, ("*.pyd", "*.dll")):
Expand All @@ -153,7 +161,9 @@ def in_build(f, dest="", new_name=None):
continue
if src in TCLTK_PYDS_ONLY and not ns.include_tcltk:
continue

# Explicitly remove files containing vcruntime from the DLLs subdirectory.
if "vcruntime" in src:
continue
for item in in_build(os.path.basename(src), dest="" if ns.flat_dlls else "DLLs/"):
yield item

Expand Down