[ofw] [MLX4] BUS - remove hard coded WdfCoInstaller version numbers

[Stan C. Smith]

Hello,
  Please find patches to remove the hard coded WdfCoInstaller version string from .inx files.
The process uses stampinf '-k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)' to expand the macro
'$KMDFCOINSTALLERVERSION$' in the .inx file.

This change allows a no src change transition to newer WDK versions where the WdfCoInstaller has changed from 1.7(01007)
--> 1.9(01009).

The change of KMDF_VERSION --> KMDF_VERSION_MAJOR is WDK suggested as the former will be deprecated in an future WDK
release.

Additionally, the outdated Server 2003 DDK build env test was removed.

Stan.


--- hw/mlx4/kernel/bus/drv/sources		Wed Apr 01 17:31:30 2009
+++ hw/mlx4/kernel/bus/drv/sources.new	Wed Apr 01 14:38:28 2009
@@ -2,13 +2,11 @@
 TARGETPATH=..\..\..\..\..\bin\kernel\obj$(BUILD_ALT_DIR)
 TARGETTYPE=DRIVER
 
-!if $(_NT_TOOLS_VERSION) != 0x700
 # WDK build only - transform .inx --> .inf adding date & version stamp.
 # see .\makefile.inc
 INF_NAME=$(TARGETNAME)
 INF_TARGET=..\..\..\..\..\bin\kernel\$(O)\$(INF_NAME).inf
 NTTARGETFILES=$(INF_TARGET)
-!endif
 
 !if $(FREEBUILD)
 ENABLE_EVENT_TRACING=1
@@ -27,9 +25,7 @@
 
 NTTARGETFILE0=mofcomp
 
-KMDF_VERSION=1
-
-KMDF_MINOR_VERSION=7
+KMDF_VERSION_MAJOR=1
 
 C_DEFINES=$(C_DEFINES) -DDRIVER -DDEPRECATE_DDK_FUNCTIONS -D__LITTLE_ENDIAN -DUSE_WDM_INTERRUPTS
 


--- hw/mlx4/kernel/bus/drv/makefile.inc		Wed Apr 01 17:30:21 2009
+++ hw/mlx4/kernel/bus/drv/makefile.inc.new	Wed Apr 01 16:19:37 2009
@@ -14,7 +14,7 @@
 _INX=.
 !ENDIF
 
-STAMP=stampinf -a $(_BUILDARCH)
+STAMP=stampinf -a $(_BUILDARCH) -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)
 
 !INCLUDE mod_ver.def
 



--- hw/mlx4/kernel/bus/drv/mlx4_bus.inx		Wed Apr 01 17:30:58 2009
+++ hw/mlx4/kernel/bus/drv/mlx4_bus.inx.new	Wed Apr 01 09:26:19 2009
@@ -48,15 +48,15 @@
 
 [SourceDisksFiles.x86]
 mlx4_bus.sys = 1,,
-wdfcoinstaller01007.dll = 1,,
+wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 
 [SourceDisksFiles.amd64]
 mlx4_bus.sys = 1,,
-wdfcoinstaller01007.dll = 1,,
+wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 
 [SourceDisksFiles.ia64]
 mlx4_bus.sys = 1,,
-wdfcoinstaller01007.dll = 1,,
+wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 
 ;*****************************************
 ; Mlx4Bus  Install Section
@@ -226,10 +226,10 @@
 CopyFiles=Wdf_CoInstaller_CopyFiles
 
 [Wdf_CoInstaller_AddReg]
-HKR,,CoInstallers32,0x00010000, "wdfcoinstaller01007.dll,WdfCoInstaller"
+HKR,,CoInstallers32,0x00010000, "wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
 
 [Wdf_CoInstaller_CopyFiles]
-wdfcoinstaller01007.dll
+wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll
 
 [MLX4BUS.DDInstall.ntx86.Wdf]
 KmdfService = mlx4_bus, mlx4_bus_wdfsect
-------------- next part --------------
A non-text attachment was scrubbed...
Name: sources.patch
Type: application/octet-stream
Size: 1044 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/a309383f/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: makefile.inc.patch
Type: application/octet-stream
Size: 647 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/a309383f/attachment-0001.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mlx4_bus.inx.patch
Type: application/octet-stream
Size: 1379 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/a309383f/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: sources
Type: application/octet-stream
Size: 1267 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/a309383f/attachment-0003.obj>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: makefile.inc
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/a309383f/attachment.ksh>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mlx4_bus.inx
Type: application/octet-stream
Size: 9738 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090401/a309383f/attachment-0004.obj>