Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion macbuild/build4mac.py
Original file line number Diff line number Diff line change
Expand Up @@ -1991,7 +1991,25 @@ def Deploy_Binaries_For_Bundle(config, parameters):
cmd06 = "rm -rf %s" % binTarget

cmd07 = "mkdir %s" % sitepackagesTarget
cmd08 = "cp -RL %s/{*distutils*,pip*,pkg_resources,setuptools*,wheel*} %s" % (sitepackagesSource, sitepackagesTarget)
# cmd08 = "cp -RL %s/{*distutils*,pip*,pkg_resources,setuptools*,wheel*} %s" % (sitepackagesSource, sitepackagesTarget)
# Updated for compatibility with modern Python environments (e.g., pip 26.0.1+).
# Since 'pkg_resources' and other legacy paths may be absent in recent setuptools,
# we use a loop to copy only available directories while suppressing errors.
# Define patterns for essential packages to be bundled
patterns = ['*distutils*', 'pip*', 'pkg_resources*', 'setuptools*', 'wheel*']
sources = []

# Collect only existing paths to avoid "No such file or directory" errors,
# especially for 'pkg_resources' which is deprecated and often missing in Python 3.11+.
for p in patterns:
sources.extend(glob.glob(os.path.join(sitepackagesSource, p)))

if sources:
# Join all existing paths into a single string for the 'cp' command
cmd08 = "cp -RL %s %s" % (" ".join(sources), sitepackagesTarget)
else:
# Fallback or log if no packages are found
cmd08 = "echo 'No matching site-packages found to copy; skipping.'"

shell_commands = list()
shell_commands.append(cmd01)
Expand Down
2 changes: 1 addition & 1 deletion macbuild/build4mac_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
# install with 'sudo port install ruby34'
# [Key Type Name] = 'MP34'
Ruby34MacPorts = { 'exe': '/opt/local/bin/ruby3.4',
'inc': '/opt/local/include/ruby-3.4.7',
'inc': '/opt/local/include/ruby-3.4.8',
'lib': '/opt/local/lib/libruby.3.4.dylib'
}

Expand Down
Loading