win-pvdrivers

changeset 316:b475a6ad8b0c

fixes to signing scripts
author James Harper <james.harper@bendigoit.com.au>
date Tue Jun 17 14:08:37 2008 +1000 (2008-06-17)
parents a37206f28587
children 0c6ea46f2199
files common.inc installer.nsi makedist.bat sign_config.bat.template xenpci/xenpci.inx
line diff
     1.1 --- a/common.inc	Tue Jun 17 10:39:48 2008 +1000
     1.2 +++ b/common.inc	Tue Jun 17 14:08:37 2008 +1000
     1.3 @@ -1,4 +1,4 @@
     1.4 -VERSION=0.9.9.2
     1.5 +VERSION=0.9.9.3
     1.6  TARGETPATH=..\Target\$(DDK_TARGET_OS)
     1.7  MSC_WARNING_LEVEL=/W4
     1.8  INCLUDES = ..\common\include;..\common\include\public
     2.1 --- a/installer.nsi	Tue Jun 17 10:39:48 2008 +1000
     2.2 +++ b/installer.nsi	Tue Jun 17 14:08:37 2008 +1000
     2.3 @@ -3,7 +3,7 @@
     2.4  
     2.5  !define AppName "Xen PV Drivers"
     2.6  !define StartMenu "$SMPROGRAMS\${AppName}"
     2.7 -!define Version "0.9.10-pre1"
     2.8 +!define Version "0.9.10-pre3"
     2.9  #!define Version "$%VERSION%"
    2.10  Name "${AppName}"
    2.11  InstallDir "$PROGRAMFILES\${AppName}"
    2.12 @@ -52,6 +52,8 @@ Section "Shutdown Monitor Service" shutd
    2.13  SectionEnd
    2.14    
    2.15  Section "Windows 2000" win2k
    2.16 +  SetOutPath $INSTDIR
    2.17 +  File .\ca.cer
    2.18    SetOutPath $INSTDIR\drivers
    2.19    File .\target\win2k\xenpci.inf
    2.20    File .\target\win2k\xennet.inf
    2.21 @@ -69,6 +71,8 @@ Section "Windows 2000" win2k
    2.22  SectionEnd
    2.23  
    2.24  Section "Windows XP" winxp
    2.25 +  SetOutPath $INSTDIR
    2.26 +  File .\ca.cer
    2.27    SetOutPath $INSTDIR\drivers
    2.28    File .\target\winxp\xenpci.inf
    2.29    File .\target\winxp\xennet.inf
    2.30 @@ -87,6 +91,8 @@ Section "Windows XP" winxp
    2.31  SectionEnd
    2.32  
    2.33  Section "Windows 2003 x32" win2k3x32
    2.34 +  SetOutPath $INSTDIR
    2.35 +  File .\ca.cer
    2.36    SetOutPath $INSTDIR\drivers
    2.37    File .\target\winnet\xenpci.inf
    2.38    File .\target\winnet\xennet.inf
    2.39 @@ -105,6 +111,8 @@ Section "Windows 2003 x32" win2k3x32
    2.40  SectionEnd
    2.41  
    2.42  Section "Windows 2003 x64" win2k3x64
    2.43 +  SetOutPath $INSTDIR
    2.44 +  File .\ca.cer
    2.45    SetOutPath $INSTDIR\drivers
    2.46    File .\target\winnet\xenpci.inf
    2.47    File .\target\winnet\xennet.inf
    2.48 @@ -123,6 +131,8 @@ Section "Windows 2003 x64" win2k3x64
    2.49  SectionEnd
    2.50  
    2.51  Section "Windows 2008 x32" win2k8x32
    2.52 +  SetOutPath $INSTDIR
    2.53 +  File .\ca.cer
    2.54    SetOutPath $INSTDIR\drivers
    2.55    File .\target\winlh\xenpci.inf
    2.56    File .\target\winlh\xennet.inf
    2.57 @@ -141,6 +151,8 @@ Section "Windows 2008 x32" win2k8x32
    2.58  SectionEnd
    2.59  
    2.60  Section "Windows 2008 x64" win2k8x64
    2.61 +  SetOutPath $INSTDIR
    2.62 +  File .\ca.cer
    2.63    SetOutPath $INSTDIR\drivers
    2.64    File .\target\winlh\xenpci.inf
    2.65    File .\target\winlh\xennet.inf
    2.66 @@ -158,6 +170,9 @@ Section "Windows 2008 x64" win2k8x64
    2.67    File .\target\winlh\amd64\xenconfig.sys
    2.68  SectionEnd
    2.69  
    2.70 +Section /o "Install Cert" installcert
    2.71 +  ExecWait 'rundll32.exe cryptext.dll,CryptExtAddCER $INSTDIR\ca.cer'
    2.72 +
    2.73  Section "Install Drivers" installdrivers
    2.74    Push "$INSTDIR\drivers"
    2.75    Push "$INSTDIR\drivers\xenpci.inf"
     3.1 --- a/makedist.bat	Tue Jun 17 10:39:48 2008 +1000
     3.2 +++ b/makedist.bat	Tue Jun 17 14:08:37 2008 +1000
     3.3 @@ -22,4 +22,9 @@ cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_P
     3.4  CALL sign_sys.bat winlh amd64 Server2008_X64
     3.5  CALL sign_inf.bat winlh Server2008_X64
     3.6  
     3.7 +IF NOT EXIST SIGN_CONFIG.BAT GOTO DONT_SIGN
     3.8 +CALL SIGN_CONFIG.BAT
     3.9 +%DDK_PATH%\bin\selfsign\certmgr -put -r %CA_CERT_LOCATION% -c -s %CA_CERT_STORE% -n %CA_CERT_NAME% ca.cer
    3.10 +:DONT_SIGN
    3.11 +
    3.12  "%ProgramFiles%\NSIS\makensis.exe" installer.nsi
     4.1 --- a/sign_config.bat.template	Tue Jun 17 10:39:48 2008 +1000
     4.2 +++ b/sign_config.bat.template	Tue Jun 17 14:08:37 2008 +1000
     4.3 @@ -1,2 +1,6 @@
     4.4  SET CERT_NAME=friendly name of your certificate
     4.5 -SET CA_CERT_NAME=name of your CA cert
     4.6 +
     4.7 +SET CA_CERT_NAME=friendly name of your CA cert
     4.8 +SET CA_CERT_STORE=store of your CA cert (maybe root)
     4.9 +SET CA_CERT_LOCATION=currentUser
    4.10 +REM SET CA_CERT_LOCATION=localMachine
     5.1 --- a/xenpci/xenpci.inx	Tue Jun 17 10:39:48 2008 +1000
     5.2 +++ b/xenpci/xenpci.inx	Tue Jun 17 14:08:37 2008 +1000
     5.3 @@ -14,6 +14,7 @@ ExcludeFromSelect=*
     5.4  [Manufacturer]
     5.5  %XenGplPv%=XenGplPv,NTx86
     5.6  %XenGplPv%=XenGplPv,NTamd64
     5.7 +%XenGplPv%=XenGplPv
     5.8  
     5.9  [XenGplPv.NTx86]
    5.10  %XenPCI.DRVDESC%=XenPCI_Inst, PCI\VEN_5853&DEV_0001
    5.11 @@ -21,6 +22,9 @@ ExcludeFromSelect=*
    5.12  [XenGplPv.NTAMD64]
    5.13  %XenPCI.DRVDESC%=XenPCI_Inst, PCI\VEN_5853&DEV_0001
    5.14  
    5.15 +[XenGplPv]
    5.16 +%XenPCI.DRVDESC%=XenPCI_Inst, PCI\VEN_5853&DEV_0001
    5.17 +
    5.18  [XenPCI_Inst.NT]
    5.19  CopyFiles=XenPCI.CopyFiles
    5.20  
    5.21 @@ -38,6 +42,9 @@ 1 = %DISK_NAME%,,,.\i386
    5.22  [SourceDisksNames.amd64]
    5.23  1 = %DISK_NAME%,,,.\amd64
    5.24  
    5.25 +[SourceDisksNames]
    5.26 +1 = %DISK_NAME%,,,.\i386
    5.27 +
    5.28  [XenPCI_Inst.NT.Services]
    5.29  AddService=XenPCI,2,XenPCI_Service
    5.30  AddService=XenHide,0,XenHide_Service