Skip to content

Commit 539685c

Browse files
metsmametsma
authored
Include Web-eid support (#66)
WE2-163, WE2-378, IB-7218, IB-7234 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent a87e035 commit 539685c

File tree

7 files changed

+56
-90
lines changed

7 files changed

+56
-90
lines changed

‎HyperlinkSidebarTheme.en.wxl‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,12 @@
6464
<String Id="OptionsDesktop">Create ID-software icons on my desktop</String>
6565
<String Id="OptionsStartMenu">Create ID-card software icons in my Start Menu Programs folder</String>
6666
<String Id="qdigidoc4">DigiDoc4 Client</String>
67-
<String Id="ieplugin">Internet Explorer browser signing support</String>
68-
<String Id="chromeplugin">Chrome signing support</String>
69-
<String Id="chromepluginpolicy">Chrome signing plug-in will be activated automatically</String>
70-
<String Id="firefoxplugin">Firefox signing and authentication support</String>
67+
<String Id="chromeplugin">Chrome authentication and signing support</String>
68+
<String Id="chromepluginpolicy">Chrome extension will be activated automatically</String>
69+
<String Id="firefoxplugin">Firefox authentication and signing support</String>
7170
<String Id="minidriver">Estonian ID-card support</String>
7271
<String Id="certsynchronizer">Delete the ID-card certificates from the computer upon removing the card</String>
73-
<String Id="edgeplugin">Edge Chromium signing support</String>
74-
<String Id="edgepluginpolicy">Edge Chromium signing plug-in will be activated automatically</String>
72+
<String Id="edgeplugin">Edge authentication and signing support</String>
73+
<String Id="edgepluginpolicy">Edge extension will be activated automatically</String>
7574
<String Id="SupportedWindows">You are using an unsupported operating system. You'll need Windows 8.1 or later to successfully install ID-software.</String>
7675
</WixLocalization>

‎HyperlinkSidebarTheme.et.wxl‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,12 @@
6464
<String Id="OptionsDesktop">Paigalda ID-tarkvara ikoonid töölauale</String>
6565
<String Id="OptionsStartMenu">Lisa ID-kaardi tarkvara ikoonid Start-menüüsse</String><!--Seda teadet ei kuvata.-->
6666
<String Id="qdigidoc4">DigiDoc4 klient</String>
67-
<String Id="ieplugin">Internet Exploreri allkirjastamise tugi</String>
68-
<String Id="chromeplugin">Chrome allkirjastamise tugi</String>
69-
<String Id="chromepluginpolicy">Chrome allkirjastamise tugi aktiveeritakse automaatselt</String>
70-
<String Id="firefoxplugin">Firefox allkirjastamise ja autentimise tugi</String>
67+
<String Id="chromeplugin">Chrome isikutuvastamise ja allkirjastamise tugi</String>
68+
<String Id="chromepluginpolicy">Chrome laiendus aktiveeritakse automaatselt</String>
69+
<String Id="firefoxplugin">Firefox isikutuvastamise ja allkirjastamise tugi</String>
7170
<String Id="minidriver">Eesti ID-kaardi tugi</String>
72-
<String Id="certsynchronizer">Kustuta pärast ID-kaardi välja võtmist sertifikaadid ka arvutist</String>
73-
<String Id="edgeplugin">Edge Chromium allkirjastamise tugi</String>
74-
<String Id="edgepluginpolicy">Edge Chromium allkirjastamise tugi aktiveeritakse automaatselt</String>
71+
<String Id="certsynchronizer">Kustuta pärast ID-kaardi välja võtmist sertifikaadid arvutist</String>
72+
<String Id="edgeplugin">Edge isikutuvastamise ja allkirjastamise tugi</String>
73+
<String Id="edgepluginpolicy">Edge laiendus aktiveeritakse automaatselt</String>
7574
<String Id="SupportedWindows">Kasutate mittetoetatud operatsioonisüsteemi. ID-tarkvara paigaldamiseks on vaja Windows 8.1 või uuemat operatsioonisüsteemi.</String>
7675
</WixLocalization>

‎HyperlinkSidebarTheme.xml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@
3838
<Checkbox Name="MinidriverInstall" X="30" Y="102" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.minidriver)</Checkbox>
3939
<Checkbox Name="Qdigidoc4Install" X="30" Y="124" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.qdigidoc4)</Checkbox>
4040
<Static X="30" Y="143" Width="-30" Height="1" />
41-
<Checkbox Name="IESupport" X="30" Y="146" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.ieplugin)</Checkbox>
42-
<Checkbox Name="ChromeSupport" X="30" Y="168" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromeplugin)</Checkbox>
43-
<Checkbox Name="ForceChromeExtensionActivation" X="30" Y="190" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromepluginpolicy)</Checkbox>
44-
<Checkbox Name="EdgeSupport" X="30" Y="212" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgeplugin)</Checkbox>
45-
<Checkbox Name="ForceEdgeExtensionActivation" X="30" Y="234" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgepluginpolicy)</Checkbox>
46-
<Checkbox Name="FirefoxSupport" X="30" Y="256" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.firefoxplugin)</Checkbox>
47-
<Static X="30" Y="280" Width="-30" Height="1" />
48-
<Checkbox Name="IconsDesktop" X="30" Y="283" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsDesktop)</Checkbox>
49-
<Checkbox Name="InstallCertSynchronizer" X="30" Y="305" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.certsynchronizer)</Checkbox>
41+
<Checkbox Name="ChromeSupport" X="30" Y="146" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromeplugin)</Checkbox>
42+
<Checkbox Name="ForceChromeExtensionActivation2" X="30" Y="168" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromepluginpolicy)</Checkbox>
43+
<Checkbox Name="EdgeSupport" X="30" Y="190" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgeplugin)</Checkbox>
44+
<Checkbox Name="ForceEdgeExtensionActivation2" X="30" Y="212" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgepluginpolicy)</Checkbox>
45+
<Checkbox Name="FirefoxSupport" X="30" Y="234" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.firefoxplugin)</Checkbox>
46+
<Static X="30" Y="258" Width="-30" Height="1" />
47+
<Checkbox Name="IconsDesktop" X="30" Y="261" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsDesktop)</Checkbox>
48+
<Checkbox Name="InstallCertSynchronizer" X="30" Y="283" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.certsynchronizer)</Checkbox>
5049
<Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsOkButton)</Button>
5150
<Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.OptionsCancelButton)</Button>
5251
</Page>
@@ -82,14 +81,13 @@
8281
<Checkbox Name="MinidriverInstall" X="30" Y="102" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.minidriver)</Checkbox>
8382
<Checkbox Name="Qdigidoc4Install" X="30" Y="124" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.qdigidoc4)</Checkbox>
8483
<Static X="30" Y="143" Width="-30" Height="1" />
85-
<Checkbox Name="IESupport" X="30" Y="146" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.ieplugin)</Checkbox>
86-
<Checkbox Name="ChromeSupport" X="30" Y="168" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromeplugin)</Checkbox>
87-
<!--Checkbox Name="ForceChromeExtensionActivation" X="30" Y="190" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromepluginpolicy)</Checkbox-->
88-
<Checkbox Name="EdgeSupport" X="30" Y="190" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgeplugin)</Checkbox>
89-
<!--Checkbox Name="ForceEdgeExtensionActivation" X="30" Y="212" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgepluginpolicy)</Checkbox-->
90-
<Checkbox Name="FirefoxSupport" X="30" Y="212" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.firefoxplugin)</Checkbox>
91-
<Static X="30" Y="236" Width="-30" Height="1" />
92-
<Checkbox Name="IconsDesktop" X="30" Y="239" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsDesktop)</Checkbox>
84+
<Checkbox Name="ChromeSupport" X="30" Y="146" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromeplugin)</Checkbox>
85+
<!--Checkbox Name="ForceChromeExtensionActivation2" X="30" Y="190" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.chromepluginpolicy)</Checkbox-->
86+
<Checkbox Name="EdgeSupport" X="30" Y="168" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgeplugin)</Checkbox>
87+
<!--Checkbox Name="ForceEdgeExtensionActivation2" X="30" Y="212" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.edgepluginpolicy)</Checkbox-->
88+
<Checkbox Name="FirefoxSupport" X="30" Y="190" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.firefoxplugin)</Checkbox>
89+
<Static X="30" Y="214" Width="-30" Height="1" />
90+
<Checkbox Name="IconsDesktop" X="30" Y="217" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsDesktop)</Checkbox>
9391
<Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
9492
<Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
9593
<Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>

‎bootstrapper.wxs‎

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616

1717
<bal:Condition Message="#(loc.SupportedWindows)">VersionNT >= v6.3</bal:Condition>
1818

19-
<Variable Name="IESupport" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
2019
<Variable Name="ChromeSupport" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
2120
<Variable Name="EdgeSupport" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
22-
<Variable Name="ForceChromeExtensionActivation" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
23-
<Variable Name="ForceEdgeExtensionActivation" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
21+
<Variable Name="ForceChromeExtensionActivation2" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="0"/>
22+
<Variable Name="ForceEdgeExtensionActivation2" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="0"/>
2423
<Variable Name="FirefoxSupport" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
2524
<Variable Name="InstallCertSynchronizer" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="0"/>
2625
<Variable Name="MinidriverInstall" Persisted="yes" bal:Overridable="yes" Type="numeric" Value="1"/>
@@ -31,16 +30,14 @@
3130
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles6432Folder]Open-EID"/>
3231

3332
<?define REGPath = "Software\[WixBundleManufacturer]\Open-EID"?>
34-
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IESupport" Variable="IESupportExists" Result="exists"/>
35-
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="IESupport" Variable="IESupport" Condition="IESupportExists"/>
3633
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ChromeSupport" Variable="ChromeSupportExists" Result="exists"/>
3734
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ChromeSupport" Variable="ChromeSupport" Condition="ChromeSupportExists"/>
3835
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="EdgeSupport" Variable="EdgeSupportExists" Result="exists"/>
3936
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="EdgeSupport" Variable="EdgeSupport" Condition="EdgeSupportExists"/>
40-
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ForceChromeExtensionActivation" Variable="ForceChromeExtensionActivationExists" Result="exists"/>
41-
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ForceChromeExtensionActivation" Variable="ForceChromeExtensionActivation" Condition="ForceChromeExtensionActivationExists"/>
42-
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ForceEdgeExtensionActivation" Variable="ForceEdgeExtensionActivationExists" Result="exists"/>
43-
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ForceEdgeExtensionActivation" Variable="ForceEdgeExtensionActivation" Condition="ForceEdgeExtensionActivationExists"/>
37+
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ForceChromeExtensionActivation2" Variable="ForceChromeExtensionActivation2Exists" Result="exists"/>
38+
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ForceChromeExtensionActivation2" Variable="ForceChromeExtensionActivation2" Condition="ForceChromeExtensionActivation2Exists"/>
39+
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ForceEdgeExtensionActivation2" Variable="ForceEdgeExtensionActivation2Exists" Result="exists"/>
40+
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="ForceEdgeExtensionActivation2" Variable="ForceEdgeExtensionActivation2" Condition="ForceEdgeExtensionActivation2Exists"/>
4441
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="FirefoxSupport" Variable="FirefoxSupportExists" Result="exists"/>
4542
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="FirefoxSupport" Variable="FirefoxSupport" Condition="FirefoxSupportExists"/>
4643
<util:RegistrySearch Root="HKLM" Key="$(var.REGPath)" Value="MinidriverInstall" Variable="MinidriverInstallExists" Result="exists"/>
@@ -101,36 +98,25 @@
10198
<MsiProperty Name="INSTALL_DRIVER" Value="1"/>
10299
</MsiPackage>
103100

104-
<MsiPackage Id="IE.X64" InstallCondition="VersionNT64 AND IESupport = 1" ForcePerMachine="yes"
105-
SourceFile="$(var.ieplugin)_x64.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)">
101+
<MsiPackage Id="WebEID.X86" InstallCondition="NOT VersionNT64 AND (ChromeSupport = 1 OR EdgeSupport = 1 OR FirefoxSupport = 1)" ForcePerMachine="yes"
102+
SourceFile="$(var.webeid).x86.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)">
106103
<MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/>
107-
<MsiProperty Name="APPLICATION64FOLDER" Value="[InstallFolder]"/>
108104
<MsiProperty Name="REINSTALLMODE" Value="amus"/>
109-
</MsiPackage>
110-
<MsiPackage Id="IE.X86" InstallCondition="NOT VersionNT64 AND IESupport = 1" ForcePerMachine="yes"
111-
SourceFile="$(var.ieplugin)_x86.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)">
112-
<MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/>
113-
<MsiProperty Name="REINSTALLMODE" Value="amus"/>
114-
</MsiPackage>
115-
116-
<MsiPackage Id="Chrome.X86" InstallCondition="NOT VersionNT64 AND (ChromeSupport = 1 OR EdgeSupport = 1 OR FirefoxSupport = 1)" ForcePerMachine="yes"
117-
SourceFile="$(var.chrome).x86.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)">
118-
<MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/>
119-
<MsiProperty Name="REINSTALLMODE" Value="amus"/>
120-
<MsiProperty Name="FORCEINSTALL" Value="[ForceChromeExtensionActivation]"/>
121105
<MsiProperty Name="CHROMEINSTALL" Value="[ChromeSupport]"/>
106+
<MsiProperty Name="CHROMEPOLICY" Value="[ForceChromeExtensionActivation2]"/>
122107
<MsiProperty Name="EDGEINSTALL" Value="[EdgeSupport]"/>
123-
<MsiProperty Name="EDGEFORCEINSTALL" Value="[ForceEdgeExtensionActivation]"/>
108+
<MsiProperty Name="EDGEPOLICY" Value="[ForceEdgeExtensionActivation2]"/>
124109
<MsiProperty Name="FIREFOXINSTALL" Value="[FirefoxSupport]"/>
125110
</MsiPackage>
126-
<MsiPackage Id="Chrome.X64" InstallCondition="VersionNT64 AND (ChromeSupport = 1 OR EdgeSupport = 1 OR FirefoxSupport = 1)" ForcePerMachine="yes"
127-
SourceFile="$(var.chrome).x64.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)">
128-
<MsiProperty Name="APPLICATIONFOLDER" Value="[ProgramFilesFolder]\Open-EID"/>
111+
112+
<MsiPackage Id="WebEID.X64" InstallCondition="VersionNT64 AND (ChromeSupport = 1 OR EdgeSupport = 1 OR FirefoxSupport = 1)" ForcePerMachine="yes"
113+
SourceFile="$(var.webeid).x64.msi" DownloadUrl="$(var.URL)" Compressed="$(var.embed)">
114+
<MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]"/>
129115
<MsiProperty Name="REINSTALLMODE" Value="amus"/>
130-
<MsiProperty Name="FORCEINSTALL" Value="[ForceChromeExtensionActivation]"/>
131116
<MsiProperty Name="CHROMEINSTALL" Value="[ChromeSupport]"/>
117+
<MsiProperty Name="CHROMEPOLICY" Value="[ForceChromeExtensionActivation2]"/>
132118
<MsiProperty Name="EDGEINSTALL" Value="[EdgeSupport]"/>
133-
<MsiProperty Name="EDGEFORCEINSTALL" Value="[ForceEdgeExtensionActivation]"/>
119+
<MsiProperty Name="EDGEPOLICY" Value="[ForceEdgeExtensionActivation2]"/>
134120
<MsiProperty Name="FIREFOXINSTALL" Value="[FirefoxSupport]"/>
135121
</MsiPackage>
136122

@@ -198,11 +184,10 @@
198184
</MsiPackage>
199185

200186
<MsiPackage Id="MetaInfo" ForcePerMachine="yes" SourceFile="metainfo.msi" Compressed="yes">
201-
<MsiProperty Name="IESupport" Value="[IESupport]"/>
202187
<MsiProperty Name="ChromeSupport" Value="[ChromeSupport]"/>
203188
<MsiProperty Name="EdgeSupport" Value="[EdgeSupport]"/>
204-
<MsiProperty Name="ForceChromeExtensionActivation" Value="[ForceChromeExtensionActivation]"/>
205-
<MsiProperty Name="ForceEdgeExtensionActivation" Value="[ForceEdgeExtensionActivation]"/>
189+
<MsiProperty Name="ForceChromeExtensionActivation2" Value="[ForceChromeExtensionActivation2]"/>
190+
<MsiProperty Name="ForceEdgeExtensionActivation2" Value="[ForceEdgeExtensionActivation2]"/>
206191
<MsiProperty Name="FirefoxSupport" Value="[FirefoxSupport]"/>
207192
<MsiProperty Name="MinidriverInstall" Value="[MinidriverInstall]"/>
208193
<MsiProperty Name="Qdigidoc4Install" Value="[Qdigidoc4Install]"/>

‎build.ps1‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ param(
33
[string]$candle = "$env:WIX\bin\candle.exe",
44
[string]$light = "$env:WIX\bin\light.exe",
55
[string]$insignia = "$env:WIX\bin\insignia.exe",
6-
[string]$msiversion = "3.12.0.0",
6+
[string]$msiversion = (Get-Date -Format "%y.%M.%d.0"),
77
[string]$url = "https://installer.id.ee/media/windows/{2}",
88
[string]$filename = "Open-EID-$msiversion$env:VER_SUFFIX",
99
[string]$vcredist = "vcredist",
@@ -12,9 +12,8 @@ param(
1212
[string]$shellext = "Digidoc_ShellExt",
1313
[string]$minidriver = "minidriver",
1414
[string]$idemia = "AWP",
15-
[string]$ieplugin = "ie-token-signing",
16-
[string]$chrome = "chrome-token-signing",
1715
[string]$loader = "firefox-pkcs11-loader",
16+
[string]$webeid = "web-eid",
1817
[string]$embed = "no",
1918
[string]$sign = $null
2019
)
@@ -47,9 +46,8 @@ $vcredist = GetBaseName $vcredist 4
4746
$qdigidoc4 = GetBaseName $qdigidoc4 10
4847
$shellext = GetBaseName $shellext 4
4948
$updater = GetBaseName $updater 4
50-
$ieplugin = GetBaseName $ieplugin 4
51-
$chrome = GetBaseName $chrome 4
5249
$loader = GetBaseName $loader 4
50+
$webeid = GetBaseName $webeid 4
5351
$minidriver = GetBaseName $minidriver 4
5452
$idemia = GetBaseName $idemia 10
5553

@@ -61,7 +59,7 @@ Function Create($wxs, $filename, $defaultX64) {
6159
& $candle "$path\$wxs.wxs" -nologo -ext WixBalExtension -ext WixUtilExtension `
6260
"-dMSI_VERSION=$msiversion" "-dpath=$path" "-ddefaultX64=$defaultX64" "-dURL=$url" "-dembed=$embed" "-dvcredist=$vcredist" `
6361
"-dupdater=$updater" "-dqdigidoc4=$qdigidoc4" "-dqesteidutil=$qesteid" "-dqdigidoc=$qdigidoc" `
64-
"-dminidriver=$minidriver" "-didemia=$idemia" "-dieplugin=$ieplugin" "-dchrome=$chrome" "-dloader=$loader" "-dshellext=$shellext"
62+
"-dminidriver=$minidriver" "-didemia=$idemia" "-dloader=$loader" "-dwebeid=$webeid" "-dshellext=$shellext"
6563
& $light "$wxs.wixobj" -nologo -ext WixBalExtension -out "$filename"
6664
if($sign) {
6765
cp "$filename" "unsigned"

0 commit comments

Comments
 (0)