[ofw] [MTHCA] remove hard coded WdfCoInstaller version numbers

[Leonid Keller]

Go ahead. :) 

> -----Original Message-----
> From: Smith, Stan [mailto:stan.smith at intel.com] 
> Sent: Thursday, April 09, 2009 7:43 PM
> To: Leonid Keller
> Cc: ofw at lists.openfabrics.org
> Subject: [ofw] [MTHCA] remove hard coded WdfCoInstaller 
> version numbers
> 
> Leonid,
>   Did you get a chance to look at these mthca & mlx4 patches 
> send last week?
> If you agree, I will commit patches.
> 
> Thanks,
> 
> Stan.
> 
> >> -----Original Message-----
> >> From: ofw-bounces at lists.openfabrics.org 
> >> [mailto:ofw-bounces at lists.openfabrics.org] On Behalf Of 
> Stan C. Smith
> >> Sent: Thursday, April 02, 2009 3:20 AM
> >> To: Leonid Keller
> >> Cc: ofw at lists.openfabrics.org
> >> Subject: [ofw] [MTHCA] remove hard coded WdfCoInstaller version 
> >> numbers
> >>
> >> 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 smooth transition to newer WDK versions where 
> >> the WdfCoInstaller has changed from 1.7(01007) -->
> >> 1.9(01009) without source code changes.
> >>
> >> Additionally, the outdated Server 2003 DDK build env test was 
> >> removed.
> >>
> >> Stan.
> >>
> >> --- hw/mthca/kernel/SOURCES          Wed Apr 01 17:10:35 2009
> >> +++ hw/mthca/kernel/SOURCES.new      Wed Apr 01 10:54:13 
> 2009 @@ -4,13
> >>  +4,13 @@ TARGETPATH=$(TRUNK)\bin\kernel\obj$(BUILD_ALT_DIR)
> >> TARGETTYPE=DRIVER
> >>
> >> -!if $(_NT_TOOLS_VERSION) != 0x700
> >> +KMDF_VERSION_MAJOR=1
> >> +
> >>  # WDK build only - transform .inx --> .inf adding date & version  
> >> stamp. # see .\makefile.inc INF_NAME=$(TARGETNAME)  
> >> INF_TARGET=$(TRUNK)\bin\kernel\$(O)\$(INF_NAME).inf
> >> NTTARGETFILES=$(INF_TARGET) -!endif
> >>
> >>  !if $(FREEBUILD)
> >>  ENABLE_EVENT_TRACING=1
> >>
> >>
> >> --- hw/mthca/kernel/makefile.inc             Wed Apr 01 
> 17:07:42 2009
> >> +++ hw/mthca/kernel/makefile.inc.new Wed Apr 01 16:20:01 2009 @@
> >>  -8,7 +8,7 @@ _INX=.
> >>  !ENDIF
> >>
> >> -STAMP=stampinf -a $(_BUILDARCH)
> >> +STAMP=stampinf -a $(_BUILDARCH) -k
> >> +$(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)
> >>
> >>  !INCLUDE mod_ver.def
> >>
> >>
> >>
> >> --- hw/mthca/kernel/mthca.inx                Wed Apr 01 
> 17:09:01 2009
> >> +++ hw/mthca/kernel/mthca.inx.new    Wed Apr 01 09:03:16 
> 2009 @@ -65,7
> >>  +65,7 @@ winmad.sys = 1,,
> >>  winmad.dll = 1,,
> >>  winmadd.dll = 1,,
> >> -WdfCoInstaller01007.dll = 1,,
> >> +WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
> >>
> >>
> >>  [SourceDisksFiles.amd64]
> >> @@ -89,7 +89,7 @@
> >>  winmad.sys = 1,,
> >>  winmad.dll = 1,,
> >>  winmadd.dll = 1,,
> >> -WdfCoInstaller01007.dll = 1,,
> >> +WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
> >>
> >>  [SourceDisksFiles.ia64]
> >>  mthca.sys=1,,
> >> @@ -112,7 +112,7 @@
> >>  winmad.sys = 1,,
> >>  winmad.dll = 1,,
> >>  winmadd.dll = 1,,
> >> -WdfCoInstaller01007.dll = 1,,
> >> +WdfCoInstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
> >>
> >>  [Manufacturer]
> >>  %MTL% = HCA.DeviceSection,ntx86,ntamd64,ntia64
> >> @@ -360,10 +360,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
> >>
> >>  [MTHCA.DDInstall.ntx86.Wdf]
> >>  KmdfService = WinVerbs, WvWdfSect
> 
>