Changeset 2690 in vbox for trunk/src

Timestamp:

May 17, 2007 3:10:50 AM (18 years ago)

Author:

vboxsync

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

21258

Message:

A simplified approach.

Location:

trunk/src/VBox/HostDrivers/VBoxTAP

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxTAP.inf (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxTAP/Makefile.kmk

@@ -51 +51 @@
 VBoxTAP-inf_INST = bin/
 VBoxTAP-inf_MODE = a+r,u+w
-ifndef VBOX_SIGNING_MODE
-VBoxTAP-inf_SOURCES = VBoxTAP.inf
-else
 VBoxTAP-inf_SOURCES = \
-        $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.inf \
-        $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.cat
-VBoxTAP-inf_CLEAN += \
-        $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.cat \
-        $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.sys \
+        $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.inf
+VBoxTAP-inf_CLEAN = \
         $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.inf
 VBoxTAP-inf_BLDDIRS = $(PATH_TARGET)/VBoxTAPCat.dir
@@ -65 +59 @@
 $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.inf: $(PATH_SUB_CURRENT)/VBoxTAP.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
         $(call MSG_GENERATE,VBoxTAP-inf,$@,$<)
-        $(QUIET2)$(RM) -f $@
- ifeq ($(BUILD_TARGET_ARCH),amd64)
-        $(QUIET)$(SED) \
-                -e 's/^\;\;* *CatalogFile *=/CatalogFile=/' \
-                -e 's/^ *\%Provider% *= *VBoxTAP *$$/%Provider% = VBoxTAP,NTamd64/' \
-                -e 's/^\[VBoxTAP\] *$$/\[VBoxTAP.NTamd64\]/' \
-                -e 's/^\;amd64 *//' \
-                $< > $@
- else
-        $(QUIET)$(SED) \
-                -e 's/^\;\;* *CatalogFile *=/CatalogFile=/' \
-                $< > $@
- endif
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+ifdef VBOX_SIGNING_MODE
+VBoxTAP-inf_SOURCES += \
+        $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.cat
+VBoxTAP-inf_CLEAN += \
+        $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.cat \
+        $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.sys
 
 $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.cat: $(PATH_TARGET)/VBoxTAPCat.dir/VBoxTAP.inf $$(TARGET_VBoxTAP)
@@ -83 +72 @@
         $(INSTALL) -m 644 $(TARGET_VBoxTAP) $(@D)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
-
 endif # signing
 

trunk/src/VBox/HostDrivers/VBoxTAP/VBoxTAP.inf

@@ -20 +20 @@
 [Version]
    Signature = "$Windows NT$"
-;;;;   CatalogFile = VBoxTAP.cat
+;cat   CatalogFile = VBoxTAP.cat
    ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318}
    Provider = %Provider%
@@ -38 +38 @@
 ;----------------------------------------------------------------
 [Manufacturer]
-   %Provider% = VBoxTAP
+;x86   %Provider% = VBoxTAP
+;amd64 %Provider% = VBoxTAP, NTamd64
 
-[VBoxTAP]
+;x86   [VBoxTAP]
+;amd64 [VBoxTAP.NTamd64]
    %DeviceDescription% = VBoxTAP.ndi, VBoxTAP