diff --git a/build/windows/ConvertTo-Rtf.ps1 b/build/windows/ConvertTo-Rtf.ps1 deleted file mode 100644 index 401951cc8..000000000 --- a/build/windows/ConvertTo-Rtf.ps1 +++ /dev/null @@ -1,24 +0,0 @@ -[CmdletBinding()] -param ( - [Parameter(Mandatory=$true, Position=0)] - [string] $Path, - - [Parameter(Mandatory=$true, Position=1)] - [string] $OutFile, - - [Parameter()] - [ValidateNotNullOrEmpty()] - [string] $FontFamily = 'Arial' -) - -$rtf = "{\rtf1\ansi\deff0{\fonttbl{\f0\fcharset0 $FontFamily;}}\pard\sa200\sl200\slmult1\fs20`n" -foreach ($line in (Get-Content $Path)) { - if (!$line) { - $rtf += "\par`n" - } else { - $rtf += "$line`n" - } -} -$rtf += '}' - -$rtf | Set-Content $OutFile \ No newline at end of file diff --git a/build/windows/LICENSE.rtf b/build/windows/LICENSE.rtf deleted file mode 100644 index 185063f24..000000000 --- a/build/windows/LICENSE.rtf +++ /dev/null @@ -1,23 +0,0 @@ -{\rtf1\ansi\deff0{\fonttbl{\f0\fcharset0 Arial;}}\pard\sa200\sl200\slmult1\fs20 -MIT License -\par -Copyright (c) 2019 GitHub Inc. -\par -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: -\par -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. -\par -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -} diff --git a/build/windows/gh.wixproj b/build/windows/gh.wixproj index 5c355955d..aa72d4da3 100644 --- a/build/windows/gh.wixproj +++ b/build/windows/gh.wixproj @@ -19,11 +19,9 @@ + - - - diff --git a/build/windows/gh.wxs b/build/windows/gh.wxs index 32eb9564b..1e91734f1 100644 --- a/build/windows/gh.wxs +++ b/build/windows/gh.wxs @@ -70,9 +70,8 @@ - + - - + diff --git a/build/windows/ui.wxs b/build/windows/ui.wxs new file mode 100644 index 000000000..8c534adc8 --- /dev/null +++ b/build/windows/ui.wxs @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + 1 + "1"]]> + + 1 + + NOT Installed + Installed AND PATCH + + 1 + 1 + NOT WIXUI_DONTVALIDATEPATH + "1"]]> + WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" + 1 + 1 + + NOT Installed + Installed AND NOT PATCH + Installed AND PATCH + + 1 + + 1 + 1 + 1 + + + + + + + \ No newline at end of file