儲存庫 vbox 的更動 34662

時間撮記:

2010-12-2 下午09:51:17 (14 年 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

68464

訊息:

Hacking in progress, enclosed in VBOX_ONLY_EXTPACKS_USE_IMPLIBS ifdefs for now.

位置:

trunk

檔案:

• Config.kmk (修改) (3 筆差異)
• src/Makefile.kmk (修改) (1 筆差異)
• src/VBox/Makefile.kmk (修改) (1 筆差異)
• src/VBox/Runtime/Makefile.kmk (修改) (3 筆差異)
• src/VBox/Runtime/VBox/VBoxRTImp.def (新增)
• src/VBox/VMM/Makefile.kmk (修改) (2 筆差異)
• src/VBox/VMM/VMMR3 (新增)
• src/VBox/VMM/VMMR3/VMMR3.def (新增)
• src/bldprogs/deftoimp.sed (複製) (複製 從 trunk/src/recompiler/Sun/deftoimp.sed ) (3 筆差異)
• src/libs/Makefile.kmk (修改) (1 筆差異)

trunk/Config.kmk

@@ -2025 +2025 @@
 
 #
-# Edit macros.
+# Misc macros.
 #
 
@@ -2063 +2063 @@
         $(QUIET)$(call VBOX_EDIT_VERSION_CMD_FN,$<,$@)
 endef
+
+
+##
+# Fill in am import library target based on a somewhat special windows .def file.
+#
+# @param    1   The target name of the import library.
+# @param    2   The name of the real library.
+# @param    3   The .def file path relative to the current make file.
+#
+VBOX_GENERATE_IMPORT_TARGET_FN = $(eval $(VBOX_GENERATE_IMPORT_TARGET_DEF))
+define VBOX_GENERATE_IMPORT_TARGET_DEF
+$(1)_INST     = $(INST_LIB)
+if $(KBUILD_TARGET) == "darwin"
+ $(1)_LDFLAGS = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/$(3)$(SUFF_DLL)
+else ifn1of ($(KBUILD_TARGET), os2 win)
+ $(1)_SONAME  = $(3)$(SUFF_DLL)
+endif
+if1of ($(KBUILD_TARGET), os2 win)
+ $(1)_SOURCES = $$($(1)_0_OUTDIR)/$(1)Imp.def
+ $(1)_CLEAN   = $$($(1)_0_OUTDIR)/$(1)Imp.def
+else
+ $(1)_SOURCES = $$($(1)_0_OUTDIR)/$(1)Imp.c
+ $(1)_CLEAN   = $$($(1)_0_OUTDIR)/$(1)Imp.c
+endif
+
+$$$$($(1)_SOURCES): $(PATH_SUB_CURRENT)/$(2) $(PATH_ROOT)/src/bldprogs/deftoimp.sed | $$$$(dir $$$$@)
+        $$(call MSG_GENERATE,,$$@)
+ifeq ($(KBUILD_TARGET),os2)
+        $$(SED) \
+                -e '/not-$(KBUILD_TARGET)/d' \
+                -e '/not-$(KBUILD_TARGET_ARCH)/d' \
+                -e 's/^LIBRARY[[:space:]][[:space:]]*\(.*\)\.dll/LIBRARY \1 INITINSTANCE TERMINSTANCE\nDATA MULTIPLE\n/' \
+                -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' \
+                -e 's/[ \t]DATA[ \t]*/ /'  \
+                --output $$@ $$<
+else ifeq ($(KBUILD_TARGET),win)
+        $$(SED) \
+                -e '/not-$(KBUILD_TARGET)/d' \
+                -e '/not-$(KBUILD_TARGET_ARCH)/d' \
+                --output $$@ $<
+else
+        $$(QUIET)$$(APPEND) -tn $$@ \
+                '#ifdef VBOX_HAVE_VISIBILITY_HIDDEN' \
+                '# define EXPORT __attribute__((visibility("default")))' \
+                '# define EXPORT_DATA __attribute__((visibility("default")))' \
+                '#else' \
+                '# define EXPORT' \
+                '# define EXPORT_DATA' \
+                '#endif' \
+                ''
+        $$(SED) \
+                -e '/not-$(KBUILD_TARGET)/d' \
+                -e '/not-$(KBUILD_TARGET_ARCH)/d' \
+                -f $(PATH_ROOT)/src/bldprogs/deftoimp.sed \
+                --append $$@ $$<
+endif
+endef # VBOX_GENERATE_IMPORT_TARGET_DEF
 
 
@@ -3563 +3620 @@
  endif
  TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
- TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
-endif
- TEMPLATE_VBoxR3ExtPack_LIBS = \
-        $(TEMPLATE_LIBS_VBOXR3) \
-        $(LIB_RUNTIME) \
-        $(LIB_VMM)
+ if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
+  TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
+ endif
+ ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+  TEMPLATE_VBoxR3ExtPack_LIBS = \
+        $(TEMPLATE_LIBS_VBOXR3) \
+        $(PATH_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
+        $(PATH_LIB)/VBoxRT3Imp$(VBOX_SUFF_LIB)
+ else
+  TEMPLATE_VBoxR3ExtPack_LIBS = \
+        $(TEMPLATE_LIBS_VBOXR3) \
+        $(LIB_RUNTIME) \
+        $(LIB_VMM)
+ endif
 
  TEMPLATE_VBoxR0ExtPack = For the ring-0 context extension pack modules.

trunk/src/Makefile.kmk

@@ -31 +31 @@
  include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
  include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
+ ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+  include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
+ endif
 
 else if defined(VBOX_ONLY_TESTSUITE)

trunk/src/VBox/Makefile.kmk

@@ -43 +43 @@
  endif
  include $(PATH_SUB_CURRENT)/VMM/Makefile.kmk
- include $(PATH_SUB_CURRENT)/Disassembler/Makefile.kmk
+ ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+  include $(PATH_SUB_CURRENT)/Disassembler/Makefile.kmk
+ endif
 
 else ifdef VBOX_ONLY_SDK

trunk/src/VBox/Runtime/Makefile.kmk

@@ -53 +53 @@
  DLLS += VBoxRT
 
+else ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
+ #
+ # Build docs only - need just regular R3 runtime.
+ #
+ LIBRARIES += RuntimeBldProg
+ IMPORT_LIBS += VBoxRTImp
+
 else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
 
@@ -64 +71 @@
 
  BLDPROGS += uniread
+ IMPORT_LIBS += VBoxRTImp
  LIBRARIES += RuntimeR3 RuntimeBldProg RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC
  LIBRARIES.win += RuntimeR0Stub
@@ -1251 +1259 @@
 
 #
+# VBoxRTImp - Import library/hack.
+#
+VBoxRTImp_TEMPLATE = VBoxR3Dll
+$(call VBOX_GENERATE_IMPORT_TARGET_FN,VBoxRTImp,VBox/VBoxRTImp.def,VBoxRT)
+
+
+#
 # RuntimeR3NoCRTGCC - CRT replacement lib for VBoxREM.
 # This is used together with VBoxRT.

trunk/src/VBox/VMM/Makefile.kmk

@@ -48 +48 @@
 # VMMR3.dll
 #
+ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
 LIBRARIES += VMMR3
+endif
 
 VMMR3_TEMPLATE  = VBoxR3Dll
@@ -313 +315 @@
 
 
+#
+# VMMR3Imp.lib
+#
+IMPORT_LIBS += VMMR3Imp
+VMMR3Imp_TEMPLATE = VBoxR3Dll
+$(call VBOX_GENERATE_IMPORT_TARGET_FN,VMMR3Imp,VMMR3/VMMR3.def,VBoxVMM)
+$(warning VMMR3Imp_SOURCES=$(VMMR3Imp_SOURCES))
+
+
 if defined(VBOX_WITH_RAW_MODE) && !defined(VBOX_ONLY_EXTPACKS)
  #

trunk/src/bldprogs/deftoimp.sed

@@ -1 +1 @@
 # $Id$
 ## @file
-# SED script for generating a dummy .so from a windows .def file.
+# SED script for generating a dummy .c from a windows .def file.
 #
 
 #
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
 #
 
+#
+# Remove comments and space. Skip empty lines.
+#
 s/;.*$//g
 s/^[[:space:]][[:space:]]*//g
@@ -27 +30 @@
 /^$/b end
 
+
+/[[:space:]]DATA$/b data
+
+#
+# Function export
+#
+:code
 s/^\(.*\)$/EXPORT\nvoid \1(void);\nvoid \1(void){}/
 b end
+
+
+#
+# Data export
+#
+:data
+s/^\(.*\)[[:space:]]*DATA$/EXPORT_DATA void *\1 = (void *)0;/
+b end
+
 }
 d

trunk/src/libs/Makefile.kmk

@@ -80 +80 @@
 endif
 
-if !defined(VBOX_ONLY_TESTSUITE)
+if !defined(VBOX_ONLY_TESTSUITE) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
  ifeq ($(SDK_VBOX_LIBXML2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.6.30/include)
   include $(PATH_SUB_CURRENT)/libxml2-2.6.30/Makefile.kmk