Changeset 2689 in vbox

Timestamp:

May 17, 2007 3:07:32 AM (18 years ago)

Author:

vboxsync

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

21257

Message:

A simplified approach.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (2 diffs)
• win32/VBoxDrv.inf (modified) (3 diffs)

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

@@ -122 +122 @@
 VBoxDrv-inf_INST = $(INST_BIN)
 VBoxDrv-inf_MODE = a+r,u+w
- ifndef VBOX_SIGNING_MODE
-VBoxDrv-inf_SOURCES = win32/VBoxDrv.inf
- else
 VBoxDrv-inf_SOURCES = \
-        $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf \
+        $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf
+VBoxDrv-inf_CLEAN = \
+        $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf
+VBoxDrv-inf_BLDDIRS = $(PATH_TARGET)/VBoxDrvCat.dir
+
+$(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf: $(PATH_SUB_CURRENT)/win32/VBoxDrv.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
+        $(call MSG_GENERATE,VBoxDrv-inf,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+ ifdef VBOX_SIGNING_MODE
+VBoxDrv-inf_SOURCES += \
         $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.cat
 VBoxDrv-inf_CLEAN += \
         $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.cat \
-        $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.sys \
-        $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf
-VBoxDrv-inf_BLDDIRS = $(PATH_TARGET)/VBoxDrvCat.dir
-
-$(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf: $(PATH_SUB_CURRENT)/win32/VBoxDrv.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
-        $(call MSG_GENERATE,VBoxDrv-inf,$@,$<)
-        $(QUIET2)$(RM) -f $@
-  ifeq ($(BUILD_TARGET_ARCH),amd64)
-        $(QUIET)$(SED) \
-                -e 's/^\;\;* *CatalogFile *=/CatalogFile=/' \
-                -e 's/^\%INNOTEK%=INNOTEK *$$/%INNOTEK%=INNOTEK, NTamd64/' \
-                -e 's/^\[VBoxDrv_Service\] *$$/\[VBoxDrv_Service.NTamd64\]/' \
-                -e 's/^\;amd64 *//' \
-                $< > $@
-  else
-        $(QUIET)$(SED) \
-                -e 's/^\;\;* *CatalogFile=/CatalogFile=/' \
-                $< > $@
-  endif
+        $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.sys
 
 $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.cat: $(PATH_TARGET)/VBoxDrvCat.dir/VBoxDrv.inf $$(TARGET_VBoxDrv)
@@ -154 +143 @@
         $(INSTALL) -m 644 $(TARGET_VBoxDrv) $(@D)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
-
  endif # signing
 endif # win

trunk/src/VBox/HostDrivers/Support/win32/VBoxDrv.inf

@@ -26 +26 @@
 DriverVer=08/21/2006,8.1.0.0
 DriverPackageType=KernelService
-;CatalogFile=VBoxDrv.cat
+;cat CatalogFile=VBoxDrv.cat
 
 [DestinationDirs]
@@ -38 +38 @@
 
 [Manufacturer]
-%INNOTEK%=INNOTEK
+;x86 %INNOTEK%=INNOTEK
+;amd64 %INNOTEK%=INNOTEK, NTamd64
 
 [SourceDisksFiles]
@@ -49 +50 @@
 VBoxDrv.sys
 
-[VBoxDrv_Service]
+;x86   [VBoxDrv_Service]
+;amd64 [VBoxDrv_Service.NTamd64]
 DisplayName    = %VBoxDrv.SVCDESC%
 ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER