Changeset 99496 in vbox

Timestamp:

Apr 20, 2023 9:24:36 PM (20 months ago)

Author:

vboxsync

Message:

configure, xpcom/python: Handle versions up to Python 3.12, and remove the useless handling of the 'm' suffix after 3.8 when it became the only existing variant.

Location:

trunk

Files:

• configure (modified) (1 diff)
• src/libs/xpcom18a4/python/Makefile.kmk (modified) (5 diffs)
• src/libs/xpcom18a4/python/gen_python_deps.py (modified) (1 diff)

trunk/configure

@@ -2174 +2174 @@
 EOF
   found=
-  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m python3.10 python3.10m"
+  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.9 python3.10 python3.11 python3.12"
   for p in $PYTHONDIR; do
     for d in $SUPPYTHONLIBS; do

trunk/src/libs/xpcom18a4/python/Makefile.kmk

@@ -552 +552 @@
   ifdef VBOX_PYTHON38_INC
    #
-   # Python 3.8 version
+   # Python 3.8 version (implicitly with pymalloc)
    #
    DLLS += VBoxPython3_8
@@ -571 +571 @@
   endif
 
-  ifdef VBOX_PYTHON38M_INC
-   #
-   # Python 3.8 version with pymalloc
-   #
-   DLLS += VBoxPython3_8m
-   VBoxPython3_8m_EXTENDS = VBoxPythonBase_m
-   VBoxPython3_8m_EXTENDS_BY = appending
-   VBoxPython3_8m_INCS    = $(VBOX_PYTHON38M_INC)
-   VBoxPython3_8m_LIBS    = $(VBOX_PYTHON38M_LIB)
-
-   ifdef VBOX_WITH_32_ON_64_MAIN_API
-    ifdef VBOX_PYTHON38M_LIB_X86
-     DLLS += VBoxPython3_8m_x86
-     VBoxPython3_8m_x86_EXTENDS = VBoxPythonBase_x86_m
-     VBoxPython3_8m_x86_EXTENDS_BY = appending
-     VBoxPython3_8m_x86_INCS  = $(VBOX_PYTHON38M_INC)
-     VBoxPython3_8m_x86_LIBS  = $(VBOX_PYTHON38M_LIB_X86)
-    endif
-   endif
-  endif
-
   ifdef VBOX_PYTHON39_INC
    #
-   # Python 3.9 version
+   # Python 3.9 version (implicitly with pymalloc)
    #
    DLLS += VBoxPython3_9
@@ -613 +592 @@
   endif
 
-  ifdef VBOX_PYTHON39M_INC
-   #
-   # Python 3.9 version with pymalloc
-   #
-   DLLS += VBoxPython3_9m
-   VBoxPython3_9m_EXTENDS = VBoxPythonBase_m
-   VBoxPython3_9m_EXTENDS_BY = appending
-   VBoxPython3_9m_INCS    = $(VBOX_PYTHON39M_INC)
-   VBoxPython3_9m_LIBS    = $(VBOX_PYTHON39M_LIB)
-
-   ifdef VBOX_WITH_32_ON_64_MAIN_API
-    ifdef VBOX_PYTHON39M_LIB_X86
-     DLLS += VBoxPython3_9m_x86
-     VBoxPython3_9m_x86_EXTENDS = VBoxPythonBase_x86_m
-     VBoxPython3_9m_x86_EXTENDS_BY = appending
-     VBoxPython3_9m_x86_INCS  = $(VBOX_PYTHON39M_INC)
-     VBoxPython3_9m_x86_LIBS  = $(VBOX_PYTHON39M_LIB_X86)
-    endif
-   endif
-  endif
-
   ifdef VBOX_PYTHON310_INC
    #
-   # Python 3.10 version
+   # Python 3.10 version (implicitly with pymalloc)
    #
    DLLS += VBoxPython3_10
@@ -655 +613 @@
   endif
 
-  ifdef VBOX_PYTHON310M_INC
-   #
-   # Python 3.10 version with pymalloc
-   #
-   DLLS += VBoxPython3_10m
-   VBoxPython3_10m_EXTENDS = VBoxPythonBase_m
-   VBoxPython3_10m_EXTENDS_BY = appending
-   VBoxPython3_10m_INCS    = $(VBOX_PYTHON310M_INC)
-   VBoxPython3_10m_LIBS    = $(VBOX_PYTHON310M_LIB)
-
-   ifdef VBOX_WITH_32_ON_64_MAIN_API
-    ifdef VBOX_PYTHON310M_LIB_X86
-     DLLS += VBoxPython3_10m_x86
-     VBoxPython3_10m_x86_EXTENDS = VBoxPythonBase_x86_m
-     VBoxPython3_10m_x86_EXTENDS_BY = appending
-     VBoxPython3_10m_x86_INCS  = $(VBOX_PYTHON310M_INC)
-     VBoxPython3_10m_x86_LIBS  = $(VBOX_PYTHON310M_LIB_X86)
+  ifdef VBOX_PYTHON311_INC
+   #
+   # Python 3.11 version (implicitly with pymalloc)
+   #
+   DLLS += VBoxPython3_11
+   VBoxPython3_11_EXTENDS = VBoxPythonBase
+   VBoxPython3_11_EXTENDS_BY = appending
+   VBoxPython3_11_INCS    = $(VBOX_PYTHON311_INC)
+   VBoxPython3_11_LIBS    = $(VBOX_PYTHON311_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON311_LIB_X86
+     DLLS += VBoxPython3_11_x86
+     VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_11_x86_EXTENDS_BY = appending
+     VBoxPython3_11_x86_INCS  = $(VBOX_PYTHON311_INC)
+     VBoxPython3_11_x86_LIBS  = $(VBOX_PYTHON311_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON312_INC
+   #
+   # Python 3.12 version (implicitly with pymalloc)
+   #
+   DLLS += VBoxPython3_12
+   VBoxPython3_12_EXTENDS = VBoxPythonBase
+   VBoxPython3_12_EXTENDS_BY = appending
+   VBoxPython3_12_INCS    = $(VBOX_PYTHON312_INC)
+   VBoxPython3_12_LIBS    = $(VBOX_PYTHON312_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON312_LIB_X86
+     DLLS += VBoxPython3_12_x86
+     VBoxPython3_12_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_12_x86_EXTENDS_BY = appending
+     VBoxPython3_12_x86_INCS  = $(VBOX_PYTHON312_INC)
+     VBoxPython3_12_x86_LIBS  = $(VBOX_PYTHON312_LIB_X86)
     endif
    endif
@@ -718 +697 @@
   #       ('m' builds < 3.8) and CRT malloc.
   #
-  VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310   34 33 \
+  VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 312   34 33 \
                         ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
   ifneq ($(VBOX_PYTHON_LIMITED_API_VER),)

trunk/src/libs/xpcom18a4/python/gen_python_deps.py

@@ -30 +30 @@
     from distutils.version import StrictVersion as Version
 
-versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m" ]
+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.9", "3.10", "3.11", "3.12" ]
 prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
 known = {}