Changeset 33364 in vbox

Timestamp:

Oct 22, 2010 3:42:37 PM (14 years ago)

Author:

vboxsync

Message:

Some more extension pack (formerly add-ons) sketches.

Location:

trunk

Files:

• Config.kmk (modified) (5 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (6 diffs)

trunk/Config.kmk

@@ -80 +80 @@
  INST_DLL             = $(INST_BIN)
  INST_SYS             = $(INST_BIN)
+ INST_EXTPACK         = $(INST_BIN)ExtensionPacks/
  INST_TESTCASE        = $(INST_BIN)testcase/
  INST_ADDITIONS       = $(INST_BIN)additions/
@@ -97 +98 @@
  INST_DLL             = $(INST_BIN)
  INST_SYS             = $(INST_BIN)
+ INST_EXTPACK         = $(INST_BIN)ExtensionPacks/
  INST_TESTCASE        = $(INST_BIN)testcase/
  INST_ADDITIONS       = $(INST_BIN)additions/
@@ -105 +107 @@
  INST_ADDITIONS_LIB   = $(INST_LIB)additions/
 endif
+INST_EXTPACK_PUEL     = $(INST_EXTPACK)Puel/
 
 PATH_BIN              = $(patsubst %/,%,$(PATH_INS)/$(INST_BIN))
@@ -523 +526 @@
 ## @}
 
+
+## @name Extension pack
+## @{
+# Enables the extension pack feature.
+VBOX_WITH_EXTPACK = 1
+# Enables building of the "PUEL" (final name TBD) extension pack.
+#VBOX_WITH_EXTPACK_PUEL = 1
+## @}
 
 ## @name Misc
@@ -3433 +3444 @@
 
 #
-# Templates used for building the add-ons.
-#
-TEMPLATE_VBoxR3AddOn = For the ring-3 context addons.
-TEMPLATE_VBoxR3AddOn_EXTENDS = VBOXR3
-ifeq ($(KBUILD_TARGET),win)
-else
- TEMPLATE_VBoxR3AddOn_CXXFLAGS = $(filter-out $(TEMPLATE_VBOX_CXXFLAGS), -fexceptions) -fno-exceptions
- TEMPLATE_VBoxR3AddOn_CFLAGS   = $(filter-out $(TEMPLATE_VBOX_CFLAGS), -fexceptions -frtti) -fno-exceptions -fno-rtti
-endif
-TEMPLATE_VBoxR3AddOn_LIBS = \
-        $(TEMPLATE_LIBS_VBOXR3) \
-        $(LIB_RUNTIME) \
-        $(LIB_VMM)
-
-TEMPLATE_VBoxR0AddOn = For the ring-0 context addons.
-TEMPLATE_VBoxR0AddOn_EXTENDS = VBoxR0
-
-TEMPLATE_VBoxRcAddOn = For the raw-mode context addons.
-TEMPLATE_VBoxRcAddOn_EXTENDS = VBoxRc
-
+# Templates used for building the extension packs.
+#
+ifdef VBOX_WITH_EXTPACK
+ # Base templates (native or portable).
+ TEMPLATE_VBoxR3ExtPack = For the ring-3 context extension pack modules.
+ if 1 # Native for now.
+  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXR3DLLNOXCPT
+ else
+  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXNOCRTGCC
+  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXR3DLLNOXCPT_DEFS) IPRT_NO_CRT IN_RING3
+  TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBOXR3DLLNOXCPT_INCS)
+ endif
+ ifneq ($(KBUILD_TARGET),win)
+  TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS) -fno-rtti
+ endif
+ TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+ TEMPLATE_VBoxR3ExtPack_LIBS = \
+        $(TEMPLATE_LIBS_VBOXR3) \
+        $(LIB_RUNTIME) \
+        $(LIB_VMM)
+
+ TEMPLATE_VBoxR0ExtPack = For the ring-0 context extension pack modules.
+ TEMPLATE_VBoxR0ExtPack_EXTENDS = VBoxR0
+ TEMPLATE_VBoxR0ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+
+ TEMPLATE_VBoxRcExtPack = For the raw-mode context extension pack modules.
+ TEMPLATE_VBoxRcExtPack_EXTENDS = VBoxRc
+ TEMPLATE_VBoxRcExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
+
+ # For each individual extension pack
+ ifdef VBOX_WITH_EXTPACK_PUEL
+  TEMPLATE_VBoxR3ExtPackPuel = For the ring-3 context modules in the PUEL extension pack.
+  TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
+  TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+
+  TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
+  TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
+  TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+
+  TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
+  TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
+  TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+ endif
+endif # VBOX_WITH_EXTPACK
 
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -67 +67 @@
  VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
  VBoxDDU_SDKS.win        = WINPSDK W2K3DDK
- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
+ if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
   VBoxDDU_DEFS          += VBOX_WITH_EHCI
  endif
@@ -136 +136 @@
 ifdef VBOX_WITH_USB
  VBoxDD_DEFS           += VBOX_WITH_USB
- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
+ if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
   VBoxDD_DEFS          += VBOX_WITH_EHCI
  endif
@@ -452 +452 @@
 ifdef VBOX_WITH_USB
  DevicesR3_DEFS        += VBOX_WITH_USB
- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
+ if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
   DevicesR3_DEFS       += VBOX_WITH_EHCI
   DevicesR3_SOURCES    += \
@@ -611 +611 @@
  ifdef VBOX_WITH_USB
   VBoxDDGC_DEFS        += VBOX_WITH_USB
-  if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
+  if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
    VBoxDDGC_DEFS       += VBOX_WITH_EHCI
    VBoxDDGC_SOURCES    += \
@@ -737 +737 @@
 ifdef VBOX_WITH_USB
 VBoxDDR0_DEFS          += VBOX_WITH_USB
- if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
+ if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
   VBoxDDR0_DEFS        += VBOX_WITH_EHCI
   VBoxDDR0_SOURCES     += \
@@ -1190 +1190 @@
 
 #
-# The EHCI (USB 2.0) Add-On Modules.
-#
-if defined(VBOX_WITH_USB) && defined(VBOX_WITH_ADDONS)
+# The EHCI (USB 2.0) Extension Pack Modules.
+#
+if defined(VBOX_WITH_USB) && defined(VBOX_WITH_EXTPACK_PUEL)
  DLLS += VBoxEhciR3
- VBoxEhciR3_TEMPLATE = VBoxR3AddOn
+ VBoxEhciR3_TEMPLATE = VBoxR3ExtPackPuel
  VBoxEhciR3_SOURCES  = USB/DevEHCI.cpp
 
  SYSMODS += VBoxEhciR0
- VBoxEhciR0_TEMPLATE = VBoxR0AddOn
+ VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
  VBoxEhciR0_SOURCES  = USB/DevEHCI.cpp
 
  ifdef VBOX_WITH_RAW_MODE
   SYSMODS += VBoxEhciRC
-  VBoxEhciRC_TEMPLATE = VBoxRcAddOn
+  VBoxEhciRC_TEMPLATE = VBoxRcExtPackPuel
   VBoxEhciRC_SOURCES  = USB/DevEHCI.cpp
  endif
-endif # VBOX_WITH_USB && VBOX_WITH_ADDONS
+endif # VBOX_WITH_USB && VBOX_WITH_EXTPACK_PUEL