From 0de1ba9f5119b44d7f12f5a005a7cab5dce323a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Brunner?= Date: Fri, 15 May 2020 15:09:40 +0200 Subject: [PATCH] Windows installer: Update for Nitrogen Nebula 0.16.0.0 --- installers/windows/LICENSE | 2 +- installers/windows/Monero.iss | 35 ++++++++++++++-------------- installers/windows/README.md | 12 +++++----- installers/windows/ReadMe.htm | 12 +++++----- installers/windows/WelcomeImage.bmp | Bin 450054 -> 450054 bytes 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/installers/windows/LICENSE b/installers/windows/LICENSE index 53a65e56..90115524 100644 --- a/installers/windows/LICENSE +++ b/installers/windows/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2014-2019, The Monero Project +Copyright (c) 2014-2020, The Monero Project All rights reserved. diff --git a/installers/windows/Monero.iss b/installers/windows/Monero.iss index d7bcb650..975d77df 100644 --- a/installers/windows/Monero.iss +++ b/installers/windows/Monero.iss @@ -1,5 +1,5 @@ -; Monero Carbon Chamaeleon GUI Wallet Installer for Windows -; Copyright (c) 2017-2019, The Monero Project +; Monero Nitrogen Nebula GUI Wallet Installer for Windows +; Copyright (c) 2017-2020, The Monero Project ; See LICENSE #define GuiVersion GetFileVersion("bin\monero-wallet-gui.exe") @@ -62,7 +62,6 @@ Name: "en"; MessagesFile: "compiler:Default.isl" ; .exe/.dll file possibly with version info). ; ; This is far more robust than relying on version info or on file dates (flag "comparetimestamp"). -; As of version 0.15.0.0, the Monero .exe files do not carry version info anyway in their .exe headers. ; The only small drawback seems to be somewhat longer update times because each and every file is ; copied again, even if already present with correct file date and identical content. ; @@ -71,17 +70,18 @@ Name: "en"; MessagesFile: "compiler:Default.isl" Source: {#file AddBackslash(SourcePath) + "ReadMe.htm"}; DestDir: "{app}"; DestName: "ReadMe.htm"; Flags: ignoreversion Source: "FinishImage.bmp"; Flags: dontcopy +Source: "LICENSE"; DestDir: "{app}"; Flags: ignoreversion ; Monero GUI wallet exe and guide Source: "bin\monero-wallet-gui.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "bin\monero-gui-wallet-guide.pdf"; DestDir: "{app}"; Flags: ignoreversion ; Monero CLI wallet -Source: "bin\monero-wallet-cli.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-gen-trusted-multisig.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-wallet-cli.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-gen-trusted-multisig.exe"; DestDir: "{app}"; Flags: ignoreversion ; Monero wallet RPC interface implementation -Source: "bin\monero-wallet-rpc.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-wallet-rpc.exe"; DestDir: "{app}"; Flags: ignoreversion ; Monero daemon Source: "bin\monerod.exe"; DestDir: "{app}"; Flags: ignoreversion @@ -90,16 +90,17 @@ Source: "bin\monerod.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "monero-daemon.bat"; DestDir: "{app}"; Flags: ignoreversion; ; Monero blockchain utilities -Source: "bin\monero-blockchain-export.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-import.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-mark-spent-outputs.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-usage.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-import.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-ancestry.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-depth.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-prune-known-spent-data.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-prune.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "bin\monero-blockchain-stats.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-export.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-import.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-mark-spent-outputs.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-usage.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-import.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-ancestry.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-depth.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-prune-known-spent-data.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-prune.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-blockchain-stats.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "bin\extras\monero-gen-ssl-cert.exe"; DestDir: "{app}"; Flags: ignoreversion ; Qt Quick 2D Renderer fallback for systems / environments with "low-level graphics" i.e. without 3D support Source: "bin\start-low-graphics-mode.bat"; DestDir: "{app}"; Flags: ignoreversion @@ -202,7 +203,7 @@ begin // Additional wizard page for entering a special blockchain location blockChainDefaultDir := ExpandConstant('{commonappdata}\bitmonero'); s := 'The default folder to store the Monero blockchain is ' + blockChainDefaultDir; - s := s + '. As this will need more than 74 GB of free space, you may want to use a folder on a different drive.'; + s := s + '. As this will need more than 90 GB of free space, you may want to use a folder on a different drive.'; s := s + ' If yes, specify that folder here.'; BlockChainDirPage := CreateInputDirPage(wpSelectDir, diff --git a/installers/windows/README.md b/installers/windows/README.md index 37424199..2fabec9a 100644 --- a/installers/windows/README.md +++ b/installers/windows/README.md @@ -1,12 +1,12 @@ # Monero GUI Wallet Windows Installer # -Copyright (c) 2017-2019, The Monero Project +Copyright (c) 2017-2020, The Monero Project ## Introduction ## This is a *Inno Setup* script `Monero.iss` plus some related files that allows you to build a standalone Windows installer (.exe) for -the GUI wallet that comes with the Carbon Chamaeleon release of Monero. +the GUI wallet that comes with the Nitrogen Nebula release of Monero. This turns the GUI wallet into a more or less standard Windows program, by default installed into a subdirectory of `C:\Program Files`, a @@ -18,7 +18,7 @@ Monero. As the setup script in file [Monero.iss](Monero.iss) has to list many files and directories of the GUI wallet package to install by name, this version of the script only works with exactly the GUI wallet -for Monero release *Carbon Chamaeleon* that you find on +for Monero release *Nitrogen Nebula* that you find on [the official download page](https://getmonero.org/downloads/). It should however be easy to modify the script for future @@ -32,15 +32,15 @@ See [LICENSE](LICENSE). You can only build on Windows, and the result is always a Windows .exe file that can act as a standalone installer for the -Carbon Chamaeleon GUI wallet. +Nitrogen Nebula GUI wallet. Note that the installer build process is now reproducible / deterministic. For details check the file [Deterministic.md](Deterministic.md). The build steps in detail: 1. Install *Inno Setup*. You can get it from [here](http://www.jrsoftware.org/isdl.php) -2. Get the Inno Setup script plus related files by cloning the whole [monero-gui GitHub repository](https://github.com/monero-project/monero-gui); you will only need the files in the installer directory `installers\windows` however. Depending on development state, additionally instead of simply using `master` you may have to checkout a specific branch, like `release-v0.15`. -3. The setup script is written to take the GUI wallet files from a subdirectory named `bin`; so create `installers\windows\bin`, get the zip file of the GUI wallet from [here](https://getmonero.org/downloads/), unpack it somewhere, and copy all the files and subdirectories in the single subdirectory there (currently named `monero-gui-0.15.0.0`) to this `bin` subdirectory +2. Get the Inno Setup script plus related files by cloning the whole [monero-gui GitHub repository](https://github.com/monero-project/monero-gui); you will only need the files in the installer directory `installers\windows` however. Depending on development state, additionally instead of simply using `master` you may have to checkout a specific branch, like `release-v0.16`. +3. The setup script is written to take the GUI wallet files from a subdirectory named `bin`; so create `installers\windows\bin`, get the zip file of the GUI wallet from [here](https://getmonero.org/downloads/), unpack it somewhere, and copy all the files and subdirectories in the single subdirectory there (currently named `monero-gui-0.16.0.0`) to this `bin` subdirectory 4. Start Inno Setup, load `Monero.iss` and compile it 5. The result i.e. the finished installer will be the file `mysetup.exe` in the `installers\windows\Output` subdirectory diff --git a/installers/windows/ReadMe.htm b/installers/windows/ReadMe.htm index 4d1c336f..7fe892dc 100644 --- a/installers/windows/ReadMe.htm +++ b/installers/windows/ReadMe.htm @@ -1,12 +1,12 @@ -Monero Carbon Chamaeleon GUI Wallet +Monero Nitrogen Nebula GUI Wallet -

Monero Carbon Chamaeleon GUI Wallet

+

Monero Nitrogen Nebula GUI Wallet

-

Copyright (c) 2014-2019, The Monero Project

+

Copyright (c) 2014-2020, The Monero Project

Preface

@@ -22,7 +22,7 @@

Content of the Package

-

You just installed the Monero GUI wallet for Windows, release Carbon Chamaeleon, version {#GuiVersion}. +

You just installed the Monero GUI wallet for Windows, release Nitrogen Nebula, version {#GuiVersion}. The wallet enables you to send and receive Moneroj in a secure and very private way.

@@ -60,7 +60,7 @@ provides the most security and privacy possible for you.

However if your Internet access makes it difficult to run a full node, or if you have simply no room to store - the blockchain locally (somewhat over 74 GB in November 2019, and of course growing), you can compromise and try to connect + the blockchain locally (about 90 GB in May 2020, and of course growing), you can compromise and try to connect to a remote node. One way of finding such a node is checking this page.

@@ -104,7 +104,7 @@

The Monero software and especially the GUI wallet are "work in progress", and sometimes things go wrong.

-

Please note that despite any technical problems that you may encounter your moneroj are almost always safe: You may +

Please note that despite any technical problems that you may encounter your Moneroj are almost always safe: You may not be able to move them or you even may not see how many you currently have, but you most probably won't loose any. But do remember that the seed needed to re-create the wallet is critical, however: Never loose your seed!

diff --git a/installers/windows/WelcomeImage.bmp b/installers/windows/WelcomeImage.bmp index e6faffa668191aaac5d6a526df872cf6e902149d..f52e62d0f9a795d3813b61f3de7ce0ba4b1c9bd0 100644 GIT binary patch delta 5621 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 delta 6357 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