Skip to content
This repository was archived by the owner on May 16, 2024. It is now read-only.

Commit a69dea3

Browse files
metsmaTelgat
metsma
authored and
Telgat
committed
Package new drivers
Signed-off-by: Raul Metsma <[email protected]>
1 parent c6f8dc2 commit a69dea3

File tree

2 files changed

+34
-80
lines changed

2 files changed

+34
-80
lines changed

‎buildmsi.ps1‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,28 @@
22
param(
33
[string]$candle = "$env:WIX\bin\candle.exe",
44
[string]$light = "$env:WIX\bin\light.exe",
5-
[string]$msiversion = "3.11.0.1175",
5+
[string]$msiversion = "3.12.0.77",
66
[string]$sign = $null
77
)
88

99
$cwd = Split-Path $MyInvocation.MyCommand.Path
1010
$shell = new-object -com shell.application
11+
mkdir -Force -Path "minidriver\W10"
12+
mkdir -Force -Path "minidriver\PreW10"
13+
foreach($item in $shell.NameSpace("$cwd\esteidcm_$($msiversion)-W10.zip").items()) {
14+
$shell.Namespace("$cwd\minidriver\W10").CopyHere($item,0x14)
15+
}
16+
foreach($item in $shell.NameSpace("$cwd\esteidcm_$($msiversion)-PreW10.zip").items()) {
17+
$shell.Namespace("$cwd\minidriver\PreW10").CopyHere($item,0x14)
18+
}
1119
foreach($platform in @("x86", "x64")) {
12-
foreach($version in @("7", "8", "8.1")) {
13-
mkdir -Force -Path "minidriver\$version$platform"
14-
foreach($item in $shell.NameSpace("$cwd\esteidcm.$($msiversion)_win$version$platform.zip").items()) {
15-
$shell.Namespace("$cwd\minidriver\$version$platform").CopyHere($item,0x14)
16-
}
17-
}
18-
foreach($version in @("10")) {
19-
mkdir -Force -Path "minidriver\$version$platform"
20-
& expand.exe .\esteidcm.$($msiversion)_win$version$platform.cab -F:* "minidriver\$version$platform"
21-
}
2220
& $candle -nologo minidriver.wxs "-dPlatform=$platform" "-dMSI_VERSION=$msiversion" `
2321
-arch $platform -ext WixDifxAppExtension
24-
& $light -nologo -out "minidriver_$msiversion.$platform.msi" -ext WixUIExtension -ext WixDifxAppExtension `
22+
& $light -nologo -out "minidriver-$msiversion.$platform.msi" -ext WixUIExtension -ext WixDifxAppExtension `
2523
"-dWixUILicenseRtf=LICENSE.rtf" "-dWixUIDialogBmp=dlgbmp.bmp" "-dWixUIBannerBmp=banner.bmp" `
2624
"$env:WIX\bin\difxapp_$platform.wixlib" minidriver.wixobj
2725
if($sign) {
2826
& signtool.exe sign /a /v /s MY /n "$sign" /fd SHA256 /du http://installer.id.ee `
29-
/t http://timestamp.verisign.com/scripts/timstamp.dll "minidriver_$msiversion.$platform.msi"
27+
/t http://timestamp.verisign.com/scripts/timstamp.dll "minidriver-$msiversion.$platform.msi"
3028
}
3129
}

‎minidriver.wxs‎

Lines changed: 23 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -59,82 +59,44 @@
5959

6060
<Directory Id='$(var.PlatformProgramFilesFolder)'>
6161
<Directory Id="APPLICATIONFOLDER" Name="EstEID Minidriver">
62-
<Component Id="miniDriverW7" Guid="14397c62-610a-41ee-8168-a70757e71cdc">
63-
<Condition><![CDATA[(VersionNT = 601)]]></Condition>
64-
<File Id="esteidcmINFW7x86" Source="minidriver\7$(var.Platform)\Package\esteidcm.inf" KeyPath="yes"/>
65-
<File Id="esteidcm64CATW7x86" Source="minidriver\7$(var.Platform)\Package\esteidcm64.cat" />
66-
<File Id="esteidcmCATW7x86" Source="minidriver\7$(var.Platform)\Package\esteidcm.cat" />
67-
<difx:Driver PlugAndPlayPrompt="no" ForceInstall="yes"/>
68-
</Component>
69-
<Component Id="miniDriverW8" Guid="1dde947d-1341-48ff-888a-f77bb830bc47">
70-
<Condition><![CDATA[(VersionNT = 602)]]></Condition>
71-
<File Id="esteidcmINFW8x86" Source="minidriver\8$(var.Platform)\Package\esteidcm.inf" KeyPath="yes"/>
72-
<File Id="esteidcmCATW8x86" Source="minidriver\8$(var.Platform)\Package\esteidcm.cat" />
73-
<File Id="esteidcm64CATW8x86" Source="minidriver\8$(var.Platform)\Package\esteidcm64.cat" />
74-
<difx:Driver PlugAndPlayPrompt="no" ForceInstall="yes"/>
75-
</Component>
76-
<Component Id="miniDriverW8.1" Guid="2518d5aa-abbe-4abf-b2f9-d56cb66b855d">
77-
<Condition><![CDATA[(VersionNT = 603 AND NOT USER32VERSION)]]></Condition>
78-
<File Id="esteidcmINFW8.1x86" Source="minidriver\8.1$(var.Platform)\Package\esteidcm.inf" KeyPath="yes"/>
79-
<File Id="esteidcmCATW8.1x86" Source="minidriver\8.1$(var.Platform)\Package\esteidcm.cat" />
80-
<File Id="esteidcm64CATW8.1x86" Source="minidriver\8.1$(var.Platform)\Package\esteidcm64.cat" />
62+
<Component Id="miniDriverPreW10" Guid="2518d5aa-abbe-4abf-b2f9-d56cb66b855d">
63+
<Condition><![CDATA[(NOT USER32VERSION)]]></Condition>
64+
<File Id="esteidcmINFPreW10" Source="minidriver\PreW10\esteidcm.inf" KeyPath="yes"/>
65+
<File Id="esteidcmCATPreW10" Source="minidriver\PreW10\esteidcm.cat" />
66+
<File Id="esteidcm64CATPreW10" Source="minidriver\PreW10\esteidcm64.cat" />
8167
<difx:Driver PlugAndPlayPrompt="no" ForceInstall="yes"/>
8268
</Component>
8369
<Component Id="miniDriverW10" Guid="b862d285-abe9-4f3d-a057-59542496d27a">
8470
<Condition><![CDATA[(USER32VERSION)]]></Condition>
85-
<File Id="esteidcmINFW10x86" Source="minidriver\10$(var.Platform)\esteidcm.inf" KeyPath="yes"/>
86-
<File Id="esteidcmCATW10x86" Source="minidriver\10$(var.Platform)\esteidcm.cat" />
87-
<File Id="esteidcm64CATW10x86" Source="minidriver\10$(var.Platform)\esteidcm64.cat" />
71+
<File Id="esteidcmINFW10" Source="minidriver\W10\esteidcm.inf" KeyPath="yes"/>
72+
<File Id="esteidcmCATW10" Source="minidriver\W10\esteidcm.cat" />
73+
<File Id="esteidcm64CATW10" Source="minidriver\W10\esteidcm64.cat" />
8874
<difx:Driver PlugAndPlayPrompt="no" ForceInstall="yes"/>
8975
</Component>
9076

9177
<Directory Id="minidriver_x64" Name="x64">
92-
<Component Id="miniDriverW7x64Components" Guid="8892d9d5-aaf9-4d2d-a1d7-f0ce4eea4b45">
93-
<Condition><![CDATA[(VersionNT = 601)]]></Condition>
94-
<File Id="esteidcmW7x64DLL" Source="minidriver\7$(var.Platform)\Package\x64\esteidcm_64.dll" />
95-
<File Id="atrfiltrW7x64DLL" Source="minidriver\7$(var.Platform)\Package\x64\atrfiltr_64.sys" />
96-
</Component>
97-
<Component Id="miniDriverW8x64Components" Guid="a7f5404f-e9c4-4401-98f4-1027b9b85955">
98-
<Condition><![CDATA[(VersionNT = 602)]]></Condition>
99-
<File Id="esteidcmW8x64DLL" Source="minidriver\8$(var.Platform)\Package\x64\esteidcm_64.dll" />
100-
<File Id="atrfiltrW8x64DLL" Source="minidriver\8$(var.Platform)\Package\x64\atrfiltr_64.sys" />
101-
</Component>
102-
<Component Id="miniDriverW8.1x64Components" Guid="c0796738-8525-40e8-bfb0-ae99e17172ec">
103-
<Condition><![CDATA[(VersionNT = 603 AND NOT USER32VERSION)]]></Condition>
104-
<File Id="esteidcmW8.1x64DLL" Source="minidriver\8.1$(var.Platform)\Package\x64\esteidcm_64.dll" />
105-
<File Id="atrfiltrW8.1x64DLL" Source="minidriver\8.1$(var.Platform)\Package\x64\atrfiltr_64.sys" />
78+
<Component Id="miniDriverPreW10x64Components" Guid="c0796738-8525-40e8-bfb0-ae99e17172ec">
79+
<Condition><![CDATA[(NOT USER32VERSION)]]></Condition>
80+
<File Id="esteidcm64DLLPreW10" Source="minidriver\PreW10\x64\esteidcm_64.dll" />
81+
<File Id="atrfiltr64DLLPreW10" Source="minidriver\PreW10\x64\atrfiltr_64.sys" />
10682
</Component>
10783
<Component Id="miniDriverW10x64Components" Guid="1afa6d46-7d49-4ae7-a362-e38620bc6f10">
10884
<Condition><![CDATA[(USER32VERSION)]]></Condition>
109-
<File Id="esteidcmW10x64DLL" Source="minidriver\10$(var.Platform)\x64\esteidcm_64.dll" />
110-
<File Id="atrfiltrW10x64DLL" Source="minidriver\10$(var.Platform)\x64\atrfiltr_64.sys" />
111-
<File Id="msvcp90W10x64DLL" Source="minidriver\10$(var.Platform)\x64\msvcp90_64.dll" />
112-
<File Id="msvcr90W10x64DLL" Source="minidriver\10$(var.Platform)\x64\msvcr90_64.dll" />
85+
<File Id="esteidcm64DLLW10" Source="minidriver\W10\x64\esteidcm_64.dll" />
86+
<File Id="atrfiltr64DLLW10" Source="minidriver\W10\x64\atrfiltr_64.sys" />
11387
</Component>
11488
</Directory>
11589

11690
<Directory Id="minidriver_x86" Name="x86">
117-
<Component Id="miniDriverW7x86Components" Guid="d358fad6-06e9-45cd-aec8-adcc8acbb11f">
118-
<Condition><![CDATA[(VersionNT = 601)]]></Condition>
119-
<File Id="esteidcmW7x86DLL" Source="minidriver\7$(var.Platform)\Package\x86\esteidcm_32.dll" />
120-
<File Id="atrfiltrW7x86DLL" Source="minidriver\7$(var.Platform)\Package\x86\atrfiltr_32.sys" />
121-
</Component>
122-
<Component Id="miniDriverW8x86Components" Guid="de0d45d7-f352-4cc7-9d39-3e79c17a6d9d">
123-
<Condition><![CDATA[(VersionNT = 602)]]></Condition>
124-
<File Id="esteidcmW8x86DLL" Source="minidriver\8$(var.Platform)\Package\x86\esteidcm_32.dll" />
125-
<File Id="atrfiltrW8x86DLL" Source="minidriver\8$(var.Platform)\Package\x86\atrfiltr_32.sys" />
126-
</Component>
127-
<Component Id="miniDriverW8.1x86Components" Guid="b3478d0c-b848-41fc-a3c7-4532253b60f1">
128-
<Condition><![CDATA[(VersionNT = 603 AND NOT USER32VERSION)]]></Condition>
129-
<File Id="esteidcmW8.1x86DLL" Source="minidriver\8.1$(var.Platform)\Package\x86\esteidcm_32.dll" />
130-
<File Id="atrfiltrW8.1x86DLL" Source="minidriver\8.1$(var.Platform)\Package\x86\atrfiltr_32.sys" />
91+
<Component Id="miniDriverPreW10x86Components" Guid="b3478d0c-b848-41fc-a3c7-4532253b60f1">
92+
<Condition><![CDATA[(NOT USER32VERSION)]]></Condition>
93+
<File Id="esteidcm86DLLPreW10" Source="minidriver\PreW10\x86\esteidcm_32.dll" />
94+
<File Id="atrfiltr86DLLPreW10" Source="minidriver\PreW10\x86\atrfiltr_32.sys" />
13195
</Component>
13296
<Component Id="miniDriverW10x86Components" Guid="70ef6f86-532a-4924-a747-35306a3adbdb">
13397
<Condition><![CDATA[(USER32VERSION)]]></Condition>
134-
<File Id="esteidcmW10x86DLL" Source="minidriver\10$(var.Platform)\x86\esteidcm_32.dll" />
135-
<File Id="atrfiltrW10x86DLL" Source="minidriver\10$(var.Platform)\x86\atrfiltr_32.sys" />
136-
<File Id="msvcp90W10x86DLL" Source="minidriver\10$(var.Platform)\x86\msvcp90_32.dll" />
137-
<File Id="msvcr90W10x86DLL" Source="minidriver\10$(var.Platform)\x86\msvcr90_32.dll" />
98+
<File Id="esteidcm86DLLW10" Source="minidriver\W10\x86\esteidcm_32.dll" />
99+
<File Id="atrfiltr86DLLW10" Source="minidriver\W10\x86\atrfiltr_32.sys" />
138100
</Component>
139101
</Directory>
140102
</Directory>
@@ -158,16 +120,10 @@
158120
<?endif ?>
159121

160122
<Feature Id="minidriver" Title="Estonian Minidriver">
161-
<ComponentRef Id="miniDriverW7"/>
162-
<ComponentRef Id="miniDriverW8"/>
163-
<ComponentRef Id="miniDriverW8.1"/>
123+
<ComponentRef Id="miniDriverPreW10"/>
164124
<ComponentRef Id="miniDriverW10"/>
165-
<ComponentRef Id="miniDriverW7x86Components"/>
166-
<ComponentRef Id="miniDriverW7x64Components"/>
167-
<ComponentRef Id="miniDriverW8x86Components"/>
168-
<ComponentRef Id="miniDriverW8x64Components"/>
169-
<ComponentRef Id="miniDriverW8.1x86Components"/>
170-
<ComponentRef Id="miniDriverW8.1x64Components"/>
125+
<ComponentRef Id="miniDriverPreW10x86Components"/>
126+
<ComponentRef Id="miniDriverPreW10x64Components"/>
171127
<ComponentRef Id="miniDriverW10x86Components"/>
172128
<ComponentRef Id="miniDriverW10x64Components"/>
173129
<?if $(var.Platform) = "x64" ?>

0 commit comments

Comments
 (0)