add support for Python 3.12

tyczyluk · tyczyluk · commit d6a72ea41fb3 · 2024-05-16T22:33:44.000+02:00
diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h
@@ -34,27 +34,16 @@
 #define DL_EXPORT(RTYPE) RTYPE
 #endif
 
-#if PY_MAJOR_VERSION == 2
-#if PY_MINOR_VERSION == 7
-#include "../../build/build_cefpython/cefpython_py27_fixed.h"
-#endif // PY_MINOR_VERSION
-#elif PY_MAJOR_VERSION == 3
-#if PY_MINOR_VERSION == 4
-#include "../../build/build_cefpython/cefpython_py34_fixed.h"
-#elif PY_MINOR_VERSION == 5
-#include "../../build/build_cefpython/cefpython_py35_fixed.h"
-#elif PY_MINOR_VERSION == 6
-#include "../../build/build_cefpython/cefpython_py36_fixed.h"
-#elif PY_MINOR_VERSION == 7
-#include "../../build/build_cefpython/cefpython_py37_fixed.h"
-#elif PY_MINOR_VERSION == 8
-#include "../../build/build_cefpython/cefpython_py38_fixed.h"
-#elif PY_MINOR_VERSION == 9
+
+#if PY_MAJOR_VERSION == 3
+#if PY_MINOR_VERSION == 9
 #include "../../build/build_cefpython/cefpython_py39_fixed.h"
 #elif PY_MINOR_VERSION == 10
 #include "../../build/build_cefpython/cefpython_py310_fixed.h"
 #elif PY_MINOR_VERSION == 11
 #include "../../build/build_cefpython/cefpython_py311_fixed.h"
+#elif PY_MINOR_VERSION == 12
+#include "../../build/build_cefpython/cefpython_py312_fixed.h"
 #endif // PY_MINOR_VERSION
 #endif // PY_MAJOR_VERSION
 
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
@@ -80,7 +80,7 @@
 ALLOW_PARTIAL = False
 
 # Python versions
-SUPPORTED_PYTHON_VERSIONS = [(3, 9), (3.10), (3.11)]
+SUPPORTED_PYTHON_VERSIONS = [(3, 9), (3.10), (3.11), (3.12)]
 
 # Python search paths. It will use first Python found for specific version.
 # Supports replacement of one environment variable in path eg.: %ENV_KEY%.
@@ -570,7 +570,7 @@ def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons):
         return
     checked_any = False
     for python in all_pythons:
-        if python["version2"] in ((3, 9), (3, 10), (3, 11)):
+        if python["version2"] in ((3, 9), (3, 10), (3, 11), (3.12)):
             checked_any = True
             if not os.path.exists(os.path.join(setup_dir, "cefpython3",
                                                "msvcp140.dll")):
diff --git a/tools/common.py b/tools/common.py
@@ -470,6 +470,8 @@ def get_msvs_for_python(vs_prefix=False):
         return "VS2022" if vs_prefix else "2022"
     elif sys.version_info[:2] == (3, 11):
         return "VS2022" if vs_prefix else "2022"
+    elif sys.version_info[:2] == (3, 12):
+        return "VS2022" if vs_prefix else "2022"
     else:
         print("ERROR: This version of Python is not supported")
         sys.exit(1)
diff --git a/tools/installer/cefpython3.__init__.py b/tools/installer/cefpython3.__init__.py
@@ -52,5 +52,8 @@
     from . import cefpython_py310 as cefpython
 elif sys.version_info[:2] == (3, 11):
     from . import cefpython_py311 as cefpython
+elif sys.version_info[:2] == (3, 12):
+    from . import cefpython_py312 as cefpython
 else:
     raise Exception("Python version not supported: " + sys.version)
+
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
@@ -144,6 +144,7 @@ def main():
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
             "Programming Language :: Python :: 3.11",
+            "Programming Language :: Python :: 3.12",
             "Topic :: Desktop Environment",
             "Topic :: Internet",
             "Topic :: Internet :: WWW/HTTP",
diff --git a/tools/make_installer.py b/tools/make_installer.py
@@ -364,10 +364,11 @@ def copy_cpp_extension_dependencies_issue359(pkg_dir):
     # required as well.
 
 
-    # Python 3.9 / 3.10 / 3.11
+    # Python 3.9 / 3.10 / 3.11 / 3.12
     if os.path.exists(os.path.join(pkg_dir, "cefpython_py39.pyd")) \
             or os.path.exists(os.path.join(pkg_dir, "cefpython_py310.pyd")) \
-            or os.path.exists(os.path.join(pkg_dir, "cefpython_py311.pyd")):
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py311.pyd")) \
+            or os.path.exists(os.path.join(pkg_dir, "cefpython_py312.pyd")):
         search_paths = [
             # This is where Microsoft Visual C++ 2015 Update 3 installs
             # (14.00.24212).
