win-pvdrivers

changeset 819:d538e0141114 0.11.0.238

Add Windows 2000 to the build scripts and installer
author James Harper <james.harper@bendigoit.com.au>
date Sun Oct 10 10:35:01 2010 +1100 (2010-10-10)
parents 4e6f162a054c
children f611752480e4
files dirs installer.wxs makedist.bat sign.bat wix.bat
line diff
     1.1 --- a/dirs	Sun Oct 10 10:34:26 2010 +1100
     1.2 +++ b/dirs	Sun Oct 10 10:35:01 2010 +1100
     1.3 @@ -1,2 +1,2 @@
     1.4  
     1.5 -DIRS=liblfds.6 xenpci xenvbd xennet xenscsi xenusb copyconfig shutdownmon coinst waitnopendinginstallevents
     1.6 +DIRS=liblfds.6 xenpci xenvbd xennet xenscsi xenusb copyconfig shutdownmon waitnopendinginstallevents
     2.1 --- a/installer.wxs	Sun Oct 10 10:34:26 2010 +1100
     2.2 +++ b/installer.wxs	Sun Oct 10 10:35:01 2010 +1100
     2.3 @@ -23,13 +23,17 @@
     2.4      
     2.5      <Media Id='1' Cabinet='gplpv.cab' EmbedCab='yes' />
     2.6  
     2.7 +    <?if $(env.DDK_TARGET_OS) != Win2K?>
     2.8      <Binary Id='waitfordevices.vbs' SourceFile='waitnopendinginstallevents\waitfordevices.vbs'/>
     2.9      <Binary Id='waitnopendinginstallevents.exe' SourceFile='waitnopendinginstallevents\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\waitnopendinginstallevents.exe'/>
    2.10 +    <?endif?>
    2.11      <CustomAction Id='InstallShutdownMonService' FileKey='shutdownmon.exe' ExeCommand='-i' Execute='deferred' Return='check'/>
    2.12      <CustomAction Id='UnInstallShutdownMonService' FileKey='shutdownmon.exe' ExeCommand='-u' Execute='deferred' Return='check' Impersonate='no'/>
    2.13 +    <?if $(env.DDK_TARGET_OS) != Win2K ?>
    2.14      <CustomAction Id='WaitForDevices' BinaryKey='waitfordevices.vbs' VBScriptCall='DoWaitForDevices' Execute='deferred' Return='check' Impersonate='no'/>
    2.15      <CustomAction Id='WaitNoPendingInstallEvents' BinaryKey='waitnopendinginstallevents.exe' ExeCommand='300000' Execute='deferred' Return='check' Impersonate='no'/>
    2.16      <CustomAction Id='CopyConfig' FileKey='copyconfig.exe' ExeCommand='' Execute='deferred' Return='check' Impersonate='no'/>
    2.17 +    <?endif?>
    2.18  
    2.19      <Property Id="SYSTEMSTARTOPTIONS">
    2.20        <RegistrySearch Id="SystemStartOptions"
    2.21 @@ -52,9 +56,11 @@
    2.22              <Component Id='ShutdownMon' Guid='BF8DC887-4B46-4e77-ACD3-125E8A2BAB8E'>
    2.23                <File Id='shutdownmon.exe' Name='shutdownmon.exe' DiskId='1' Source='shutdownmon\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\shutdownmon.exe' />
    2.24              </Component>
    2.25 +            <?if $(env.DDK_TARGET_OS) != Win2K ?>
    2.26              <Component Id='CopyConfig' Guid='C01F8A97-1410-41ce-A16E-76E6072FDFF8'>
    2.27                <File Id='copyconfig.exe' Name='copyconfig.exe' DiskId='1' Source='copyconfig\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\copyconfig.exe' />
    2.28              </Component>
    2.29 +            <?endif ?>
    2.30            </Directory>
    2.31            <Directory Id='DocDir' Name='doc'>
    2.32              <Component Id='Docs' Guid='C827FAD8-F459-42bf-9F77-921E04261B72'>
    2.33 @@ -76,10 +82,10 @@
    2.34                  <File Id='xenvbd.cat' Name='xenvbd.cat' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.cat' />
    2.35                  <File Id='xenvbd.inf' Name='xenvbd.inf' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.inf' />
    2.36                  <File Id='xenvbd.sys' Name='xenvbd.sys' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.sys' />
    2.37 -                <File Id='xencoinst.dll' Name='xencoinst.dll' DiskId='1' Source='coinst\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\coinst.dll' />
    2.38                  <difx:Driver Sequence='1' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes'/>
    2.39                </Component>
    2.40              </Directory>
    2.41 +            <?if $(env.DDK_TARGET_OS) != Win2K ?>
    2.42              <Directory Id='XenScsiDir' Name='xenscsi'>
    2.43                <Component Id='XenScsi' Guid='47C9AB48-3A7D-42b2-AE2C-7F9235C8B7B4'>
    2.44                  <File Id='xenscsi.cat' Name='xenscsi.cat' DiskId='1' Source='xenscsi\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenscsi.cat' />
    2.45 @@ -106,6 +112,7 @@
    2.46                  <difx:Driver Sequence='3' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes' />
    2.47                </Component>
    2.48              </Directory>
    2.49 +            <?endif ?>
    2.50            </Directory>
    2.51          </Directory>
    2.52          <Component Id='Cert' Guid='11112EC8-8635-45fb-9AE8-C22310F1E82D'>
    2.53 @@ -131,6 +138,7 @@
    2.54        <Feature Id='XenVbd' Title='XenVbd Driver' Level='1' AllowAdvertise='no' InstallDefault='local' Absent='allow'>
    2.55          <ComponentRef Id='XenVbd' />
    2.56        </Feature>
    2.57 +      <?if $(env.DDK_TARGET_OS) != Win2K ?>
    2.58        <Feature Id='XenScsi' Title='XenScsi Driver' Level='1' AllowAdvertise='no' InstallDefault='local' Absent='allow'>
    2.59          <ComponentRef Id='XenScsi' />
    2.60        </Feature>
    2.61 @@ -140,21 +148,26 @@
    2.62        <Feature Id='XenUsb' Title='XenUsb Driver' Level='1' AllowAdvertise='no' InstallDefault='local' Absent='allow'>
    2.63          <ComponentRef Id='XenUsb' />
    2.64        </Feature>
    2.65 +      <?endif ?>
    2.66      </Feature>
    2.67      <Feature Id='ShutdownMon' Title='Shutdown Monitor' Level='1' AllowAdvertise='no' InstallDefault='local' Absent='allow'>
    2.68        <ComponentRef Id='ShutdownMon' />
    2.69      </Feature>
    2.70 +    <?if $(env.DDK_TARGET_OS) != Win2K ?>
    2.71      <Feature Id='CopyConfig' Title='Copy Network Config' Level='1' AllowAdvertise='no' InstallDefault='local' Absent='allow'>
    2.72        <ComponentRef Id='CopyConfig' />
    2.73      </Feature>
    2.74 +    <?endif ?>
    2.75  
    2.76      <InstallExecuteSequence>
    2.77        <ScheduleReboot After='InstallFinalize' />
    2.78        <Custom Action='UnInstallShutdownMonService' Before='StopServices'>$ShutdownMon=2</Custom> 
    2.79        <Custom Action='InstallShutdownMonService' After='StartServices'>$ShutdownMon>2</Custom> 
    2.80 +      <?if $(env.DDK_TARGET_OS) != Win2K ?>
    2.81        <Custom Action='WaitForDevices' After='MsiProcessDrivers'>1</Custom>
    2.82        <Custom Action='WaitNoPendingInstallEvents' After='WaitForDevices'>1</Custom>
    2.83        <Custom Action='CopyConfig' After='WaitNoPendingInstallEvents'>$CopyConfig>2</Custom>
    2.84 +      <?endif?>
    2.85      </InstallExecuteSequence>
    2.86    </Product>
    2.87  </Wix>
     3.1 --- a/makedist.bat	Sun Oct 10 10:34:26 2010 +1100
     3.2 +++ b/makedist.bat	Sun Oct 10 10:35:01 2010 +1100
     3.3 @@ -1,5 +1,6 @@
     3.4  @echo off
     3.5  IF NOT EXIST set_ddk_path.bat ECHO >set_ddk_path.bat SET DDK_PATH=C:\WinDDK\7600.16385.0
     3.6 +IF NOT EXIST set_ddk_path_2k.bat ECHO >set_ddk_path_2k.bat SET DDK_PATH_2K=C:\WinDDK\6001.18002
     3.7  
     3.8  SET VERSION=0.11.0
     3.9  SET BUILD_NUMBER=0
    3.10 @@ -13,6 +14,7 @@ ECHO >build_number.bat SET BUILD_NUMBER=
    3.11  ECHO BUILDING %GPLPV_VERSION%
    3.12  
    3.13  CALL set_ddk_path.bat
    3.14 +CALL set_ddk_path_2K.bat
    3.15  
    3.16  SET PV_DIR=%CD%
    3.17  
    3.18 @@ -27,6 +29,8 @@ IF NOT EXIST gplpv.cer "%DDK_PATH%"\bin\
    3.19  
    3.20  mkdir symbols\%GPLPV_VERSION%
    3.21  
    3.22 +cmd /C "%DDK_PATH_2K%\bin\setenv.bat %DDK_PATH_2K%\ chk W2K && CD /D "%PV_DIR%" && build -cZg ~xennet ~copyconfig ~xenusb ~waitnopendinginstallevents && call sign.bat && call archive.bat && call wix.bat"
    3.23 +
    3.24  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.25  
    3.26  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.27 @@ -37,6 +41,8 @@ cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_P
    3.28  
    3.29  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.30  
    3.31 +cmd /C "%DDK_PATH_2K%\bin\setenv.bat %DDK_PATH_2K%\ fre W2K && CD /D "%PV_DIR%" && build -cZg ~xennet ~copyconfig ~xenusb ~waitnopendinginstallevents && call sign.bat && call wix.bat"
    3.32 +
    3.33  cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WXP && CD /D "%PV_DIR%" && build -cZg && call sign.bat && call wix.bat"
    3.34  
    3.35  cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WNET && CD /D "%PV_DIR%" && build -cZg && call sign.bat && call wix.bat"
     4.1 --- a/sign.bat	Sun Oct 10 10:34:26 2010 +1100
     4.2 +++ b/sign.bat	Sun Oct 10 10:35:01 2010 +1100
     4.3 @@ -1,5 +1,6 @@
     4.4  @ECHO OFF
     4.5  IF %_BUILDARCH%==x86 (SET BUILDDIR=obj%BUILD_ALT_DIR%\i386) ELSE (SET BUILDDIR=obj%BUILD_ALT_DIR%\amd64)
     4.6 +IF %DDK_TARGET_OS%==Win2K SET SIGN_OS=2000
     4.7  IF %DDK_TARGET_OS%==WinXP SET SIGN_OS=XP_X86
     4.8  IF %DDK_TARGET_OS%%_BUILDARCH%==WinNETx86 SET SIGN_OS=Server2003_X86
     4.9  IF %DDK_TARGET_OS%%_BUILDARCH%==WinNETAMD64 SET SIGN_OS=XP_X64,Server2003_X64
    4.10 @@ -11,9 +12,6 @@ ECHO _BUILDARCH=%_BUILDARCH%
    4.11  ECHO BUILDDIR=%BUILDDIR%
    4.12  ECHO SIGN_OS=%SIGN_OS%
    4.13  
    4.14 -xcopy /D coinst\%BUILDDIR%\coinst.dll xenvbd\%BUILDDIR%
    4.15 -move xenvbd\%BUILDDIR%\coinst.dll xenvbd\%BUILDDIR%\xencoinst.dll
    4.16 -
    4.17  for /F %%x in ('DIR /B %BASEDIR%\redist\wdf\%_BUILDARCH%\WdfCoInstaller?????.dll') do set WDFFILENAME=%%x
    4.18  xcopy /D %BASEDIR%\redist\wdf\%_BUILDARCH%\%WDFFILENAME% xenpci\%BUILDDIR%
    4.19  xcopy /D %BASEDIR%\redist\wdf\%_BUILDARCH%\%WDFFILENAME% xenusb\%BUILDDIR%
    4.20 @@ -22,14 +20,12 @@ xcopy /D %BASEDIR%\redist\wdf\%_BUILDARC
    4.21  %DDK_PATH%\bin\selfsign\inf2cat /driver:xenpci\%BUILDDIR% /os:%SIGN_OS%
    4.22  %SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xenpci\%BUILDDIR%\xenpci.cat
    4.23  
    4.24 -%SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xennet\%BUILDDIR%\xennet.sys
    4.25 -%DDK_PATH%\bin\selfsign\inf2cat /driver:xennet\%BUILDDIR% /os:%SIGN_OS%
    4.26 -%SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xennet\%BUILDDIR%\xennet.cat
    4.27 -
    4.28 -%SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd\%BUILDDIR%\xenvbd.sys xenvbd\%BUILDDIR%\xencoinst.dll
    4.29 +%SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd\%BUILDDIR%\xenvbd.sys
    4.30  %DDK_PATH%\bin\selfsign\inf2cat /driver:xenvbd\%BUILDDIR% /os:%SIGN_OS%
    4.31  %SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xenvbd\%BUILDDIR%\xenvbd.cat
    4.32  
    4.33 +IF %DDK_TARGET_OS%==Win2K GOTO DONT_SIGN
    4.34 +
    4.35  %SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xenscsi\%BUILDDIR%\xenscsi.sys
    4.36  %DDK_PATH%\bin\selfsign\inf2cat /driver:xenscsi\%BUILDDIR% /os:%SIGN_OS%
    4.37  %SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xenscsi\%BUILDDIR%\xenscsi.cat
    4.38 @@ -38,4 +34,9 @@ xcopy /D %BASEDIR%\redist\wdf\%_BUILDARC
    4.39  %DDK_PATH%\bin\selfsign\inf2cat /driver:xenusb\%BUILDDIR% /os:%SIGN_OS%
    4.40  %SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xenusb\%BUILDDIR%\xenusb.cat
    4.41  
    4.42 +%SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xennet\%BUILDDIR%\xennet.sys
    4.43 +%DDK_PATH%\bin\selfsign\inf2cat /driver:xennet\%BUILDDIR% /os:%SIGN_OS%
    4.44 +%SIGNTOOL% sign /v /s PrivateCertStore /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll xennet\%BUILDDIR%\xennet.cat
    4.45 +
    4.46 +
    4.47  :DONT_SIGN
     5.1 --- a/wix.bat	Sun Oct 10 10:34:26 2010 +1100
     5.2 +++ b/wix.bat	Sun Oct 10 10:35:01 2010 +1100
     5.3 @@ -7,6 +7,8 @@ IF "%_BUILDARCH%"=="x86" (SET MSIARCH=x3
     5.4  IF "%DDKBUILDENV%"=="chk" (SET MSIBUILD=_debug) ELSE (SET MSIBUILD=)
     5.5  
     5.6  SET MSIOS=%DDK_TARGET_OS%
     5.7 +IF "%DDK_TARGET_OS%"=="Win2K" (SET MSIOS=2000)
     5.8 +IF "%DDK_TARGET_OS%"=="Win2K" (SET MSIARCH=)
     5.9  IF "%DDK_TARGET_OS%"=="WinXP" (SET MSIOS=XP)
    5.10  IF "%DDK_TARGET_OS%"=="WinXP" (SET MSIARCH=)
    5.11  IF "%DDK_TARGET_OS%"=="WinNET" (SET MSIOS=2003)