VirtualBox

Changeset 48282 in vbox for trunk/src/libs


Ignore:
Timestamp:
Sep 4, 2013 11:59:15 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
88697
Message:

32-bit main API on 64-bit solaris.

Location:
trunk/src/libs
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/kStuff/Makefile.kmk

    r42074 r48282  
    7171        iprt/kRdrFile-iprt.cpp
    7272
     73ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
     74 LIBRARIES += VBox-kStuff-x86
     75 VBox-kStuff-x86_TEMPLATE = VBoxR3Dll-x86
     76 VBox-kStuff-x86_EXTENDS = VBox-kStuff
     77endif
    7378
    7479#

  • trunk/src/libs/liblzf-3.4/Makefile.kmk

    r41477 r48282  
    4141VBox-liblzf-static_SOURCES    = $(VBox-liblzf_SOURCES)
    4242
     43ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
     44 LIBRARIES += VBox-liblzf-x86
     45 VBox-liblzf-x86_TEMPLATE = VBoxR3Dll-x86
     46 VBox-liblzf-x86_EXTENDS = VBox-liblzf
     47endif
     48
     49
    4350include $(FILE_KBUILD_SUB_FOOTER)
    4451

  • trunk/src/libs/libxml2-2.6.31/Makefile.kmk

    r46593 r48282  
    8080# VBox-libxml2_SDKS.win      += WINPSDK
    8181
     82ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
     83 LIBRARIES += VBox-libxml2-x86
     84 VBox-libxml2-x86_TEMPLATE = VBoxR3DllNonPedantic-x86
     85 VBox-libxml2-x86_EXTENDS = VBox-libxml2
     86endif
     87
     88
    8289include $(FILE_KBUILD_SUB_FOOTER)
    8390

  • trunk/src/libs/xpcom18a4/Config.kmk

    r48225 r48282  
    2525#
    2626VBOX_PATH_XPCOM_SRC := $(PATH_ROOT)/src/libs/xpcom18a4
     27
    2728
    2829#
    … …  
    259260TEMPLATE_XPCOMOSX107_DEFS.darwin        = $(filter-out $(VBOX_DARWIN_DEF_SDK_DEFS),$(TEMPLATE_XPCOM_DEFS.darwin)) $(VBOX_DARWIN_DEF_SDK_10_7_DEFS)
    260261TEMPLATE_XPCOMOSX107_INCS.darwin        = $(VBOX_PATH_MACOSX_SDK_10_7)/Developer/Headers/FlatCarbon
     262
     263
     264#
     265# Creates a x86 target for an XPCOM target if so desired.
     266# The target is specified as the first argument: $(evalcall VBOX_XPCOM_X86,target).
     267#
     268ifdef VBOX_WITH_32_ON_64_MAIN_API
     269 define VBOX_XPCOM_X86
     270  $(1)-x86_TEMPLATE := $(strip $($(1)_TEMPLATE))-x86
     271  $(1)-x86_EXTENDS  := $(1)
     272 endef
     273else
     274 define VBOX_XPCOM_X86
     275 endef
     276endif
     277
     278# Corresponding 32-bit template(s).
     279TEMPLATE_XPCOM-x86                  = 32-bit XPCOM libraries (shared)
     280TEMPLATE_XPCOM-x86_EXTENDS          = XPCOM
     281TEMPLATE_XPCOM-x86_BLD_TRG_ARCH     = x86
     282TEMPLATE_XPCOM-x86_DEFS             = $(TEMPLATE_XPCOM_DEFS) VBOX_IN_32_ON_64_MAIN_API
     283TEMPLATE_XPCOM-x86_LIBS             = $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86),$(TEMPLATE_XPCOM_LIBS))
    261284
    262285

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

    r48245 r48282  
    7575ifndef VBOX_ONLY_SDK
    7676
    77 LIBRARIES += \
     77VBOX_XPCOM_LIBRARIES := \
    7878        VBox-xpcom-nspr \
    7979        VBox-xpcom-typelib \
    … …  
    8787        VBox-xpcom-xptcall \
    8888        VBox-xpcom-proxy \
     89        VBox-xpcom-ipcshared \
    8990        VBoxXPCOMGlue_s \
    90         $(if $(VBOX_WITH_XPCOM_GLUE_WHICH_IS_UNUSED),VBoxXPCOMGlue,) \
    91         VBox-xpcom-ipcutils \
    92         VBox-xpcom-ipcshared \
    93         VBox-xpcom-ipcdlock \
    94         VBox-xpcom-ipctransmgr \
    95         VBox-xpcom-ipctmgrcom
    96 
    97 DLLS += \
    98         VBoxXPCOM \
     91        $(if $(VBOX_WITH_XPCOM_GLUE_WHICH_IS_UNUSED),VBoxXPCOMGlue,)
     92LIBRARIES += $(VBOX_XPCOM_LIBRARIES)
     93
     94VBOX_XPCOM_DLLS := \
     95    VBoxXPCOM \
    9996        VBoxXPCOMIPCC
     97DLLS += $(VBOX_XPCOM_DLLS)
     98
     99 ifdef VBOX_WITH_32_ON_64_MAIN_API
     100LIBRARIES += $(addsuffix -x86,$(VBOX_XPCOM_LIBRARIES))
     101DLLS      += $(addsuffix -x86,$(VBOX_XPCOM_DLLS))
     102 endif
     103
    100104
    101105 ifdef VBOX_WITH_TESTCASES
    … …  
    676680        $(QUIET)$(APPEND) -t $@ '#define _BUILD_STRING "$(date +%Y-%m-%d %T)"'
    677681
     682$(evalcall2 VBOX_XPCOM_X86,VBox-xpcom-nspr)
     683
    678684
    679685VBox-xpcom-typelib_TEMPLATE = XPCOM
    … …  
    683689        xpcom/typelib/xpt/src/xpt_struct.c \
    684690        xpcom/typelib/xpt/src/xpt_xdr.c
     691$(evalcall VBOX_XPCOM_X86,VBox-xpcom-typelib)
    685692
    686693VBox-xpcom-string_TEMPLATE = XPCOM
    … …  
    698705        xpcom/string/src/nsStringComparator.cpp \
    699706        xpcom/string/src/nsStringObsolete.cpp
     707$(evalcall VBOX_XPCOM_X86,VBox-xpcom-string)
    700708
    701709VBox-xpcom-base_TEMPLATE = XPCOM
    … …  
    713721        xpcom/base/nsTraceRefcntImpl.cpp \
    714722        xpcom/base/nsStackFrameUnix.cpp
     723$(evalcall VBOX_XPCOM_X86,VBox-xpcom-base)
    715724
    716725VBox-xpcom-ds_TEMPLATE = XPCOM
    … …  
    752761        xpcom/ds/nsArrayEnumerator.cpp
    753762#   xpcom/ds/nsHashPropertyBag.cpp
     763$(evalcall VBOX_XPCOM_X86,VBox-xpcom-ds)
    754764
    755765# @todo what about MOZ_USER_DIR?
    … …  
    793803VBox-xpcom-io_SOURCES.os2 = \
    794804        xpcom/io/nsLocalFileOS2.cpp
     805$(evalcall VBOX_XPCOM_X86,VBox-xpcom-io)
    795806
    796807VBox-xpcom-components_TEMPLATE = XPCOM
    … …  
    805816        xpcom/components/xcDll.cpp \
    806817        xpcom/components/nsStaticComponentLoader.cpp
     818$(evalcall VBOX_XPCOM_X86,VBox-xpcom-components)
    807819
    808820VBox-xpcom-threads_TEMPLATE = XPCOM
    … …  
    819831        xpcom/threads/nsProcessCommon.cpp \
    820832        xpcom/threads/TimerThread.cpp
     833$(evalcall VBOX_XPCOM_X86,VBox-xpcom-threads)
    821834
    822835VBox-xpcom-xptinfo_TEMPLATE = XPCOM
    … …  
    833846        xpcom/reflect/xptinfo/src/xptiZipItem.cpp \
    834847        xpcom/reflect/xptinfo/src/xptiZipLoader.cpp
     848$(evalcall VBOX_XPCOM_X86,VBox-xpcom-xptinfo)
    835849
    836850
    … …  
    867881    xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
    868882endif
    869 
    870883xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp_CXXFLAGS = -O0
    871884# -O0 works fine, while -O1 doesn't. The gcc man page can't be listing all the -f*
    … …  
    874887# bug and it's not worth investigating as I'm not the maintainger of the solaris gcc port. [bird, 2007-09-17]
    875888
     889$(evalcall VBOX_XPCOM_X86,VBox-xpcom-xptcall)
     890
    876891
    877892VBox-xpcom-proxy_TEMPLATE = XPCOM
    878893VBox-xpcom-proxy_INSTTYPE = none
    879894VBox-xpcom-proxy_DEFS     = _IMPL_NS_COM EXPORT_XPTC_API EXPORT_XPTI_API
    880 VBox-xpcom-proxy_SOURCES  = xpcom/proxy/src/nsProxyEvent.cpp \
    881                             xpcom/proxy/src/nsProxyEventClass.cpp \
    882                             xpcom/proxy/src/nsProxyEventObject.cpp \
    883                             xpcom/proxy/src/nsProxyObjectManager.cpp \
    884                             xpcom/proxy/src/nsProxyRelease.cpp
     895VBox-xpcom-proxy_SOURCES  = \
     896    xpcom/proxy/src/nsProxyEvent.cpp \
     897    xpcom/proxy/src/nsProxyEventClass.cpp \
     898    xpcom/proxy/src/nsProxyEventObject.cpp \
     899    xpcom/proxy/src/nsProxyObjectManager.cpp \
     900    xpcom/proxy/src/nsProxyRelease.cpp
     901$(evalcall VBOX_XPCOM_X86,VBox-xpcom-proxy)
    885902
    886903
    … …  
    918935VBoxXPCOMGlue_s_DEFS     = _IMPL_NS_COM
    919936VBoxXPCOMGlue_s_SOURCES  = $(VBoxXPCOMGlue_COMMON_SOURCES)
     937$(evalcall VBOX_XPCOM_X86,VBoxXPCOMGlue_s)
    920938
    921939# standalone glue library which all third-party client apps (if any) will
    … …  
    924942VBoxXPCOMGlue_SOURCES  = $(VBoxXPCOMGlue_COMMON_SOURCES)
    925943#VBoxXPCOMGlue_INST     = lib/ $(INST_SDK)lib/
     944$(evalcall VBOX_XPCOM_X86,VBoxXPCOMGlue)
    926945
    927946
    … …  
    10001019VBoxXPCOM_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxXPCOM.dylib
    10011020
     1021#
     1022# The 32-bit VBoxXPCOM Shared Object, assembling all lib files.
     1023#
     1024VBoxXPCOM-x86_TEMPLATE = XPCOM-x86
     1025VBoxXPCOM-x86_EXTENDS = VBoxXPCOM
     1026VBoxXPCOM-x86_NAME = VBoxXPCOM-x86
     1027VBoxXPCOM-x86_LIBS = \
     1028        $(VBox-xpcom-typelib-x86_1_TARGET) \
     1029        $(VBox-xpcom-string-x86_1_TARGET) \
     1030        $(VBox-xpcom-base-x86_1_TARGET) \
     1031        $(VBox-xpcom-ds-x86_1_TARGET) \
     1032        $(VBox-xpcom-io-x86_1_TARGET) \
     1033        $(VBox-xpcom-components-x86_1_TARGET) \
     1034        $(VBox-xpcom-threads-x86_1_TARGET) \
     1035        $(VBox-xpcom-xptinfo-x86_1_TARGET) \
     1036        $(VBox-xpcom-xptcall-x86_1_TARGET) \
     1037        $(VBox-xpcom-proxy-x86_1_TARGET) \
     1038        $(VBox-xpcom-nspr-x86_1_TARGET) \
     1039        $(VBoxXPCOMGlue_s-x86_1_TARGET)
     1040
     1041ifeq ($(filter-out freebsd linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
     1042VBoxXPCOM-x86_LDFLAGS = -Wl,--whole-archive \
     1043        $(VBox-xpcom-typelib-x86_1_TARGET) \
     1044        $(VBox-xpcom-string-x86_1_TARGET) \
     1045        $(VBox-xpcom-base-x86_1_TARGET) \
     1046        $(VBox-xpcom-ds-x86_1_TARGET) \
     1047        $(VBox-xpcom-io-x86_1_TARGET) \
     1048        $(VBox-xpcom-components-x86_1_TARGET) \
     1049        $(VBox-xpcom-threads-x86_1_TARGET) \
     1050        $(VBox-xpcom-xptinfo-x86_1_TARGET) \
     1051        $(VBox-xpcom-xptcall-x86_1_TARGET) \
     1052        $(VBox-xpcom-proxy-x86_1_TARGET) \
     1053        $(VBox-xpcom-nspr-x86_1_TARGET) \
     1054        $(VBoxXPCOMGlue_s-x86_1_TARGET) \
     1055        -Wl,--no-whole-archive
     1056endif
     1057
     1058VBoxXPCOM-x86_LDFLAGS.solaris += -Wl,-z,allextract \
     1059        $(VBox-xpcom-typelib-x86_1_TARGET) \
     1060        $(VBox-xpcom-string-x86_1_TARGET) \
     1061        $(VBox-xpcom-base-x86_1_TARGET) \
     1062        $(VBox-xpcom-ds-x86_1_TARGET) \
     1063        $(VBox-xpcom-io-x86_1_TARGET) \
     1064        $(VBox-xpcom-components-x86_1_TARGET) \
     1065        $(VBox-xpcom-threads-x86_1_TARGET) \
     1066        $(VBox-xpcom-xptinfo-x86_1_TARGET) \
     1067        $(VBox-xpcom-xptcall-x86_1_TARGET) \
     1068        $(VBox-xpcom-proxy-x86_1_TARGET) \
     1069        $(VBox-xpcom-nspr-x86_1_TARGET) \
     1070        $(VBoxXPCOMGlue_s-x86_1_TARGET) \
     1071        -Wl,-z,defaultextract
     1072
     1073
     1074#
     1075# IPC templates.
     1076#
    10021077ifdef VBOX_IPC_RELEASE_LOG
    10031078IPC_LOGGING = 1
    … …  
    10141089 TEMPLATE_XPCOMIPC_DEFS           += IPC_LOGGING
    10151090endif
    1016 
    10171091TEMPLATE_XPCOMIPC_LIBS             = $(VBoxXPCOM_1_TARGET) $(TEMPLATE_XPCOM_LIBS)
     1092ifneq ($(KBUILD_TARGET),win)
     1093 ifeq ($(filter-out solaris.x86 %.amd64 %.sparc32 %.sparc64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) ## TODO: cleanup!
     1094  if defined(VBOX_WITH_RELATIVE_RUNPATH) && !defined(VBOX_WITH_HARDENING)
     1095   TEMPLATE_XPCOMIPC_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_XPCOM_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'
     1096  endif
     1097 else ifndef VBOX_WITH_HARDENING
     1098  ifdef VBOX_WITH_RELATIVE_RUNPATH
     1099   TEMPLATE_XPCOMIPC_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_XPCOM_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'
     1100  endif
     1101 endif
     1102endif
     1103
     1104TEMPLATE_XPCOMIPC-x86              = 32-bit XPCOM IPC libraries
     1105TEMPLATE_XPCOMIPC-x86_EXTENDS      = XPCOMIPC
     1106TEMPLATE_XPCOMIPC-x86_BLD_TRG_ARCH = x86
     1107TEMPLATE_XPCOMIPC-x86_LIBS         = $(VBoxXPCOM-x86_1_TARGET) $(TEMPLATE_XPCOM-x86_LIBS)
     1108
    10181109
    10191110TEMPLATE_XPCOMIPCEXE               = XPCOM IPC executables
    … …  
    10241115endif
    10251116
    1026 VBox-xpcom-ipcutils_TEMPLATE = XPCOMIPC
    1027 VBox-xpcom-ipcutils_INSTTYPE = none
    1028 VBox-xpcom-ipcutils_SOURCES = \
    1029         ipc/ipcd/util/src/ipcMessageReader.cpp \
    1030         ipc/ipcd/util/src/ipcMessageWriter.cpp
    1031 
     1117#
     1118# Shared IPC code. Used by the IPC component as well as the executables.
     1119#
    10321120VBox-xpcom-ipcshared_TEMPLATE = XPCOMIPC
    10331121VBox-xpcom-ipcshared_INSTTYPE = none
    … …  
    10401128        ipc/ipcd/shared/src/ipcIDList.cpp \
    10411129        ipc/ipcd/shared/src/ipcm.cpp
    1042 
    1043 VBox-xpcom-ipcdlock_TEMPLATE = XPCOMIPC
    1044 VBox-xpcom-ipcdlock_INSTTYPE = none
    1045 VBox-xpcom-ipcdlock_SOURCES = \
    1046         ipc/ipcd/extensions/lock/src/ipcLockProtocol.cpp \
    1047         ipc/ipcd/extensions/lock/src/ipcLockService.cpp
    1048 
    1049 VBox-xpcom-ipctransmgr_TEMPLATE = XPCOMIPC
    1050 VBox-xpcom-ipctransmgr_INSTTYPE = none
    1051 VBox-xpcom-ipctransmgr_SOURCES = \
    1052         ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp
    1053 
    1054 VBox-xpcom-ipctmgrcom_TEMPLATE = XPCOMIPC
    1055 VBox-xpcom-ipctmgrcom_INSTTYPE = none
    1056 VBox-xpcom-ipctmgrcom_SOURCES = \
    1057         ipc/ipcd/extensions/transmngr/common/tmTransaction.cpp \
    1058         ipc/ipcd/extensions/transmngr/common/tmVector.cpp
     1130$(evalcall VBOX_XPCOM_X86,VBox-xpcom-ipcshared)
    10591131
    10601132
    … …  
    10701142        ipc/ipcd/client/src/ipcService.cpp \
    10711143        ipc/ipcd/client/src/ipcModuleFactory.cpp \
    1072         ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
     1144        ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp\
     1145    \
     1146        ipc/ipcd/util/src/ipcMessageReader.cpp \
     1147        ipc/ipcd/util/src/ipcMessageWriter.cpp \
     1148    \
     1149        ipc/ipcd/extensions/lock/src/ipcLockProtocol.cpp \
     1150        ipc/ipcd/extensions/lock/src/ipcLockService.cpp \
     1151    \
     1152        ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp \
     1153    \
     1154        ipc/ipcd/extensions/transmngr/common/tmTransaction.cpp \
     1155        ipc/ipcd/extensions/transmngr/common/tmVector.cpp
     1156
    10731157ifeq ($(KBUILD_TARGET),win)
    10741158VBoxXPCOMIPCC_SOURCES += \
    … …  
    10801164VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxXPCOMIPCC.dylib
    10811165VBoxXPCOMIPCC_LIBS = \
    1082         $(VBox-xpcom-ipcutils_1_TARGET) \
    1083         $(VBox-xpcom-ipcshared_1_TARGET) \
    1084         $(VBox-xpcom-ipcdlock_1_TARGET) \
    1085         $(VBox-xpcom-ipctransmgr_1_TARGET) \
    1086         $(VBox-xpcom-ipctmgrcom_1_TARGET)
    1087 # EF
    1088 #VBoxXPCOMIPCC_LIBS += $(LIB_RUNTIME)
     1166        $(VBox-xpcom-ipcshared_1_TARGET)
     1167
     1168# 32-bit version of the component.
     1169$(evalcall VBOX_XPCOM_X86,VBoxXPCOMIPCC)
     1170VBoxXPCOMIPCC-x86_LIBS = \
     1171        $(VBox-xpcom-ipcshared-x86_1_TARGET)
    10891172
    10901173

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

    r41477 r48282  
    2727#
    2828# List of supported Python versions, defining a number of
    29 # VBOX_PYTHON[25|26|27|28|DEF]_[INC|LIB] variables which get picked up below.
     29# VBOX_PYTHON[25|26|27|DEF]_[INC|LIB] variables which get picked up below.
    3030#
    3131ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
    … …  
    3333  VBOX_PYTHON25_INC = $(VBOX_PATH_MACOSX_SDK)/usr/include/python2.5
    3434  VBOX_PYTHON25_LIB = $(VBOX_PATH_MACOSX_SDK)/usr/lib/libpython2.5.dylib
     35  VBOX_PYTHON25_LIB_X86 = $(VBOX_PYTHON25_LIB)
    3536 endif
    3637 if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_6) \
    … …  
    3940  VBOX_PYTHON26_INC = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/include/python2.6
    4041  VBOX_PYTHON26_LIB = $(VBOX_PATH_MACOSX_SDK_10_6)/usr/lib/libpython2.6.dylib
     42  VBOX_PYTHON26_LIB_X86 = $(VBOX_PYTHON26_LIB)
    4143 endif
    4244 if  !defined(VBOX_WITHOUT_VBOXPYTHON_FOR_OSX_10_7) \
    … …  
    4547  VBOX_PYTHON27_INC = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/include/python2.7
    4648  VBOX_PYTHON27_LIB = $(VBOX_PATH_MACOSX_SDK_10_7)/usr/lib/libpython2.7.dylib
     49  VBOX_PYTHON27_LIB_X86 = $(VBOX_PYTHON27_LIB)
    4750 endif
    4851
    … …  
    103106        $(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
    104107
     108# 32-bit base.
     109VBoxPythonBase_x86_TEMPLATE = XPCOM-x86
     110VBoxPythonBase_x86_EXTENDS  = VBoxPythonBase
     111VBoxPythonBase_x86_DEFS     = MODULE_NAME_SUFFIX=_x86 $(VBoxPythonBase_DEFS)
     112VBoxPythonBase_x86_LIBS     = \
     113        $(PATH_STAGE_LIB)/VBoxCOM-x86$(VBOX_SUFF_LIB) \
     114        $(PATH_STAGE_BIN)/VBoxXPCOM-x86$(VBOX_SUFF_DLL)
     115
    105116
    106117ifdef VBOX_PYTHON23_INC
    … …  
    114125VBoxPython2_3_INCS       = $(VBOX_PYTHON23_INC)
    115126VBoxPython2_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
    116136endif
    117137
    … …  
    125145VBoxPython2_4_INCS       = $(VBOX_PYTHON24_INC)
    126146VBoxPython2_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
    127155endif
    128156
    … …  
    134162VBoxPython2_5_EXTENDS    = VBoxPythonBase
    135163VBoxPython2_5_EXTENDS_BY = appending
    136 VBoxPython2_5_TEMPLATE   = XPCOM
    137164VBoxPython2_5_INCS       = $(VBOX_PYTHON25_INC)
    138165VBoxPython2_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
    139174endif
    140175
    … …  
    149184VBoxPython2_6_INCS       = $(VBOX_PYTHON26_INC)
    150185VBoxPython2_6_LIBS       = $(VBOX_PYTHON26_LIB)
     186
     187 ifdef VBOX_WITH_32_ON_64_MAIN_API
     188DLLS += VBoxPython2_6_x86
     189VBoxPython2_6_x86_EXTENDS    = VBoxPythonBase_x86
     190VBoxPython2_6_x86_EXTENDS_BY = appending
     191VBoxPython2_6_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX106,-x86)
     192VBoxPython2_6_x86_INCS       = $(VBOX_PYTHON26_INC)
     193VBoxPython2_6_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)
     194 endif
    151195endif
    152196
    … …  
    160204VBoxPython2_7_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX107,)
    161205VBoxPython2_7_INCS       = $(VBOX_PYTHON27_INC)
    162 VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB)
    163 endif
    164 
    165 ifdef VBOX_PYTHON28_INC
    166 #
    167 # Python 2.8 version
    168 #
    169 DLLS += VBoxPython2_8
    170 VBoxPython2_8_EXTENDS    = VBoxPythonBase
    171 VBoxPython2_8_EXTENDS_BY = appending
    172 VBoxPython2_8_INCS       = $(VBOX_PYTHON28_INC)
    173 VBoxPython2_8_LIBS       = $(VBOX_PYTHON28_LIB)
     206VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB_X86)
     207
     208 ifdef VBOX_WITH_32_ON_64_MAIN_API
     209DLLS += VBoxPython2_7_x86
     210VBoxPython2_7_x86_EXTENDS    = VBoxPythonBase_x86
     211VBoxPython2_7_x86_EXTENDS_BY = appending
     212VBoxPython2_7_x86_TEMPLATE   = XPCOM$(if-expr "$(KBUILD_TARGET)" == "darwin",OSX107,-x86)
     213VBoxPython2_7_x86_INCS       = $(VBOX_PYTHON27_INC)
     214VBoxPython2_7_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)
     215 endif
    174216endif
    175217
    … …  
    187229 VBoxPython_LIBS        = $(VBoxPythonBase_LIBS) $(VBOX_PYTHONDEF_LIB)
    188230endif
     231
     232 ifdef VBOX_WITH_32_ON_64_MAIN_API
     233VBoxPython_x86_EXTENDS      = VBoxPythonBase_x86
     234VBoxPython_x86_DEFS         = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_x86_DEFS))
     235VBoxPython_x86_INCS         = $(VBoxPythonBase_x86_INCS) $(VBOX_PYTHONDEF_INC)
     236if "$(KBUILD_TARGET)" == "linux"
     237 VBoxPython_x86_LIBS        = $(VBoxPythonBase_x86_LIBS)
     238else
     239 VBoxPython_x86_LIBS        = $(VBoxPythonBase_x86_LIBS) $(VBOX_PYTHONDEF_LIB_X86)
     240endif
     241 endif
    189242endif
    190243

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

    r46230 r48282  
    1515import os,sys
    1616
    17 versions = ["2.3", "2.4", "2.5", "2.6", "2.7", "2.8"]
     17versions = ["2.3", "2.4", "2.5", "2.6", "2.7",]
    1818prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
    1919known = {}
    … …  
    4444    if bitness_magic > 0:
    4545        print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[2], sep)
     46        print "VBOX_PYTHON%s_LIB_X86=%s%s" %(vers, known[1], sep)
    4647    else:
    4748        print "VBOX_PYTHON%s_LIB=%s%s" %(vers, known[1], sep)

  • trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp

    r46649 r48282  
    7575
    7676#ifdef VBOX_PYXPCOM
     77# include <iprt/cdefs.h>
     78# ifndef MODULE_NAME_SUFFIX
     79#  define MANGLE_MODULE_NAME(a_szName)  a_szName
     80#  define MANGLE_MODULE_INIT(a_Name)    a_Name
     81# else
     82#  define MANGLE_MODULE_NAME(a_szName)  a_szName RT_XSTR(MODULE_NAME_SUFFIX)
     83#  define MANGLE_MODULE_INIT(a_Name)    RT_CONCAT(a_Name, MODULE_NAME_SUFFIX)
     84# endif
    7785# ifdef VBOX_PYXPCOM_VERSIONED
    7886#  if   PY_VERSION_HEX >= 0x02080000
    79 #   define MODULE_NAME "VBoxPython2_8"
     87#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_8")
     88#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_8)
     89
    8090#  elif PY_VERSION_HEX >= 0x02070000
    81 #   define MODULE_NAME "VBoxPython2_7"
     91#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_7")
     92#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_7)
     93
    8294#  elif PY_VERSION_HEX >= 0x02060000
    83 #   define MODULE_NAME "VBoxPython2_6"
     95#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_6")
     96#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_6)
     97
    8498#  elif PY_VERSION_HEX >= 0x02050000
    85 #   define MODULE_NAME "VBoxPython2_5"
     99#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_5")
     100#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_5)
     101
    86102#  elif PY_VERSION_HEX >= 0x02040000
    87 #   define MODULE_NAME "VBoxPython2_4"
     103#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_4")
     104#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_4)
     105
    88106#  elif PY_VERSION_HEX >= 0x02030000
    89 #   define MODULE_NAME "VBoxPython2_3"
     107#   define MODULE_NAME    MANGLE_MODULE_NAME("VBoxPython2_3")
     108#   define initVBoxPython MANGLE_MODULE_INIT(initVBoxPython2_3)
    90109#  else
    91110#   error "Fix module versioning."
    92111#  endif
    93112# else
    94 #  define MODULE_NAME "VBoxPython"
     113#  define MODULE_NAME     MANGLE_MODULE_NAME("VBoxPython")
     114#  define initVBoxPython  MANGLE_MODULE_INIT(initVBoxPython)
    95115# endif
    96116#else
    … …  
    777797extern "C" NS_EXPORT
    778798void
    779 # ifdef VBOX_PYXPCOM_VERSIONED
    780 #  if   PY_VERSION_HEX >= 0x02080000
    781 initVBoxPython2_8() {
    782 #  elif PY_VERSION_HEX >= 0x02070000
    783 initVBoxPython2_7() {
    784 #  elif PY_VERSION_HEX >= 0x02060000
    785 initVBoxPython2_6() {
    786 #  elif PY_VERSION_HEX >= 0x02050000
    787 initVBoxPython2_5() {
    788 #  elif PY_VERSION_HEX >= 0x02040000
    789 initVBoxPython2_4() {
    790 #  elif PY_VERSION_HEX >= 0x02030000
    791 initVBoxPython2_3() {
    792 #  else
    793 #   error "Fix module versioning."
    794 #  endif
    795 # else
    796 initVBoxPython() {
    797 # endif
     799initVBoxPython() { /* NOTE! This name is redefined at the top of the file! */
    798800  static bool s_vboxInited = false;
    799801  if (!s_vboxInited) {

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

    r44529 r48282  
    1515import platform
    1616
    17 # this code overcomes somewhat unlucky feature of Python, where it searches
     17#
     18# This code overcomes somewhat unlucky feature of Python, where it searches
    1819# for binaries in the same place as platfom independent modules, while
    1920# rest of Python bindings expect _xpcom to be inside xpcom module
     21#
    2022
    21 candidates = ['VBoxPython' + str(sys.version_info[0]) + '_' + str(sys.version_info[1]),
    22               'VBoxPython' + str(sys.version_info[0]),
    23               'VBoxPython']
     23_asVBoxPythons = [
     24    'VBoxPython' + str(sys.version_info[0]) + '_' + str(sys.version_info[1]),
     25    'VBoxPython' + str(sys.version_info[0]),
     26    'VBoxPython'
     27];
     28
     29# On platforms where we ship both 32-bit and 64-bit API bindings, we have to
     30# look for the right set if we're a 32-bit process.
     31if platform.system() in [ 'SunOS', ] and sys.maxsize <= 2**32:
     32    _asNew = [ sCandidate + '_x86' for sCandidate in _asVBoxPythons ];
     33    _asNew.extend(_asVBoxPythons);
     34    _asVBoxPythons = _asNew;
     35    del _asNew;
     36
     37# On Darwin (aka Mac OS X) we know exactly where things are in a normal
     38# VirtualBox installation.
     39## @todo Edit this at build time to the actual VBox location set in the make files.
     40## @todo We know the location for most hardened builds, not just darwin!
    2441if platform.system() == 'Darwin':
    25     # On Darwin (aka Mac OS X) we know exactly where things are in a normal
    26     # VirtualBox installation. Also, there are two versions of python there
    27     # (2.3.x and 2.5.x) depending on whether the os is striped or spotty, so
    28     # we have to choose the right module to load.
    29     #
    30     # XXX: This needs to be adjusted for OSE builds. A more general solution would
    31     #      be to to sed the file during install and inject the VBOX_PATH_APP_PRIVATE_ARCH
    32     #      and VBOX_PATH_SHARED_LIBS when these are set.
    3342    sys.path.append('/Applications/VirtualBox.app/Contents/MacOS')
    3443
    35 cglue = None
    36 for m in candidates:
    37    try:
    38       cglue =  __import__(m)
    39       break
    40    except:
    41       pass
     44_oVBoxPythonMod = None
     45for m in _asVBoxPythons:
     46    try:
     47        _oVBoxPythonMod =  __import__(m)
     48        break
     49    except Exception, x:
     50        print 'm=%s x=%s' % (m, x);
     51    #except:
     52    #    pass
    4253
    4354if platform.system() == 'Darwin':
    4455    sys.path.remove('/Applications/VirtualBox.app/Contents/MacOS')
    4556
    46 if cglue == None:
    47     raise Exception, "Cannot find VBoxPython module"
     57if _oVBoxPythonMod == None:
     58    raise Exception('Cannot find VBoxPython module (tried: %s)' % (', '.join(_asVBoxPythons),));
    4859
    49 sys.modules['xpcom._xpcom'] = cglue
    50 xpcom._xpcom = cglue
     60sys.modules['xpcom._xpcom'] = _oVBoxPythonMod;
     61xpcom._xpcom = _oVBoxPythonMod;
    5162

  • trunk/src/libs/xpcom18a4/xpcom/components/nsNativeComponentLoader.cpp

    r38276 r48282  
    675675    *registered = PR_FALSE;
    676676
     677#ifndef VBOX
    677678    /* this should be a pref or registry entry, or something */
    678679    static const char *ValidDllExtensions[] = {
    … …  
    749750        // Skip invalid extensions
    750751        return NS_OK;
     752
     753#else /* VBOX */
     754    /* VBox: Only one valid suffix exist, so dispense with the the list. */
     755# ifdef RT_OS_DARWIN
     756#  ifdef VBOX_IN_32_ON_64_MAIN_API
     757    static const char s_szSuff[]        = "-x86.dylib";
     758#  else
     759    static const char s_szSuff[]        = ".dylib";
     760    static const char s_szSuffInvalid[] = "-x86.dylib";
     761#  endif
     762# elif defined(RT_OS_OS2) || defined(RT_OS_WINDOWS)
     763#  ifdef VBOX_IN_32_ON_64_MAIN_API
     764    static const char s_szSuff[]        = "-x86.dll";
     765#else
     766    static const char s_szSuff[]        = ".dll";
     767    static const char s_szSuffInvalid[] = "-x86.dll";
     768#  endif
     769# else
     770#  ifdef VBOX_IN_32_ON_64_MAIN_API
     771    static const char s_szSuff[]        = "-x86.so";
     772#else
     773    static const char s_szSuff[]        = ".so";
     774    static const char s_szSuffInvalid[] = "-x86.so";
     775#  endif
     776# endif
     777
     778    nsCAutoString strLeafName;
     779    rv = component->GetNativeLeafName(strLeafName);
     780    if (NS_FAILED(rv))
     781        return rv;
     782    size_t cchLeafName = strLeafName.Length();
     783    if (   cchLeafName <= sizeof(s_szSuff)
     784        || PL_strcasecmp(strLeafName.get() + cchLeafName - sizeof(s_szSuff) + 1, s_szSuff))
     785    {
     786        PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG, ("Skipping '%s'...", strLeafName.get()));
     787        return NS_OK; /* skip */
     788    }
     789# ifndef VBOX_IN_32_ON_64_MAIN_API
     790    if (   cchLeafName >= sizeof(s_szSuffInvalid)
     791        && !PL_strcasecmp(strLeafName.get() + cchLeafName - sizeof(s_szSuffInvalid) + 1, s_szSuffInvalid))
     792    {
     793        PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG, ("Skipping '%s' (#2)...", strLeafName.get()));
     794        return NS_OK; /* skip */
     795    }
     796# endif
     797    PR_LOG(nsComponentManagerLog, PR_LOG_DEBUG, ("... '%s'", strLeafName.get()));
     798#endif /* VBOX */
    751799
    752800    nsXPIDLCString persistentDescriptor;

  • trunk/src/libs/zlib-1.2.6/Makefile.kmk

    r41477 r48282  
    4747VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
    4848
     49ifdef VBOX_WITH_32_ON_64_MAIN_API # 32-bit edition.
     50 LIBRARIES += VBox-zlib-x86
     51 VBox-zlib-x86_TEMPLATE = VBoxR3Dll-x86
     52 VBox-zlib-x86_EXTENDS = VBox-zlib
     53endif
     54
    4955include $(FILE_KBUILD_SUB_FOOTER)
    5056
Note: See TracChangeset for help on using the changeset viewer.

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