Changeset 32690 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 22, 2010 10:09:36 AM (14 years ago)

Author:

vboxsync

Message:

VBoxGuest: Enabled new Windows driver (PnP + NT4 Legacy) using common code base, removed old Windows driver.

Location:

trunk/src/VBox/Additions

Files:

• Makefile.kmk (modified) (1 diff)
• WINNT/Makefile.kmk (modified) (3 diffs)
• WINNT/VBoxGuest (deleted)
• common/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/Makefile.kmk

@@ -71 +71 @@
   include $(PATH_SUB_CURRENT)/darwin/Makefile.kmk
  endif
+
+ ifeq ($(KBUILD_TARGET),win)
+  #
+  # Inf2Cat requires all the files referenced in the .inf file
+  # to be present in the directory, so we have to do this from here,
+  # since VBoxGuest.sys is being built from the common sources.
+  #
+  INSTALLS += VBoxGuest-inf
+  VBoxGuest-inf_INST = $(INST_ADDITIONS)
+  VBoxGuest-inf_MODE = a+r,u+w
+  VBoxGuest-inf_SOURCES = \
+        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf
+  ifdef VBOX_SIGN_ADDITIONS
+  VBoxGuest-inf_SOURCES += \
+        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat \
+        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
+        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
+        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe \
+        $(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll
+  endif # signing
+  VBoxGuest-inf_CLEAN = $(VBoxGuest-inf_SOURCES)
+  VBoxGuest-inf_BLDDIRS = \
+        $(PATH_TARGET)/VBoxGuestCat.dir
+
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf: $(PATH_SUB_CURRENT)/common/VBoxGuest/win/VBoxGuest.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
+        $(call MSG_GENERATE,VBoxGuest-inf,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys:   $$(TARGET_VBoxGuest) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe: $$(TARGET_VBoxControl) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 755 $< $(@D)
+
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe:    $$(TARGET_VBoxTray) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 755 $< $(@D)
+
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll:    $$(TARGET_VBCoInst) | $$(call DIRDEP,$$(@D))
+        $(INSTALL) -m 644 $< $(@D)
+
+  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat: \
+                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf \
+                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
+                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
+                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe \
+                $(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll
+        $(call MSG_TOOL,Inf2Cat,VBoxGuest-inf,$@,$<)
+        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
+ endif # KBUILD_TARGET == win
 
  # The packing target rule, but only if we're on the local build box.

trunk/src/VBox/Additions/WINNT/Makefile.kmk

@@ -4 +4 @@
 #
 
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 include $(PATH_SUB_CURRENT)/i8042prt/Makefile.kmk
 include $(PATH_SUB_CURRENT)/MouseFilter/Makefile.kmk
-include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBoxTray/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBoxGINA/Makefile.kmk
@@ -37 +36 @@
 endif
 
-#
-# Inf2Cat requires all the files referenced in the .inf file
-# to be present in the directory, so we have to do this from here.
-#
-INSTALLS += VBoxGuest-inf
-VBoxGuest-inf_INST = $(INST_ADDITIONS)
-VBoxGuest-inf_MODE = a+r,u+w
-VBoxGuest-inf_SOURCES = \
-        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf
-ifdef VBOX_SIGN_ADDITIONS
-VBoxGuest-inf_SOURCES += \
-        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat \
-        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
-        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
-        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe \
-        $(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll
-endif # signing
-VBoxGuest-inf_CLEAN = $(VBoxGuest-inf_SOURCES)
-VBoxGuest-inf_BLDDIRS = \
-        $(PATH_TARGET)/VBoxGuestCat.dir
-
-$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf: $(PATH_SUB_CURRENT)/VBoxGuest/VBoxGuest.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
-        $(call MSG_GENERATE,VBoxGuest-inf,$@,$<)
-        $(call VBOX_EDIT_INF_FN,$<,$@)
-
-$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys:   $$(TARGET_VBoxGuest) | $$(call DIRDEP,$$(@D))
-        $(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe: $$(TARGET_VBoxControl) | $$(call DIRDEP,$$(@D))
-        $(INSTALL) -m 755 $< $(@D)
-
-$(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe:    $$(TARGET_VBoxTray) | $$(call DIRDEP,$$(@D))
-        $(INSTALL) -m 755 $< $(@D)
-
-$(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll:    $$(TARGET_VBCoInst) | $$(call DIRDEP,$$(@D))
-        $(INSTALL) -m 644 $< $(@D)
-
-$(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat: \
-                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf \
-                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
-                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
-                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe \
-                $(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll
-        $(call MSG_TOOL,Inf2Cat,VBoxGuest-inf,$@,$<)
-        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
-
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/Additions/common/Makefile.kmk

@@ -23 +23 @@
 ifndef VBOX_ONLY_TESTSUITE
  include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
- if1of ($(KBUILD_TARGET), freebsd linux os2 solaris)
+ if1of ($(KBUILD_TARGET), freebsd linux os2 solaris win)
   include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
  endif
- if1of ($(KBUILD_TARGET), linux win freebsd os2 solaris)
+ if1of ($(KBUILD_TARGET), freebsd linux os2 solaris win)
   include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
  endif