win-pvdrivers

changeset 170:ae761953516e

Updates to make it easier to build with another version of the ddk. Tested with 6000 and 6001
author James Harper <james.harper@bendigoit.com.au>
date Mon Feb 04 21:31:14 2008 +1100 (2008-02-04)
parents 30daf47ba4b4
children c57b6e92c615 4d23c0381767
files common.inc xenaddresource/makefile.inc xenenum/makefile.inc xenenum/xenenum.inx xenhide/makefile.inc xenhide/xenhide.inx xennet/makefile.inc xennet/xennet.inx xenpci/makefile.inc xenpci/xenpci.inx xenstub/makefile.inc xenstub/xenstub.inx xenvbd/makefile.inc xenvbd/xenvbd.inx
line diff
     1.1 --- a/common.inc	Mon Feb 04 10:06:42 2008 +1100
     1.2 +++ b/common.inc	Mon Feb 04 21:31:14 2008 +1100
     1.3 @@ -1,8 +1,13 @@
     1.4 -VERSION=0.6.5.1
     1.5 +VERSION=0.6.5.2
     1.6  TARGETPATH=..\Target\$(DDK_TARGET_OS)
     1.7  KMDF_VERSION=1
     1.8 +!IF $(_NT_TOOLS_VERSION) > 0x700
     1.9 +KMDF_MAJOR_VERSION=1
    1.10 +!ELSE
    1.11 +KMDF_VERSION_MAJOR=1
    1.12 +KMDF_VERSION_MINOR=5
    1.13 +!ENDIF
    1.14  MSC_WARNING_LEVEL=/W4
    1.15  INCLUDES = ..\common\include;..\common\include\public
    1.16  TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\ntstrsafe.lib
    1.17  NTTARGETFILES=
    1.18 -#SOURCES_USED=..\common.inc
    1.19 \ No newline at end of file
     2.1 --- a/xenaddresource/makefile.inc	Mon Feb 04 10:06:42 2008 +1100
     2.2 +++ b/xenaddresource/makefile.inc	Mon Feb 04 21:31:14 2008 +1100
     2.3 @@ -1,6 +0,0 @@
     2.4 -#_LNG=$(LANGUAGE)
     2.5 -#STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -v $(VERSION)
     2.6 -#
     2.7 -#..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources
     2.8 -#    copy $(@B).inx $@
     2.9 -#    $(STAMP)
     3.1 --- a/xenenum/makefile.inc	Mon Feb 04 10:06:42 2008 +1100
     3.2 +++ b/xenenum/makefile.inc	Mon Feb 04 21:31:14 2008 +1100
     3.3 @@ -1,6 +1,6 @@
     3.4  _LNG=$(LANGUAGE)
     3.5 -STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -v $(VERSION)
     3.6 +STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) -v $(VERSION)
     3.7  
     3.8 -..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources
     3.9 +..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources ..\common.inc
    3.10      copy $(@B).inx $@
    3.11      $(STAMP)
     4.1 --- a/xenenum/xenenum.inx	Mon Feb 04 10:06:42 2008 +1100
     4.2 +++ b/xenenum/xenenum.inx	Mon Feb 04 21:31:14 2008 +1100
     4.3 @@ -51,11 +51,11 @@ CopyFiles=CoInstaller_CopyFiles
     4.4  KmdfService = xenenum, xenenum_wdfsect
     4.5  
     4.6  [xenenum_wdfsect]
     4.7 -KmdfLibraryVersion = 1.0
     4.8 +KmdfLibraryVersion = $KMDFVERSION$
     4.9  
    4.10  [SourceDisksFiles]
    4.11  xenenum.sys=1
    4.12 -WdfCoinstaller01005.dll=1,,
    4.13 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll=1,,
    4.14  
    4.15  [SourceDisksNames.x86]
    4.16  1 = %DISK_NAME%,,,\i386
    4.17 @@ -64,10 +64,10 @@ 1 = %DISK_NAME%,,,\i386
    4.18  1 = %DISK_NAME%,,,\amd64
    4.19  
    4.20  [CoInstaller_CopyFiles]
    4.21 -WdfCoinstaller01005.dll,,,2
    4.22 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,,,2
    4.23  
    4.24  [CoInstaller_AddReg]
    4.25 -HKR,,CoInstallers32,0x00010000, "WdfCoinstaller01005.dll,WdfCoInstaller"
    4.26 +HKR,,CoInstallers32,0x00010000, "WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
    4.27  
    4.28  [Strings]
    4.29  XenGplPv = "Xen GPL PV Driver Developers"
     5.1 --- a/xenhide/makefile.inc	Mon Feb 04 10:06:42 2008 +1100
     5.2 +++ b/xenhide/makefile.inc	Mon Feb 04 21:31:14 2008 +1100
     5.3 @@ -1,6 +1,6 @@
     5.4  _LNG=$(LANGUAGE)
     5.5 -STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -v $(VERSION)
     5.6 +STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) -v $(VERSION)
     5.7  
     5.8 -..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources
     5.9 +..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources ..\common.inc
    5.10      copy $(@B).inx $@
    5.11      $(STAMP)
     6.1 --- a/xenhide/xenhide.inx	Mon Feb 04 10:06:42 2008 +1100
     6.2 +++ b/xenhide/xenhide.inx	Mon Feb 04 21:31:14 2008 +1100
     6.3 @@ -45,7 +45,7 @@ xenhide.sys
     6.4  
     6.5  [SourceDisksFiles]
     6.6  xenhide.sys=1
     6.7 -WdfCoinstaller01005.dll=1,,
     6.8 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll=1,,
     6.9  
    6.10  [SourceDisksNames.x86]
    6.11  1 = %DISK_NAME%,,,\i386
    6.12 @@ -71,16 +71,16 @@ AddReg=CoInstaller_AddReg
    6.13  CopyFiles=CoInstaller_CopyFiles
    6.14  
    6.15  [CoInstaller_CopyFiles]
    6.16 -WdfCoinstaller01005.dll,,,2
    6.17 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,,,2
    6.18  
    6.19  [CoInstaller_AddReg]
    6.20 -HKR,,CoInstallers32,0x00010000, "WdfCoinstaller01005.dll,WdfCoInstaller"
    6.21 +HKR,,CoInstallers32,0x00010000, "WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
    6.22  
    6.23  [XenHide_Inst.NT.Wdf]
    6.24  KmdfService = xenhide, XenHide_WDFSect
    6.25  
    6.26  [XenHide_WDFSect]
    6.27 -KmdfLibraryVersion = 1.0
    6.28 +KmdfLibraryVersion = $KMDFVERSION$
    6.29  
    6.30  [Strings]
    6.31  JAMESHARPER = "James Harper"
     7.1 --- a/xennet/makefile.inc	Mon Feb 04 10:06:42 2008 +1100
     7.2 +++ b/xennet/makefile.inc	Mon Feb 04 21:31:14 2008 +1100
     7.3 @@ -1,6 +1,6 @@
     7.4  _LNG=$(LANGUAGE)
     7.5 -STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -v $(VERSION)
     7.6 +STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) -v $(VERSION)
     7.7  
     7.8 -..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources
     7.9 +..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources ..\common.inc
    7.10      copy $(@B).inx $@
    7.11      $(STAMP)
     8.1 --- a/xennet/xennet.inx	Mon Feb 04 10:06:42 2008 +1100
     8.2 +++ b/xennet/xennet.inx	Mon Feb 04 21:31:14 2008 +1100
     8.3 @@ -52,7 +52,7 @@ xennet.sys
     8.4  
     8.5  [SourceDisksFiles]
     8.6  xennet.sys=1
     8.7 -WdfCoinstaller01005.dll=1,,
     8.8 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll=1,,
     8.9  
    8.10  [SourceDisksNames.x86]
    8.11  1 = %DISK_NAME%,,,\i386
    8.12 @@ -84,16 +84,16 @@ AddReg=CoInstaller_AddReg
    8.13  CopyFiles=CoInstaller_CopyFiles
    8.14  
    8.15  [CoInstaller_CopyFiles]
    8.16 -WdfCoinstaller01005.dll,,,2
    8.17 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,,,2
    8.18  
    8.19  [CoInstaller_AddReg]
    8.20 -HKR,,CoInstallers32,0x00010000, "WdfCoinstaller01005.dll,WdfCoInstaller"
    8.21 +HKR,,CoInstallers32,0x00010000, "WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
    8.22  
    8.23  [XenNet_Inst.NT.Wdf]
    8.24  KmdfService = xennet, xennet_wdfsect
    8.25  
    8.26  [xennet_wdfsect]
    8.27 -KmdfLibraryVersion = 1.0
    8.28 +KmdfLibraryVersion = $KMDFVERSION$
    8.29  
    8.30  [Strings]
    8.31  XenGplPv = "Xen GPL PV Driver Developers"
     9.1 --- a/xenpci/makefile.inc	Mon Feb 04 10:06:42 2008 +1100
     9.2 +++ b/xenpci/makefile.inc	Mon Feb 04 21:31:14 2008 +1100
     9.3 @@ -1,6 +1,6 @@
     9.4  _LNG=$(LANGUAGE)
     9.5 -STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -v $(VERSION)
     9.6 +STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) -v $(VERSION)
     9.7  
     9.8 -..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources
     9.9 +..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources ..\common.inc
    9.10      copy $(@B).inx $@
    9.11      $(STAMP)
    10.1 --- a/xenpci/xenpci.inx	Mon Feb 04 10:06:42 2008 +1100
    10.2 +++ b/xenpci/xenpci.inx	Mon Feb 04 21:31:14 2008 +1100
    10.3 @@ -30,7 +30,7 @@ xenpci.sys
    10.4  
    10.5  [SourceDisksFiles]
    10.6  xenpci.sys=1
    10.7 -WdfCoinstaller01005.dll=1,,
    10.8 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll=1,,
    10.9  
   10.10  [SourceDisksNames.x86]
   10.11  1 = %DISK_NAME%,,,\i386
   10.12 @@ -54,16 +54,16 @@ AddReg=CoInstaller_AddReg
   10.13  CopyFiles=CoInstaller_CopyFiles
   10.14  
   10.15  [CoInstaller_CopyFiles]
   10.16 -WdfCoinstaller01005.dll,,,2
   10.17 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,,,2
   10.18  
   10.19  [CoInstaller_AddReg]
   10.20 -HKR,,CoInstallers32,0x00010000, "WdfCoinstaller01005.dll,WdfCoInstaller"
   10.21 +HKR,,CoInstallers32,0x00010000, "WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
   10.22  
   10.23  [XenPCI_Inst.NT.Wdf]
   10.24  KmdfService = xenpci, xenpci_wdfsect
   10.25  
   10.26  [xenpci_wdfsect]
   10.27 -KmdfLibraryVersion = 1.0
   10.28 +KmdfLibraryVersion = $KMDFVERSION$
   10.29  
   10.30  [Strings]
   10.31  XenGplPv = "Xen GPL PV Driver Developers"
    11.1 --- a/xenstub/makefile.inc	Mon Feb 04 10:06:42 2008 +1100
    11.2 +++ b/xenstub/makefile.inc	Mon Feb 04 21:31:14 2008 +1100
    11.3 @@ -1,6 +1,6 @@
    11.4  _LNG=$(LANGUAGE)
    11.5 -STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -v $(VERSION)
    11.6 +STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) -v $(VERSION)
    11.7  
    11.8 -..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources
    11.9 +..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources ..\common.inc
   11.10      copy $(@B).inx $@
   11.11      $(STAMP)
    12.1 --- a/xenstub/xenstub.inx	Mon Feb 04 10:06:42 2008 +1100
    12.2 +++ b/xenstub/xenstub.inx	Mon Feb 04 21:31:14 2008 +1100
    12.3 @@ -32,7 +32,7 @@ XenStub.sys
    12.4  
    12.5  [SourceDisksFiles]
    12.6  XenStub.sys=1
    12.7 -WdfCoinstaller01005.dll=1,,
    12.8 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll=1,,
    12.9  
   12.10  [SourceDisksNames.x86]
   12.11  1 = %DISK_NAME%,,,\i386
   12.12 @@ -63,16 +63,16 @@ AddReg=CoInstaller_AddReg
   12.13  CopyFiles=CoInstaller_CopyFiles
   12.14  
   12.15  [CoInstaller_CopyFiles]
   12.16 -WdfCoinstaller01005.dll,,,2
   12.17 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,,,2
   12.18  
   12.19  [CoInstaller_AddReg]
   12.20 -HKR,,CoInstallers32,0x00010000, "WdfCoinstaller01005.dll,WdfCoInstaller"
   12.21 +HKR,,CoInstallers32,0x00010000, "WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
   12.22  
   12.23  [XenStub_Inst.NT.Wdf]
   12.24  KmdfService = XenStub, XenStub_wdfsect
   12.25  
   12.26  [XenStub_wdfsect]
   12.27 -KmdfLibraryVersion = 1.0
   12.28 +KmdfLibraryVersion = $KMDFVERSION$
   12.29  
   12.30  [Strings]
   12.31  XenGplPv = "Xen GPL PV Driver Developers"
    13.1 --- a/xenvbd/makefile.inc	Mon Feb 04 10:06:42 2008 +1100
    13.2 +++ b/xenvbd/makefile.inc	Mon Feb 04 21:31:14 2008 +1100
    13.3 @@ -1,6 +1,6 @@
    13.4  _LNG=$(LANGUAGE)
    13.5 -STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -v $(VERSION)
    13.6 +STAMP=stampinf -f $@ -a $(_BUILDARCH) -d * -k $(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR) -v $(VERSION)
    13.7  
    13.8 -..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources
    13.9 +..\Target\$(DDK_TARGET_OS)\$(INF_NAME).inf: $(INF_NAME).inx sources ..\common.inc
   13.10      copy $(@B).inx $@
   13.11      $(STAMP)
    14.1 --- a/xenvbd/xenvbd.inx	Mon Feb 04 10:06:42 2008 +1100
    14.2 +++ b/xenvbd/xenvbd.inx	Mon Feb 04 21:31:14 2008 +1100
    14.3 @@ -103,15 +103,15 @@ CopyFiles=CoInstaller_CopyFiles
    14.4  KmdfService = xenaddresource, xenaddresource_wdfsect
    14.5  
    14.6  [xenvbd_wdfsect]
    14.7 -KmdfLibraryVersion = 1.0
    14.8 +KmdfLibraryVersion = $KMDFVERSION$
    14.9  
   14.10  [xenaddresource_wdfsect]
   14.11 -KmdfLibraryVersion = 1.0
   14.12 +KmdfLibraryVersion = $KMDFVERSION$
   14.13  
   14.14  [SourceDisksFiles]
   14.15  xenvbd.sys=1
   14.16  xenaddresource.sys=1
   14.17 -WdfCoinstaller01005.dll=1,,
   14.18 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll=1,,
   14.19  
   14.20  [SourceDisksNames.x86]
   14.21  1 = %DISK_NAME%,,,\i386
   14.22 @@ -120,10 +120,10 @@ 1 = %DISK_NAME%,,,\i386
   14.23  1 = %DISK_NAME%,,,\amd64
   14.24  
   14.25  [CoInstaller_CopyFiles]
   14.26 -WdfCoinstaller01005.dll,,,2
   14.27 +WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,,,2
   14.28  
   14.29  [CoInstaller_AddReg]
   14.30 -HKR,,CoInstallers32,0x00010000, "WdfCoinstaller01005.dll,WdfCoInstaller"
   14.31 +HKR,,CoInstallers32,0x00010000, "WdfCoinstaller$KMDFCOINSTALLERVERSION$.dll,WdfCoInstaller"
   14.32  
   14.33  [Strings]
   14.34  XenGplPv = "Xen GPL PV Driver Developers"