win-pvdrivers

changeset 753:83dd32e63133 0.11.0.202

Detect if testsigning is on on Vista and above (x64 only)
Added testsign cert to Trusted Publishers so no user prompt under Vista and above
author James Harper <james.harper@bendigoit.com.au>
date Sun Jan 10 10:15:07 2010 +1100 (2010-01-10)
parents 2ecb5104c33a
children d5606c9b1b78
files installer.wxs
line diff
     1.1 --- a/installer.wxs	Sun Jan 10 10:14:07 2010 +1100
     1.2 +++ b/installer.wxs	Sun Jan 10 10:15:07 2010 +1100
     1.3 @@ -31,6 +31,20 @@
     1.4      <CustomAction Id='WaitNoPendingInstallEvents' BinaryKey='waitnopendinginstallevents.exe' ExeCommand='300000' Execute='deferred' Return='check'/>
     1.5      <CustomAction Id='CopyConfig' FileKey='copyconfig.exe' ExeCommand='' Execute='deferred' Return='check'/>
     1.6  
     1.7 +    <Property Id="SYSTEMSTARTOPTIONS">
     1.8 +      <RegistrySearch Id="SystemStartOptions"
     1.9 +		    Root="HKLM"
    1.10 +		    Key="SYSTEM\CurrentControlSet\Control"
    1.11 +		    Name="SystemStartOptions"
    1.12 +		    Type="raw" />
    1.13 +    </Property>
    1.14 +
    1.15 +    <?if $(env._BUILDARCH) = AMD64 ?>
    1.16 +      <Condition Message="Testsigning must be on for x64 when installing on Vista or newer.">
    1.17 +        <![CDATA[(VersionNT < 600) OR (SYSTEMSTARTOPTIONS >< "/TESTSIGNING")]]>
    1.18 +      </Condition>
    1.19 +    <?endif ?>
    1.20 +
    1.21      <Directory Id='TARGETDIR' Name='SourceDir'>
    1.22        <Directory Id='ProgramFilesFolder' Name='PFiles'>
    1.23          <Directory Id='XenProgramFilesDir' Name='Xen PV Drivers'>
    1.24 @@ -96,7 +110,8 @@
    1.25          </Directory>
    1.26          <Component Id='Cert' Guid='11112EC8-8635-45fb-9AE8-C22310F1E82D'>
    1.27            <File Id='gplpv.cer' Name='gplpv.cer' DiskId='1' Source='gplpv.cer' />
    1.28 -          <iis:Certificate Id='gplpv.cer' Name='gplpv.cer' Request='no' BinaryKey='gplpv.cer' StoreLocation='localMachine' StoreName='root' Overwrite='no' />
    1.29 +          <iis:Certificate Id='gplpv.cer_root' Name='gplpv.cer' Request='no' BinaryKey='gplpv.cer' StoreLocation='localMachine' StoreName='root' Overwrite='no' />
    1.30 +          <iis:Certificate Id='gplpv.cer_trustedPublisher' Name='gplpv.cer' Request='no' BinaryKey='gplpv.cer' StoreLocation='localMachine' StoreName='trustedPublisher' Overwrite='no' />
    1.31          </Component>
    1.32        </Directory>
    1.33      </Directory>