Windows Installer: Update for Beryllium Bullet 0.13.0.4, take one+two

4 files changed, 55 insertions, 19 deletions

diff --git a/installers/windows/Monero.iss b/installers/windows/Monero.iss
index 9fda42c4..10898410 100644
--- a/installers/windows/Monero.iss
+++ b/installers/windows/Monero.iss
@@ -1,4 +1,4 @@
-; Monero Lithium Luna GUI Wallet Installer for Windows

+; Monero Beryllium Bullet GUI Wallet Installer for Windows

 ; Copyright (c) 2014-2018, The Monero Project

 ; See LICENSE

 

@@ -8,7 +8,7 @@ AppName=Monero GUI Wallet
 ; Thus it's important to keep this stable over releases

 ; With a different "AppName" InnoSetup would treat a mere update as a completely new application and thus mess up

 

-AppVersion=0.12.3.0

+AppVersion=0.13.0.4

 DefaultDirName={pf}\Monero GUI Wallet

 DefaultGroupName=Monero GUI Wallet

 UninstallDisplayIcon={app}\monero-wallet-gui.exe

@@ -22,6 +22,21 @@ LicenseFile=LICENSE
 AppPublisher=The Monero Developer Community

 AppPublisherURL=https://getmonero.org

 

+UsedUserAreasWarning=no

+; The above directive silences the following compiler warning:

+;    Warning: The [Setup] section directive "PrivilegesRequired" is set to "admin" but per-user areas (HKCU,userdocs)

+;    are used by the script. Regardless of the version of Windows, if the installation is administrative then you should

+;    be careful about making any per-user area changes: such changes may not achieve what you are intending.

+; Background info:

+; This installer indeed asks for admin rights so the Monero files can be copied to a place where they have at least

+; a minimum of protection against changes, e.g. by malware, plus it handles things for the currently logged-in user

+; in the registry (GUI wallet per-user options) and for some of the icons. For reasons too complicated to fully explain

+; here this does not work as intended if the installing user does not have admin rights and has to provide the password

+; of a user that does for installing: The settings of the admin user instead of those of the installing user are changed.

+; Short of ripping out that per-user functionality the issue has no suitable solution. Fortunately, this will probably

+; play a role in only in few cases as the first standard user in a Windows installation does have admin rights.

+; So, for the time being, this installer simply disregards this problem.

+

 

 [Languages]

 Name: "en"; MessagesFile: "compiler:Default.isl"

@@ -41,7 +56,7 @@ 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.12.3.0, the Monero .exe files do not carry version info anyway in their .exe headers.

+; As of version 0.13.0.4, 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.

 ;

@@ -51,8 +66,9 @@ Name: "en"; MessagesFile: "compiler:Default.isl"
 Source: "ReadMe.htm"; DestDir: "{app}"; Flags: ignoreversion

 Source: "FinishImage.bmp"; Flags: dontcopy

 

-; Monero GUI wallet

+; Monero GUI wallet exe and guide

 Source: "bin\monero-wallet-gui.exe"; DestDir: "{app}"; Flags: ignoreversion

+Source: "bin\monero-GUI-guide.pdf"; DestDir: "{app}"; Flags: ignoreversion

 

 ; Monero GUI wallet log file

 ; The GUI wallet does not have the "--log-file" command-line option of the CLI wallet and insists to put the .log beside the .exe

@@ -79,6 +95,8 @@ Source: "bin\monero-blockchain-import.exe"; DestDir: "{app}"; Flags: ignoreversi
 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

 

 ; was present in 0.10.3.1, not present anymore in 0.11.1.0 and after

 ; Source: "bin\monero-utils-deserialize.exe"; DestDir: "{app}"; Flags: ignoreversion

@@ -230,6 +248,9 @@ Source: "bin\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
 ; Stack protection

 Source: "bin\libssp-0.dll"; DestDir: "{app}"; Flags: ignoreversion

 

+; HIDAPI, library for communicating with USB and Bluetooth devices, for hardware wallets

+Source: "bin\libhidapi-0.dll"; DestDir: "{app}"; Flags: ignoreversion

+

 

 [Tasks]

 Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:";

@@ -249,7 +270,6 @@ var
 

 procedure InitializeWizard;

 var s: String;

-    width: Integer;

     blockChainDir: String;

 begin

   // Large image for the "Welcome" page, with page reconfigured

@@ -265,7 +285,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 60 GB of free space, you may want to use a folder on a different drive.';

+  s := s + '. As this will need more than 70 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,

@@ -353,6 +373,21 @@ begin
   Result := s;

 end;

 

+function WalletFlags(Param: String): String;

+// Flags to add to the shortcut to the GUI wallet

+// Use "--log-file" to force log file alongside the installed GUI exe which would not get

+// created there because of an unsolved issue in the 0.13.0.4 wallet code

+var s: String;

+begin

+  s := ExpandConstant('{app}\monero-wallet-gui.log');

+  if Pos(' ', s) > 0 then begin

+    // Quotes needed for filename with blanks

+    s := '"' + s + '"';

+  end;

+  s := '--log-file ' + s;

+  Result := s;

+end;

+

 procedure CurStepChanged(CurStep: TSetupStep);

 var s: TArrayOfString;

 begin

@@ -380,7 +415,8 @@ end;
 [Icons]

 ; Icons in the "Monero GUI Wallet" program group

 ; Windows will almost always display icons in alphabetical order, per level, so specify the text accordingly

-Name: "{group}\GUI Wallet"; Filename: "{app}\monero-wallet-gui.exe"

+Name: "{group}\GUI Wallet"; Filename: "{app}\monero-wallet-gui.exe"; Parameters: {code:WalletFlags}

+Name: "{group}\GUI Wallet Guide"; Filename: "{app}\monero-GUI-guide.pdf"; IconFilename: "{app}\monero-wallet-gui.exe"

 Name: "{group}\Uninstall GUI Wallet"; Filename: "{uninstallexe}"

 

 ; Sub-folder "Utilities";

@@ -405,7 +441,7 @@ Name: "{group}\Utilities\x (Try GUI Wallet Low Graphics Mode)"; Filename: "{app}
 Name: "{group}\Utilities\x (Try Kill Daemon)"; Filename: "Taskkill.exe"; Parameters: "/IM monerod.exe /T /F"

 

 ; Desktop icons, optional with the help of the "Task" section

-Name: "{userdesktop}\GUI Wallet"; Filename: "{app}\monero-wallet-gui.exe"; Tasks: desktopicon

+Name: "{commondesktop}\GUI Wallet"; Filename: "{app}\monero-wallet-gui.exe"; Parameters: {code:WalletFlags}; Tasks: desktopicon

 

 

 [Registry]

diff --git a/installers/windows/README.md b/installers/windows/README.md
index 3cb870c5..a75f19e1 100644
--- a/installers/windows/README.md
+++ b/installers/windows/README.md
@@ -6,7 +6,7 @@ Copyright (c) 2014-2018, The Monero Project
 

 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 Lithium Luna release of Monero.

+the GUI wallet that comes with the Beryllium Bullet 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,10 +18,10 @@ Monero.
 As the setup script in file [Monero.iss](Monero.iss) has to list every

 single file of the GUI wallet package to install by name,

 this version of the script only works with exactly the GUI wallet

-for Monero release *Lithium Luna* that you find on

+for Monero release *Beryllium Bullet* that you find on

 [the official download page](https://getmonero.org/downloads/).

 

-But of course it will be easy to modify the script for future

+It should however be easy to modify the script for future

 versions of the GUI wallet.

 

 ## License ##

@@ -32,13 +32,13 @@ 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

-Lithium Luna GUI wallet.

+Beryllium Bullet GUI wallet.

 

 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-core GitHub repository](https://github.com/monero-project/monero-core); you will only need the files in the installer directory `installers\windows` however

-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 `monero-gui-0.12.3.0` directory 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 you may have to checkout a specific branch, like `release-v0.13`.

+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.13.0.4`) 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 5a777d12..2bebcd7c 100644
--- a/installers/windows/ReadMe.htm
+++ b/installers/windows/ReadMe.htm
@@ -1,13 +1,13 @@
 <html>

 <head>

-<title>Monero Lithium Luna GUI Wallet</title>

+<title>Monero Beryllium Bullet GUI Wallet</title>

 </head>

 

 <body style="font-family: Arial, Helvetica, sans-serif">

-<h1>Monero Lithium Luna GUI Wallet</h1>

+<h1>Monero Beryllium Bullet GUI Wallet</h1>

 

   <p>Copyright (c) 2014-2018, The Monero Project<br>

-  Date: July 27, 2018</p>

+  Date: November 2, 2018</p>

 

 <h2>Preface</h2>

 

@@ -23,7 +23,7 @@
 

 <h2>Content of the Package</h2>

 

-  <p>You just installed the <i>Monero GUI wallet</i> for Windows, release Lithium Luna, more exact version 0.12.3.0.

+  <p>You just installed the <i>Monero GUI wallet</i> for Windows, release Beryllium Bullet, version 0.13.0.4.

   The wallet enables you to send and receive Moneroj in a secure and very private way.

   </p>

 

@@ -61,7 +61,7 @@
   provides the most security and privacy possible for you.</p>

 

   <p>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 (around 60 GB in summer 2018, and of course growing), you can compromise and try to connect

+  the blockchain locally (around 70 GB in October 2018, and of course growing), you can compromise and try to connect

   to a remote node. One way of finding such a node is checking

   <a href="https://moneroworld.com/#nodes">this page</a>.

   </p>

diff --git a/installers/windows/WelcomeImage.bmp b/installers/windows/WelcomeImage.bmp
index b85e21ef..3d065826 100644
--- a/installers/windows/WelcomeImage.bmp
+++ b/installers/windows/WelcomeImage.bmp