VirtualBox

儲存庫 vbox 的更動 59800


忽略:
時間撮記:
2016-2-24 下午02:42:07 (9 年 以前)
作者:
vboxsync
訊息:

addendum to r105679: don't apply the xpcom/python Makefile.kmk and gen_python_deps changes

位置:
trunk
檔案:
修改 3 筆資料

圖例:

未更動
新增
刪除

  • trunk/Config.kmk

    r59798 r59800  
    64746474        $(MAKE) VBOX_QUICK=1
    64756475
    6476 

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

    r59798 r59800  
    55
    66#
    7 # Copyright (C) 2009-2016 Oracle Corporation
     7# Copyright (C) 2009-2015 Oracle Corporation
    88#
    99# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2727#
    2828# List of supported Python versions, defining a number of
    29 # VBOX_PYTHON[26|27|31|32|33|34|35|DEF]_[INC|LIB] variables
    30 # which get picked up below.
     29# VBOX_PYTHON[25|26|27|DEF]_[INC|LIB] variables which get picked up below.
    3130#
    3231ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
     32 ifeq ($(KBUILD_TARGET_ARCH),x86)
     33  VBOX_PYTHON25_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.5
     34  VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
     35  VBOX_PYTHON25_LIB_X86 = $(VBOX_PYTHON25_LIB)
     36 endif
    3337 if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
    3438  && (   !defined(VBOX_OSE) \
    … …  
    4549  VBOX_PYTHON27_LIB_X86 = $(VBOX_PYTHON27_LIB)
    4650 endif
    47  # No Python 3.x yet as part of OSX versions including El Capitan, 10.11.
    4851
    4952else
    … …  
    112115
    113116
     117ifdef VBOX_PYTHON23_INC
     118#
     119# Python 2.3 version
     120#
     121DLLS += VBoxPython2_3
     122VBoxPython2_3_EXTENDS    = VBoxPythonBase
     123VBoxPython2_3_EXTENDS_BY = appending
     124VBoxPython2_3_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX104,)
     125VBoxPython2_3_INCS       = $(VBOX_PYTHON23_INC)
     126VBoxPython2_3_LIBS       = $(VBOX_PYTHON23_LIB)
     127
     128 ifdef VBOX_WITH_32_ON_64_MAIN_API
     129DLLS += VBoxPython2_3_x86
     130VBoxPython2_3_x86_EXTENDS    = VBoxPythonBase_x86
     131VBoxPython2_3_x86_EXTENDS_BY = appending
     132VBoxPython2_3_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX104,-x86)
     133VBoxPython2_3_x86_INCS       = $(VBOX_PYTHON23_INC)
     134VBoxPython2_3_x86_LIBS       = $(VBOX_PYTHON23_LIB_X86)
     135 endif
     136endif
     137
     138ifdef VBOX_PYTHON24_INC
     139#
     140# Python 2.4 version
     141#
     142DLLS += VBoxPython2_4
     143VBoxPython2_4_EXTENDS    = VBoxPythonBase
     144VBoxPython2_4_EXTENDS_BY = appending
     145VBoxPython2_4_INCS       = $(VBOX_PYTHON24_INC)
     146VBoxPython2_4_LIBS       = $(VBOX_PYTHON24_LIB)
     147
     148 ifdef VBOX_WITH_32_ON_64_MAIN_API
     149DLLS += VBoxPython2_4_x86
     150VBoxPython2_4_x86_EXTENDS    = VBoxPythonBase_x86
     151VBoxPython2_4_x86_EXTENDS_BY = appending
     152VBoxPython2_4_x86_INCS       = $(VBOX_PYTHON24_INC)
     153VBoxPython2_4_x86_LIBS       = $(VBOX_PYTHON24_LIB_X86)
     154 endif
     155endif
     156
     157ifdef VBOX_PYTHON25_INC
     158#
     159# Python 2.5 version
     160#
     161DLLS += VBoxPython2_5
     162VBoxPython2_5_EXTENDS    = VBoxPythonBase
     163VBoxPython2_5_EXTENDS_BY = appending
     164VBoxPython2_5_INCS       = $(VBOX_PYTHON25_INC)
     165VBoxPython2_5_LIBS       = $(VBOX_PYTHON25_LIB)
     166
     167 ifdef VBOX_WITH_32_ON_64_MAIN_API
     168DLLS += VBoxPython2_5_x86
     169VBoxPython2_5_x86_EXTENDS    = VBoxPythonBase_x86
     170VBoxPython2_5_x86_EXTENDS_BY = appending
     171VBoxPython2_5_x86_INCS       = $(VBOX_PYTHON25_INC)
     172VBoxPython2_5_x86_LIBS       = $(VBOX_PYTHON25_LIB_X86)
     173 endif
     174endif
     175
    114176ifdef VBOX_PYTHON26_INC
    115177#
    … …  
    151213VBoxPython2_7_x86_INCS       = $(VBOX_PYTHON27_INC)
    152214VBoxPython2_7_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)
    153  endif
    154 endif
    155 
    156 ifdef VBOX_PYTHON31_INC
    157 #
    158 # Python 3.1 version
    159 #
    160 DLLS += VBoxPython3_1
    161 VBoxPython3_1_EXTENDS    = VBoxPythonBase
    162 VBoxPython3_1_EXTENDS_BY = appending
    163 VBoxPython3_1_TEMPLATE   = XPCOM
    164 VBoxPython3_1_INCS       = $(VBOX_PYTHON31_INC)
    165 VBoxPython3_1_LIBS       = $(VBOX_PYTHON31_LIB)
    166 
    167  ifdef VBOX_WITH_32_ON_64_MAIN_API
    168 DLLS += VBoxPython3_1_x86
    169 VBoxPython3_1_x86_EXTENDS    = VBoxPythonBase_x86
    170 VBoxPython3_1_x86_EXTENDS_BY = appending
    171 VBoxPython3_1_x86_TEMPLATE   = XPCOM
    172 VBoxPython3_1_x86_INCS       = $(VBOX_PYTHON31_INC)
    173 VBoxPython3_1_x86_LIBS       = $(VBOX_PYTHON31_LIB_X86)
    174  endif
    175 endif
    176 
    177 ifdef VBOX_PYTHON32_INC
    178 #
    179 # Python 3.2 version
    180 #
    181 DLLS += VBoxPython3_2
    182 VBoxPython3_2_EXTENDS    = VBoxPythonBase
    183 VBoxPython3_2_EXTENDS_BY = appending
    184 VBoxPython3_2_TEMPLATE   = XPCOM
    185 VBoxPython3_2_INCS       = $(VBOX_PYTHON32_INC)
    186 VBoxPython3_2_LIBS       = $(VBOX_PYTHON32_LIB)
    187 
    188  ifdef VBOX_WITH_32_ON_64_MAIN_API
    189 DLLS += VBoxPython3_2_x86
    190 VBoxPython3_2_x86_EXTENDS    = VBoxPythonBase_x86
    191 VBoxPython3_2_x86_EXTENDS_BY = appending
    192 VBoxPython3_2_x86_TEMPLATE   = XPCOM
    193 VBoxPython3_2_x86_INCS       = $(VBOX_PYTHON32_INC)
    194 VBoxPython3_2_x86_LIBS       = $(VBOX_PYTHON32_LIB_X86)
    195  endif
    196 endif
    197 
    198 ifdef VBOX_PYTHON33_INC
    199 #
    200 # Python 3.3 version
    201 #
    202 DLLS += VBoxPython3_3
    203 VBoxPython3_3_EXTENDS    = VBoxPythonBase
    204 VBoxPython3_3_EXTENDS_BY = appending
    205 VBoxPython3_3_TEMPLATE   = XPCOM
    206 VBoxPython3_3_INCS       = $(VBOX_PYTHON33_INC)
    207 VBoxPython3_3_LIBS       = $(VBOX_PYTHON33_LIB)
    208 
    209  ifdef VBOX_WITH_32_ON_64_MAIN_API
    210 DLLS += VBoxPython3_3_x86
    211 VBoxPython3_3_x86_EXTENDS    = VBoxPythonBase_x86
    212 VBoxPython3_3_x86_EXTENDS_BY = appending
    213 VBoxPython3_3_x86_TEMPLATE   = XPCOM
    214 VBoxPython3_3_x86_INCS       = $(VBOX_PYTHON33_INC)
    215 VBoxPython3_3_x86_LIBS       = $(VBOX_PYTHON33_LIB_X86)
    216  endif
    217 endif
    218 
    219 ifdef VBOX_PYTHON34_INC
    220 #
    221 # Python 3.4 version
    222 #
    223 DLLS += VBoxPython3_4
    224 VBoxPython3_4_EXTENDS    = VBoxPythonBase
    225 VBoxPython3_4_EXTENDS_BY = appending
    226 VBoxPython3_4_TEMPLATE   = XPCOM
    227 VBoxPython3_4_INCS       = $(VBOX_PYTHON34_INC)
    228 VBoxPython3_4_LIBS       = $(VBOX_PYTHON34_LIB)
    229 
    230  ifdef VBOX_WITH_32_ON_64_MAIN_API
    231 DLLS += VBoxPython3_4_x86
    232 VBoxPython3_4_x86_EXTENDS    = VBoxPythonBase_x86
    233 VBoxPython3_4_x86_EXTENDS_BY = appending
    234 VBoxPython3_4_x86_TEMPLATE   = XPCOM
    235 VBoxPython3_4_x86_INCS       = $(VBOX_PYTHON34_INC)
    236 VBoxPython3_4_x86_LIBS       = $(VBOX_PYTHON34_LIB_X86)
    237  endif
    238 endif
    239 
    240 ifdef VBOX_PYTHON35_INC
    241 #
    242 # Python 3.5 version
    243 #
    244 DLLS += VBoxPython3_5
    245 VBoxPython3_5_EXTENDS    = VBoxPythonBase
    246 VBoxPython3_5_EXTENDS_BY = appending
    247 VBoxPython3_5_TEMPLATE   = XPCOM
    248 VBoxPython3_5_INCS       = $(VBOX_PYTHON35_INC)
    249 VBoxPython3_5_LIBS       = $(VBOX_PYTHON35_LIB)
    250 
    251  ifdef VBOX_WITH_32_ON_64_MAIN_API
    252 DLLS += VBoxPython3_5_x86
    253 VBoxPython3_5_x86_EXTENDS    = VBoxPythonBase_x86
    254 VBoxPython3_5_x86_EXTENDS_BY = appending
    255 VBoxPython3_5_x86_TEMPLATE   = XPCOM
    256 VBoxPython3_5_x86_INCS       = $(VBOX_PYTHON35_INC)
    257 VBoxPython3_5_x86_LIBS       = $(VBOX_PYTHON35_LIB_X86)
    258215 endif
    259216endif

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

    r59798 r59800  
    22
    33"""
    4 Copyright (C) 2009-2016 Oracle Corporation
     4Copyright (C) 2009-2013 Oracle Corporation
    55
    66This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1414
    1515import os,sys
    16 from distutils.version import StrictVersion
    1716
    18 versions = ["2.6", "2.7", "3.1", "3.2", "3.3", "3.4", "3.5"]
     17versions = ["2.3", "2.4", "2.5", "2.6", "2.7",]
    1918prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
    2019known = {}
    … …  
    4241
    4342def print_vars(vers, known, sep, bitness_magic):
    44     print("VBOX_PYTHON%s_INC=%s%s" %(vers, known[0], sep))
     43    print "VBOX_PYTHON%s_INC=%s%s" %(vers, known[0], sep)
    4544    if bitness_magic > 0:
    46         print("VBOX_PYTHON%s_LIB=%s%s" %(vers, known[2], sep))
    47         print("VBOX_PYTHON%s_LIB_X86=%s%s" %(vers, known[1], sep))
     45        print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[2], sep)
     46        print "VBOX_PYTHON%s_LIB_X86=%s%s" %(vers, known[1], sep)
    4847    else:
    49         print("VBOX_PYTHON%s_LIB=%s%s" %(vers, known[1], sep))
     48        print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[1], sep)
    5049
    5150
    … …  
    9291
    9392    for v in versions:
    94         if StrictVersion(v) < StrictVersion('2.6'):
    95             continue
    9693        for p in prefixes:
    9794            c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
    … …  
    9996                known[v] = c
    10097                break
    101     keys = list(known.keys())
     98    keys = known.keys()
    10299    # we want default to be the lowest versioned Python
    103100    keys.sort()
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette