Skip to content

Commit 76c7068

Browse files
authored
Remove plugins package (#84)
IB-7563 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent aa7709e commit 76c7068

File tree

2 files changed

+14
-47
lines changed

2 files changed

+14
-47
lines changed

build.ps1

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#powershell -ExecutionPolicy ByPass -File build.ps1 -msiversion 3.12.0.0
1+
#powershell -ExecutionPolicy ByPass -File build.ps1
22
param(
33
[string]$candle = "$env:WIX\bin\candle.exe",
44
[string]$light = "$env:WIX\bin\light.exe",
@@ -51,21 +51,6 @@ Function Sign($filename) {
5151
signtool.exe sign /a /v /s MY /n "$sign" /fd SHA256 /du http://installer.id.ee `
5252
/tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 "$filename"
5353
}
54-
Function Create($wxs, $filename) {
55-
& $candle "$path\$wxs.wxs" -nologo -ext WixBalExtension -ext WixUtilExtension `
56-
"-dMSI_VERSION=$msiversion" "-dpath=$path" "-dURL=$url" "-dembed=$embed" `
57-
"-dupdater=$updater" "-dqdigidoc4=$qdigidoc4" "-dshellext=$shellext" `
58-
"-dminidriver=$minidriver" "-didemia=$idemia" "-dwebeid=$webeid"
59-
& $light "$wxs.wixobj" -nologo -ext WixBalExtension -out "$filename"
60-
if($sign) {
61-
cp "$filename" "unsigned"
62-
& $insignia -nologo -ib "$filename" -o "$filename.engine.exe"
63-
Sign("$filename.engine.exe")
64-
& $insignia -nologo -ab "$filename.engine.exe" "$filename" -o "$filename"
65-
Sign("$filename")
66-
Remove-Item "$filename.engine.exe"
67-
}
68-
}
6954
& $candle -nologo -ext WixUtilExtension "$path\browserrestart.wxs" "-dMSI_VERSION=$msiversion"
7055
& $light -nologo -ext WixUtilExtension -loc "$path\browserrestart.en-US.wxl" -cultures:en-US -out browserrestart.en-US.msi browserrestart.wixobj
7156
& $light -nologo -ext WixUtilExtension -loc "$path\browserrestart.et-EE.wxl" -cultures:et-EE -out browserrestart.et-EE.msi browserrestart.wixobj
@@ -76,5 +61,16 @@ if($sign) {
7661
Sign("browserrestart.et-EE.msi")
7762
Sign("metainfo.msi")
7863
}
79-
Create "bootstrapper" $filename".exe"
80-
Create "plugins" $filename"-plugins.exe"
64+
& $candle "$path\bootstrapper.wxs" -nologo -ext WixBalExtension -ext WixUtilExtension `
65+
"-dMSI_VERSION=$msiversion" "-dpath=$path" "-dURL=$url" "-dembed=$embed" `
66+
"-dupdater=$updater" "-dqdigidoc4=$qdigidoc4" "-dshellext=$shellext" `
67+
"-dminidriver=$minidriver" "-didemia=$idemia" "-dwebeid=$webeid"
68+
& $light bootstrapper.wixobj -nologo -ext WixBalExtension -out "$filename.exe"
69+
if($sign) {
70+
cp "$filename.exe" "unsigned"
71+
& $insignia -nologo -ib "$filename.exe" -o "$filename.engine.exe"
72+
Sign("$filename.engine.exe")
73+
& $insignia -nologo -ab "$filename.engine.exe" "$filename.exe" -o "$filename.exe"
74+
Sign("$filename.exe")
75+
Remove-Item "$filename.engine.exe"
76+
}

plugins.wxs

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)