From 3dfe3cfe55b1149d5d1e732bf8852ed4f5354fd6 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Sat, 8 Jul 2023 11:43:58 -0700 Subject: [PATCH] Remove license dialog from MSI installer --- .github/workflows/release.yml | 2 - deploy/msi/Julia.wxs | 5 +- deploy/msi/License.rtf | 38 ----------- deploy/msi/WixUI_InstallDir_NoLicense.wxs | 81 +++++++++++++++++++++++ scripts/msi/build_msi.ps1 | 2 - 5 files changed, 83 insertions(+), 45 deletions(-) delete mode 100644 deploy/msi/License.rtf create mode 100644 deploy/msi/WixUI_InstallDir_NoLicense.wxs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 039bf8ac..8720a6e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -579,8 +579,6 @@ jobs: path: target\msi\x86_64-pc-windows-gnu\release - name: Copy artifacts file run: | - Copy-Item ./deploy/msi/License.rtf target\msi\x86_64-pc-windows-gnu\release - Copy-Item ./deploy/msi/License.rtf target\msi\i686-pc-windows-gnu\release Copy-Item ./deploy/msi/Bitmaps target\msi\x86_64-pc-windows-gnu\release\ -Recurse Copy-Item ./deploy/msi/Bitmaps target\msi\i686-pc-windows-gnu\release\ -Recurse - name: Export version diff --git a/deploy/msi/Julia.wxs b/deploy/msi/Julia.wxs index dc9da3ad..b829af6d 100644 --- a/deploy/msi/Julia.wxs +++ b/deploy/msi/Julia.wxs @@ -1,10 +1,11 @@  + - + @@ -13,8 +14,6 @@ - - diff --git a/deploy/msi/License.rtf b/deploy/msi/License.rtf deleted file mode 100644 index 741df3b2..00000000 --- a/deploy/msi/License.rtf +++ /dev/null @@ -1,38 +0,0 @@ -{\rtf1\ansi\deff3\adeflang1025 -{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset0 Liberation Serif{\*\falt Times New Roman};}{\f4\fswiss\fprq2\fcharset0 Liberation Sans{\*\falt Arial};}{\f5\fmodern\fprq1\fcharset0 Liberation Mono{\*\falt Courier New};}{\f6\fnil\fprq2\fcharset0 AR PL SungtiL GB;}{\f7\fswiss\fprq0\fcharset128 Noto Sans Devanagari;}{\f8\fnil\fprq2\fcharset0 Noto Sans Devanagari;}} -{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;} -{\stylesheet{\s0\snext0\rtlch\af8\afs24\alang1081 \ltrch\lang1033\langfe2052\hich\af3\loch\nowidctlpar\hyphpar0\ltrpar\cf0\f3\fs24\lang1033\dbch\af6\langfe2052 Normal;} -{\s15\sbasedon0\snext16\rtlch\af8\afs28 \ltrch\hich\af4\loch\sb240\sa120\keepn\f4\fs28\dbch\af6 Heading;} -{\s16\sbasedon0\snext16\loch\sl276\slmult1\sb0\sa140 Text Body;} -{\s17\sbasedon16\snext17\rtlch\af7 \ltrch\loch\sl276\slmult1\sb0\sa140 List;} -{\s18\sbasedon0\snext18\rtlch\af7\afs24\ai \ltrch\loch\sb120\sa120\noline\fs24\i Caption;} -{\s19\sbasedon0\snext19\rtlch\af7 \ltrch\loch\noline Index;} -{\s20\sbasedon0\snext20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5 Preformatted Text;} -}{\*\generator LibreOffice/7.4.4.2$Linux_X86_64 LibreOffice_project/40$Build-2}{\info{\creatim\yr0\mo0\dy0\hr0\min0}{\revtim\yr0\mo0\dy0\hr0\min0}{\printim\yr0\mo0\dy0\hr0\min0}}{\*\userprops}\deftab709 -\hyphauto1\viewscale100 -{\*\pgdsctbl -{\pgdsc0\pgdscuse451\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Default Page Style;}} -\formshade\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\pgndec\sftnnar\saftnnrlc\sectunlocked1\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc -{\*\ftnsep\chftnsep}\pgndec\pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar{\loch -MIT License} -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar\loch - -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar{\loch -Copyright (c) 2009-2023: Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors: https://github.com/JuliaLang/julia/contributors} -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar\loch - -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar{\loch -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 \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar\loch - -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar{\loch -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.} -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar\loch - -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar{\loch -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.} -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar\loch - -\par \pard\plain \s20\rtlch\af5\afs20 \ltrch\hich\af5\loch\sb0\sa0\f5\fs20\dbch\af5\ql\sb0\sa0\ltrpar{\loch -Please see https://github.com/JuliaLang/julia/THIRDPARTY.md for license information for other software used in this project.} -\par } \ No newline at end of file diff --git a/deploy/msi/WixUI_InstallDir_NoLicense.wxs b/deploy/msi/WixUI_InstallDir_NoLicense.wxs new file mode 100644 index 00000000..009d7613 --- /dev/null +++ b/deploy/msi/WixUI_InstallDir_NoLicense.wxs @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/msi/build_msi.ps1 b/scripts/msi/build_msi.ps1 index e02e3319..856a559c 100644 --- a/scripts/msi/build_msi.ps1 +++ b/scripts/msi/build_msi.ps1 @@ -2,7 +2,6 @@ if (Test-Path -Path $PSScriptRoot\..\..\target\x86_64-pc-windows-gnu\release) { Write-Output "Creating x64 installer..." md $PSScriptRoot\..\..\target\msi\x86_64-pc-windows-gnu\release -force | Out-Null Copy-Item $PSScriptRoot\..\..\target\x86_64-pc-windows-gnu\release\*.exe $PSScriptRoot\..\..\target\msi\x86_64-pc-windows-gnu\release - Copy-Item $PSScriptRoot\..\..\deploy\msi\License.rtf $PSScriptRoot\..\..\target\msi\x86_64-pc-windows-gnu\release Copy-Item $PSScriptRoot\..\..\deploy\msi\Bitmaps $PSScriptRoot\..\..\target\msi\x86_64-pc-windows-gnu\release -Recurse -Force wix build -ext WixToolset.UI.wixext $PSScriptRoot\..\..\deploy\msi\Julia.wxs -b $PSScriptRoot\..\..\target\msi\x86_64-pc-windows-gnu\release -arch x64 -o $PSScriptRoot\..\..\target\msi\Julia-x64.msi } @@ -14,7 +13,6 @@ if (Test-Path -Path $PSScriptRoot\..\..\target\i686-pc-windows-gnu\release) { Write-Output "Creating x86 installer..." md $PSScriptRoot\..\..\target\msi\i686-pc-windows-gnu\release -force | Out-Null Copy-Item $PSScriptRoot\..\..\target\i686-pc-windows-gnu\release\*.exe $PSScriptRoot\..\..\target\msi\i686-pc-windows-gnu\release - Copy-Item $PSScriptRoot\..\..\deploy\msi\License.rtf $PSScriptRoot\..\..\target\msi\i686-pc-windows-gnu\release Copy-Item $PSScriptRoot\..\..\deploy\msi\Bitmaps $PSScriptRoot\..\..\target\msi\i686-pc-windows-gnu\release -Recurse -Force wix build -ext WixToolset.UI.wixext $PSScriptRoot\..\..\deploy\msi\Julia.wxs -b $PSScriptRoot\..\..\target\msi\i686-pc-windows-gnu\release -arch x86 -o $PSScriptRoot\..\..\target\msi\Julia-x86.msi }