win-pvdrivers

changeset 1015:a9acb0825429

Updates to build scripts to work with updated drivers
author James Harper <james.harper@bendigoit.com.au>
date Mon Feb 11 21:05:00 2013 +1100 (2013-02-11)
parents fe3af8f4d54b
children 9dbd45b40726
files archive.bat installer.wxs makedist.bat quicksign.bat sign.bat
line diff
     1.1 --- a/archive.bat	Mon Feb 11 21:04:34 2013 +1100
     1.2 +++ b/archive.bat	Mon Feb 11 21:05:00 2013 +1100
     1.3 @@ -7,7 +7,9 @@ IF %_BUILDARCH%==x86 (SET BUILDDIR=obj%B
     1.4  
     1.5  SET SYMFILES=xenpci\%BUILDDIR%\xen*.sys xenpci\%BUILDDIR%\xen*.pdb
     1.6  SET SYMFILES=%SYMFILES% xennet\%BUILDDIR%\xen*.sys xennet\%BUILDDIR%\xen*.pdb
     1.7 -SET SYMFILES=%SYMFILES% xenvbd\%BUILDDIR%\xen*.sys xenvbd\%BUILDDIR%\xen*.pdb
     1.8 +SET SYMFILES=%SYMFILES% xenvbd_scsiport\%BUILDDIR%\xenvbd_scsiport*.sys xenvbd_scsiport\%BUILDDIR%\xen*.pdb
     1.9 +SET SYMFILES=%SYMFILES% xenvbd_filter\%BUILDDIR%\xenvbd_filter*.sys xenvbd_filter\%BUILDDIR%\xen*.pdb
    1.10 +SET SYMFILES=%SYMFILES% xenvbd_storport\%BUILDDIR%\xen*.sys xenvbd_storport\%BUILDDIR%\xen*.pdb
    1.11  SET SYMFILES=%SYMFILES% xenscsi\%BUILDDIR%\xen*.sys xenscsi\%BUILDDIR%\xen*.pdb
    1.12  SET SYMFILES=%SYMFILES% xenusb\%BUILDDIR%\xen*.sys xenusb\%BUILDDIR%\xen*.pdb
    1.13  
     2.1 --- a/installer.wxs	Mon Feb 11 21:04:34 2013 +1100
     2.2 +++ b/installer.wxs	Mon Feb 11 21:05:00 2013 +1100
     2.3 @@ -23,7 +23,7 @@
     2.4      
     2.5      <Media Id='1' Cabinet='gplpv.cab' EmbedCab='yes' />
     2.6  
     2.7 -    <?if $(env.DDK_TARGET_OS) != Win2K?>
     2.8 +    <?if $(env.DDK_TARGET_OS) != Win2K ?>
     2.9      <Binary Id='waitfordevices.vbs' SourceFile='waitnopendinginstallevents\waitfordevices.vbs'/>
    2.10      <Binary Id='waitnopendinginstallevents.exe' SourceFile='waitnopendinginstallevents\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\waitnopendinginstallevents.exe'/>
    2.11      <?endif?>
    2.12 @@ -79,14 +79,26 @@
    2.13                  <difx:Driver Sequence='99' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes' />
    2.14                </Component>
    2.15              </Directory>
    2.16 +            <?if $(env.DDK_TARGET_OS) = Win2K OR $(env.DDK_TARGET_OS) = WinXP OR $(env.DDK_TARGET_OS) = WinNet ?>
    2.17              <Directory Id='XenVbdDir' Name='xenvbd'>
    2.18                <Component Id='XenVbd' Guid='1F05DC54-974C-40f6-BF41-0EFDB3EBD1DC'>
    2.19 -                <File Id='xenvbd.cat' Name='xenvbd.cat' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.cat' />
    2.20 -                <File Id='xenvbd.inf' Name='xenvbd.inf' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.inf' />
    2.21 -                <File Id='xenvbd.sys' Name='xenvbd.sys' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.sys' />
    2.22 +                <File Id='xenvbd.cat' Name='xenvbd.cat' DiskId='1' Source='xenvbd_scsiport\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.cat' />
    2.23 +                <File Id='xenvbd.inf' Name='xenvbd.inf' DiskId='1' Source='xenvbd_scsiport\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.inf' />
    2.24 +                <File Id='xenvbd.sys' Name='xenvbd.sys' DiskId='1' Source='xenvbd_scsiport\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.sys' />
    2.25 +                <File Id='xenvbdfilter.sys' Name='xenvbdfilter.sys' DiskId='1' Source='xenvbd_scsiport\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbdfilter.sys' />
    2.26                  <difx:Driver Sequence='1' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes'/>
    2.27                </Component>
    2.28              </Directory>
    2.29 +            <?else ?>
    2.30 +            <Directory Id='XenVbdDir' Name='xenvbd'>
    2.31 +              <Component Id='XenVbd' Guid='1F05DC54-974C-40f6-BF41-0EFDB3EBD1DC'>
    2.32 +                <File Id='xenvbd.cat' Name='xenvbd.cat' DiskId='1' Source='xenvbd_storport\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.cat' />
    2.33 +                <File Id='xenvbd.inf' Name='xenvbd.inf' DiskId='1' Source='xenvbd_storport\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.inf' />
    2.34 +                <File Id='xenvbd.sys' Name='xenvbd.sys' DiskId='1' Source='xenvbd_storport\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.sys' />
    2.35 +                <difx:Driver Sequence='1' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes'/>
    2.36 +              </Component>
    2.37 +            </Directory>
    2.38 +            <?endif ?>
    2.39              <?if $(env.DDK_TARGET_OS) != Win2K ?>
    2.40              <Directory Id='XenScsiDir' Name='xenscsi'>
    2.41                <Component Id='XenScsi' Guid='47C9AB48-3A7D-42b2-AE2C-7F9235C8B7B4'>
     3.1 --- a/makedist.bat	Mon Feb 11 21:04:34 2013 +1100
     3.2 +++ b/makedist.bat	Mon Feb 11 21:05:00 2013 +1100
     3.3 @@ -38,9 +38,9 @@ certutil -exportpfx -user -privatekey %C
     3.4  
     3.5  mkdir symbols\%GPLPV_VERSION%
     3.6  
     3.7 -cmd /C "%DDK_PATH_2K%\bin\setenv.bat %DDK_PATH_2K%\ chk W2K && CD /D "%PV_DIR%" && build -cZg ~xenusb ~copyconfig ~waitnopendinginstallevents && call sign.bat && call archive.bat && call wix.bat"
     3.8 +cmd /C "%DDK_PATH_2K%\bin\setenv.bat %DDK_PATH_2K%\ chk W2K && CD /D "%PV_DIR%" && build -cZg ~xenvbd_storport ~xenusb ~copyconfig ~waitnopendinginstallevents && call sign.bat && call archive.bat && call wix.bat"
     3.9  
    3.10 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WXP && CD /D "%PV_DIR%" && build -cZg && call sign.bat && call archive.bat && call wix.bat"
    3.11 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WXP && CD /D "%PV_DIR%" && build -cZg ~xenvbd_storport && call sign.bat && call archive.bat && call wix.bat"
    3.12  
    3.13  cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WNET && CD /D "%PV_DIR%" && build -cZg && call sign.bat && call archive.bat && call wix.bat"
    3.14  
    3.15 @@ -50,9 +50,9 @@ cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_P
    3.16  
    3.17  cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk x64 WLH && CD /D "%PV_DIR%" && build -cZg && call sign.bat && call archive.bat && call wix.bat"
    3.18  
    3.19 -cmd /C "%DDK_PATH_2K%\bin\setenv.bat %DDK_PATH_2K%\ fre W2K && CD /D "%PV_DIR%" && build -cZg ~xenusb ~copyconfig ~waitnopendinginstallevents && call sign.bat && call wix.bat"
    3.20 +cmd /C "%DDK_PATH_2K%\bin\setenv.bat %DDK_PATH_2K%\ fre W2K && CD /D "%PV_DIR%" && build -cZg ~xenvbd_storport ~xenusb ~copyconfig ~waitnopendinginstallevents && call sign.bat && call wix.bat"
    3.21  
    3.22 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WXP && CD /D "%PV_DIR%" && build -cZg && call sign.bat && call wix.bat"
    3.23 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WXP && CD /D "%PV_DIR%" && build -cZg ~xenvbd_storport && call sign.bat && call wix.bat"
    3.24  
    3.25  cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WNET && CD /D "%PV_DIR%" && build -cZg && call sign.bat && call wix.bat"
    3.26  
     4.1 --- a/quicksign.bat	Mon Feb 11 21:04:34 2013 +1100
     4.2 +++ b/quicksign.bat	Mon Feb 11 21:05:00 2013 +1100
     4.3 @@ -1,6 +1,6 @@
     4.4  @ECHO OFF
     4.5  
     4.6 -REM CALL set_ddk_path.bat
     4.7 +CALL set_ddk_path.bat
     4.8  
     4.9  IF %_BUILDARCH%==x86 (SET BUILDDIR=obj%BUILD_ALT_DIR%\i386) ELSE (SET BUILDDIR=obj%BUILD_ALT_DIR%\amd64)
    4.10  IF %DDK_TARGET_OS%==Win2K SET SIGN_OS=2000
    4.11 @@ -29,8 +29,9 @@ IF DEFINED CERT_CROSS_CERT_FILENAME SET 
    4.12  SET CERT_PASSWORD_FLAG=
    4.13  IF DEFINED CERT_PASSWORD SET CERT_PASSWORD_FLAG=/p %CERT_PASSWORD%
    4.14  %SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timstamp.dll xenpci\%BUILDDIR%\xenpci.sys
    4.15 -%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timstamp.dll xenvbd\%BUILDDIR%\xenvbd.sys
    4.16 +%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timstamp.dll xenvbd_scsiport\%BUILDDIR%\xenvbd.sys
    4.17  %SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timstamp.dll xenvbd_filter\%BUILDDIR%\xenvbd_filter.sys
    4.18 +%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timstamp.dll xenvbd_storport\%BUILDDIR%\xenvbd.sys
    4.19  %SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timstamp.dll xennet\%BUILDDIR%\xennet.sys
    4.20  %SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timstamp.dll xenscsi\%BUILDDIR%\xenscsi.sys
    4.21  %SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timstamp.dll xenusb\%BUILDDIR%\xenusb.sys
     5.1 --- a/sign.bat	Mon Feb 11 21:04:34 2013 +1100
     5.2 +++ b/sign.bat	Mon Feb 11 21:05:00 2013 +1100
     5.3 @@ -23,9 +23,11 @@ xcopy /D %BASEDIR%\redist\wdf\%_BUILDARC
     5.4  %DDK_PATH%\bin\selfsign\inf2cat /driver:xenpci\%BUILDDIR% /os:%SIGN_OS%
     5.5  %SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenpci\%BUILDDIR%\xenpci.cat
     5.6  
     5.7 -%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd\%BUILDDIR%\xenvbd.sys
     5.8 -%DDK_PATH%\bin\selfsign\inf2cat /driver:xenvbd\%BUILDDIR% /os:%SIGN_OS%
     5.9 -%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd\%BUILDDIR%\xenvbd.cat
    5.10 +COPY xenvbd_filter\%BUILDDIR%\xenvbdfilter.sys xenvbd_scsiport\%BUILDDIR%
    5.11 +%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd_scsiport\%BUILDDIR%\xenvbd.sys
    5.12 +%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd_scsiport\%BUILDDIR%\xenvbdfilter.sys
    5.13 +%DDK_PATH%\bin\selfsign\inf2cat /driver:xenvbd_scsiport\%BUILDDIR% /os:%SIGN_OS%
    5.14 +%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd_scsiport\%BUILDDIR%\xenvbd.cat
    5.15  
    5.16  %SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xennet\%BUILDDIR%\xennet.sys
    5.17  %DDK_PATH%\bin\selfsign\inf2cat /driver:xennet\%BUILDDIR% /os:%SIGN_OS%
    5.18 @@ -41,4 +43,10 @@ IF %DDK_TARGET_OS%==Win2K GOTO DONT_SIGN
    5.19  %DDK_PATH%\bin\selfsign\inf2cat /driver:xenusb\%BUILDDIR% /os:%SIGN_OS%
    5.20  %SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenusb\%BUILDDIR%\xenusb.cat
    5.21  
    5.22 +IF %DDK_TARGET_OS%==WinXP GOTO DONT_SIGN
    5.23 +
    5.24 +%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd_storport\%BUILDDIR%\xenvbd.sys
    5.25 +%DDK_PATH%\bin\selfsign\inf2cat /driver:xenvbd_storport\%BUILDDIR% /os:%SIGN_OS%
    5.26 +%SIGNTOOL% sign /v %CERT_CROSS_CERT_FLAG% /f %CERT_FILENAME% %CERT_PASSWORD_FLAG% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd_storport\%BUILDDIR%\xenvbd.cat
    5.27 +
    5.28  :DONT_SIGN