TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepackage: Support building deb with more than one Python 3 version

Browse Source 
Ubuntu Hirsute, Impish, and presumably Jammy ship with both Python 3.9 and 3.10.

Also, change the dependency specifications so that only one Python version is strictly required.
This commit is contained in:
rdb 2022-01-03 10:33:14 +01:00
parent fb4b154037
commit c76ddd9958
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
makepanda/makepackage.py
View File

@ -298,6 +298,8 @@ def MakeInstallerLinux(version, debversion=None, rpmversion=None, rpmrelease=1,
elif version_info["version"] == sys_python3_ver:
python3_ver = sys_python3_ver
install_python_versions.append(version_info)
elif os.path.isdir("/usr/lib/python" + version_info["version"]):
install_python_versions.append(version_info)
major_version = '.'.join(version.split('.')[:2])
if not debversion:
@ -394,17 +396,21 @@ def MakeInstallerLinux(version, debversion=None, rpmversion=None, rpmrelease=1,
recommends = ReadFile("targetroot/debian/substvars_rec").replace("shlibs:Depends=", "").strip()
provides = "panda3d"
if python2_ver:
depends += ", python%s" % (python2_ver)
# Require at least one of the Python versions we built for.
depends += ", " + " | ".join("python" + version_info["version"] for version_info in install_python_versions)
# But recommend the system version of Python 3.
if python3_ver:
recommends += ", python3 (>= %s)" % (python3_ver)
recommends += ", python3-tk (>= %s)" % (python3_ver)
provides += ", python3-panda3d"
elif python2_ver:
recommends += ", python-wxversion"
recommends += ", python-pmw"
recommends += ", python-tk (>= %s)" % (python2_ver)
provides += ", python2-panda3d"
if python3_ver:
depends += ", python%s" % (python3_ver)
recommends += ", python3-tk (>= %s)" % (python3_ver)
provides += ", python3-panda3d"
if python2_ver:
provides += ", python2-panda3d"
if not PkgSkip("NVIDIACG"):
depends += ", nvidia-cg-toolkit"