vbox的更動 67995 路徑 trunk/src/libs

時間撮記:

2017-7-17 下午01:01:46 (7 年 以前)

作者:

vboxsync

訊息:

xpcom: add more python 3.x versions
distributions_rpm: add Fedora 26, it's the first distro with Python 3.6m

位置:

trunk/src/libs/xpcom18a4/python

檔案:

• Makefile.kmk (修改) (2 筆差異)
• gen_python_deps.py (修改) (1 筆差異)

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

@@ -27 +27 @@
 #
 # List of supported Python versions, defining a number of
-# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|DEF]_[INC|LIB] variables
+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|DEF]_[INC|LIB] variables
 # which get picked up below.
 #
@@ -387 +387 @@
 endif
 
+ifdef VBOX_PYTHON36_INC
+#
+# Python 3.6 version
+#
+DLLS += VBoxPython3_6
+VBoxPython3_6_EXTENDS    = VBoxPythonBase
+VBoxPython3_6_EXTENDS_BY = appending
+VBoxPython3_6_TEMPLATE   = XPCOM
+VBoxPython3_6_INCS       = $(VBOX_PYTHON36_INC)
+VBoxPython3_6_LIBS       = $(VBOX_PYTHON36_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+  ifdef VBOX_PYTHON36_LIB_X86
+DLLS += VBoxPython3_6_x86
+VBoxPython3_6_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython3_6_x86_EXTENDS_BY = appending
+VBoxPython3_6_x86_TEMPLATE   = XPCOM
+VBoxPython3_6_x86_INCS       = $(VBOX_PYTHON36_INC)
+VBoxPython3_6_x86_LIBS       = $(VBOX_PYTHON36_LIB_X86)
+  endif
+ endif
+endif
+
+ifdef VBOX_PYTHON36M_INC
+#
+# Python 3.6 version with pymalloc
+#
+DLLS += VBoxPython3_6m
+VBoxPython3_6m_EXTENDS    = VBoxPythonBase
+VBoxPython3_6m_EXTENDS_BY = appending
+VBoxPython3_6m_TEMPLATE   = XPCOM
+VBoxPython3_6m_INCS       = $(VBOX_PYTHON36M_INC)
+VBoxPython3_6m_LIBS       = $(VBOX_PYTHON36M_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+  ifdef VBOX_PYTHON36M_LIB_X86
+DLLS += VBoxPython3_6m_x86
+VBoxPython3_6m_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython3_6m_x86_EXTENDS_BY = appending
+VBoxPython3_6m_x86_TEMPLATE   = XPCOM
+VBoxPython3_6m_x86_INCS       = $(VBOX_PYTHON36M_INC)
+VBoxPython3_6m_x86_LIBS       = $(VBOX_PYTHON36M_LIB_X86)
+  endif
+ endif
+endif
+
+ifdef VBOX_PYTHON37_INC
+#
+# Python 3.7 version
+#
+DLLS += VBoxPython3_7
+VBoxPython3_7_EXTENDS    = VBoxPythonBase
+VBoxPython3_7_EXTENDS_BY = appending
+VBoxPython3_7_TEMPLATE   = XPCOM
+VBoxPython3_7_INCS       = $(VBOX_PYTHON37_INC)
+VBoxPython3_7_LIBS       = $(VBOX_PYTHON37_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+  ifdef VBOX_PYTHON37_LIB_X86
+DLLS += VBoxPython3_7_x86
+VBoxPython3_7_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython3_7_x86_EXTENDS_BY = appending
+VBoxPython3_7_x86_TEMPLATE   = XPCOM
+VBoxPython3_7_x86_INCS       = $(VBOX_PYTHON37_INC)
+VBoxPython3_7_x86_LIBS       = $(VBOX_PYTHON37_LIB_X86)
+  endif
+ endif
+endif
+
+ifdef VBOX_PYTHON37M_INC
+#
+# Python 3.7 version with pymalloc
+#
+DLLS += VBoxPython3_7m
+VBoxPython3_7m_EXTENDS    = VBoxPythonBase
+VBoxPython3_7m_EXTENDS_BY = appending
+VBoxPython3_7m_TEMPLATE   = XPCOM
+VBoxPython3_7m_INCS       = $(VBOX_PYTHON37M_INC)
+VBoxPython3_7m_LIBS       = $(VBOX_PYTHON37M_LIB)
+
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
+  ifdef VBOX_PYTHON37M_LIB_X86
+DLLS += VBoxPython3_7m_x86
+VBoxPython3_7m_x86_EXTENDS    = VBoxPythonBase_x86
+VBoxPython3_7m_x86_EXTENDS_BY = appending
+VBoxPython3_7m_x86_TEMPLATE   = XPCOM
+VBoxPython3_7m_x86_INCS       = $(VBOX_PYTHON37M_INC)
+VBoxPython3_7m_x86_LIBS       = $(VBOX_PYTHON37M_LIB_X86)
+  endif
+ endif
+endif
+
 ifdef VBOX_PYTHONDEF_INC
 #

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

@@ -17 +17 @@
 from distutils.version import StrictVersion
 
-versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m"]
+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"]
 prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
 known = {}