From 72de53c0c0f533bef3131c66ddccdde700438b31 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Thu, 20 Feb 2020 11:37:24 -0800 Subject: [PATCH] Begin making a WiX msi installer --- .gitignore | 5 +- BUILD.md | 5 +- install/windows/Dangerzone.wxs | 246 +++++++++++++++++++++++++++++ install/windows/dangerzone.ico | Bin 0 -> 67646 bytes install/windows/make_installer.bat | 3 + 5 files changed, 256 insertions(+), 3 deletions(-) create mode 100644 install/windows/Dangerzone.wxs create mode 100644 install/windows/dangerzone.ico create mode 100644 install/windows/make_installer.bat diff --git a/.gitignore b/.gitignore index 0302e4b..9237339 100644 --- a/.gitignore +++ b/.gitignore @@ -131,4 +131,7 @@ dmypy.json .vscode *.tar.gz deb_dist -.DS_Store \ No newline at end of file +.DS_Store +install/windows/Dangerzone.msi +install/windows/Dangerzone.wixobj +install/windows/Dangerzone.wixpdb \ No newline at end of file diff --git a/BUILD.md b/BUILD.md index a042f27..3124f57 100644 --- a/BUILD.md +++ b/BUILD.md @@ -157,8 +157,9 @@ Now the next time you use PyInstaller to build dangerzone, the `.exe` file shoul ### If you want to build the installer -* Go to http://nsis.sourceforge.net/Download and download the latest NSIS. I downloaded `nsis-3.05-setup.exe`. -* Add `C:\Program Files (x86)\NSIS` to the path. +* Go to https://dotnet.microsoft.com/download/dotnet-framework and download and install .NET Framework 3.5 SP1 Runtime. I downloaded `dotnetfx35.exe`. +* Go to https://wixtoolset.org/releases/ and download and install WiX toolset. I downloaded `wix311.exe`. +* Add `C:\Program Files (x86)\WiX Toolset v3.1.1\bin` to the path. ### If you want to sign binaries with Authenticode diff --git a/install/windows/Dangerzone.wxs b/install/windows/Dangerzone.wxs new file mode 100644 index 0000000..eb8417b --- /dev/null +++ b/install/windows/Dangerzone.wxs @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + NOT NEWERVERSIONDETECTED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/install/windows/dangerzone.ico b/install/windows/dangerzone.ico new file mode 100644 index 0000000000000000000000000000000000000000..e89af0d20305ab3079bc00be978a5c885cfbd0b8 GIT binary patch literal 67646 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 G*#7~xlB`4k literal 0 HcmV?d00001 diff --git a/install/windows/make_installer.bat b/install/windows/make_installer.bat new file mode 100644 index 0000000..d5487ad --- /dev/null +++ b/install/windows/make_installer.bat @@ -0,0 +1,3 @@ +candle Dangerzone.wxs +light Dangerzone.wixobj +@pause \ No newline at end of file