Merge pull request #885

11df558 Windows installer: Updates for release Helium Hydra

8b94bd8 Windows Installer: Working dir of CLI wallet icon set to wallet dir

0d991b3 Windows Installer: Bumped version number from '0.11.0.0' to '0.11.1.0'

installers/windows/Monero.iss

@@ -1,10 +1,14 @@
-; Monero GUI Wallet Beta 2 Installer for Windows
+; Monero Helium Hydra GUI Wallet Installer for Windows
 ; Copyright (c) 2014-2017, The Monero Project
 ; See LICENSE
 
 [Setup]
 AppName=Monero GUI Wallet
-AppVersion=0.10.3.1
+; For InnoSetup this is the property that uniquely identifies the application as such
+; 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.11.1.0
 DefaultDirName={pf}\Monero GUI Wallet
 DefaultGroupName=Monero GUI Wallet
 UninstallDisplayIcon={app}\monero-wallet-gui.exe
@@ -36,7 +40,7 @@ Source: "FinishImage.bmp"; Flags: dontcopy
 Source: "bin\monero-wallet-gui.exe"; DestDir: "{app}"; Flags: comparetimestamp
 
 ; Monero GUI wallet log file
-; Beta 2 does not have the "--log-file" command-line option of the CLI wallet and insists to put the .log beside the .exe
+; 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
 ; so pre-create the file and give the necessary permissions to the wallet to write into it
 Source: "monero-wallet-gui.log"; DestDir: "{app}"; Flags: comparetimestamp; Permissions: users-modify
 
@@ -55,7 +59,9 @@ Source: "monero-daemon.bat"; DestDir: "{app}"; Flags: comparetimestamp;
 ; Monero blockchain utilities
 Source: "bin\monero-blockchain-export.exe"; DestDir: "{app}"; Flags: comparetimestamp
 Source: "bin\monero-blockchain-import.exe"; DestDir: "{app}"; Flags: comparetimestamp
-Source: "bin\monero-utils-deserialize.exe"; DestDir: "{app}"; Flags: comparetimestamp
+
+; was present in 0.10.3.1, not present anymore in 0.11.1.0
+; Source: "bin\monero-utils-deserialize.exe"; DestDir: "{app}"; Flags: comparetimestamp
 
 ; Various .qm files for translating the wallet UI "on the fly" into all supported languages
 Source: "bin\translations\*"; DestDir: "{app}\translations"; Flags: recursesubdirs comparetimestamp
@@ -161,7 +167,8 @@ Source: "bin\libicuuc57.dll"; DestDir: "{app}"; Flags: comparetimestamp
 Source: "bin\libintl-8.dll"; DestDir: "{app}"; Flags: comparetimestamp
 
 ; JasPer, support for JPEG-2000
-Source: "bin\libjasper-1.dll"; DestDir: "{app}"; Flags: comparetimestamp
+; was present in 0.10.3.1, not present anymore in 0.11.1.0
+; Source: "bin\libjasper-1.dll"; DestDir: "{app}"; Flags: comparetimestamp
 
 ; libjpeg, C library for reading and writing JPEG image files
 Source: "bin\libjpeg-8.dll"; DestDir: "{app}"; Flags: comparetimestamp
@@ -228,7 +235,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 up to 20 GB of free space, you may want to use a folder on a different drive.';
+  s := s + '. As this will need more than 30 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,
@@ -334,7 +341,10 @@ Name: "{group}\Uninstall GUI Wallet"; Filename: "{uninstallexe}"
 ; and insists on displaying ALL icons on one single level
 Name: "{group}\Utilities\Monero Daemon"; Filename: "{app}\monerod.exe"; Parameters: {code:DaemonFlags}
 Name: "{group}\Utilities\Read Me"; Filename: "{app}\ReadMe.htm"
-Name: "{group}\Utilities\Textual (CLI) Wallet"; Filename: "{app}\monero-wallet-cli.exe"
+
+; CLI wallet: Needs a working directory ("Start in:") set in the icon, because with no such directory set
+; it tries to create new wallets without a path given in the probably non-writable program folder and will abort with an error
+Name: "{group}\Utilities\Textual (CLI) Wallet"; Filename: "{app}\monero-wallet-cli.exe"; WorkingDir: "{userdocs}\Monero\wallets"
 
 ; Icons for troubleshooting problems / testing / debugging
 ; To show that they are in some way different (not for everyday use), make them visually different

installers/windows/README.md

@@ -1,26 +1,28 @@
-# Monero GUI Wallet Beta 2 Windows Installer #
+# Monero GUI Wallet Windows Installer #
 
 Copyright (c) 2014-2017, 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
-Monero GUI Wallet Beta 2.
+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 Helium Hydra release of Monero.
 
-This turns the GUI Wallet into a more or less standard Windows program,
+This turns the GUI wallet into a more or less standard Windows program,
 by default installed into a subdirectory of `C:\Program Files`, a
 program group with some icons in the *Start* menu, and automatic
-uninstall support. It helps lower the "barrier to entry" somewhat,
-especially for less technically experienced users of Monero.
+uninstall support. It helps lowering the "barrier to entry"
+somewhat, especially for less technically experienced users of
+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 Beta 2 that you find on
+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 *Helium Hydra* 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 versions
-of the GUI Wallet.
+But of course it will be easy to modify the script for future
+versions of the GUI wallet.
 
 ## License ##
 
@@ -28,14 +30,15 @@ See [LICENSE](LICENSE).
 
 ## Building ##
 
-You can only build on Windows, and the result is always a Windows .exe
-file that can act as a standalone installer for the GUI Wallet Beta 2.
+You can only build on Windows, and the result is always a
+Windows .exe file that can act as a standalone installer for the
+Helium Hydra 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](https://github.com/monero-project/monero-core) repository; 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 Beta 2 from [here](https://getmonero.org/downloads/), unpack it somewhere, and copy all the files and subdirectories in the `monero-gui-0.10.3.1-beta2` directory to this `bin` subdirectory
-4. Start Inno Setup, load `Monero.iss` and compile it.
+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.11.1.0` directory 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 
 

installers/windows/ReadMe.htm

@@ -1,13 +1,13 @@
 <html>
 <head>
-<title>Monero GUI Wallet Beta 2</title>
+<title>Monero Helium Hydra GUI Wallet</title>
 </head>
 
 <body style="font-family: Arial, Helvetica, sans-serif">
-<h1>Monero GUI Wallet Beta 2</h1>
+<h1>Monero Helium Hydra GUI Wallet</h1>
 
   <p>Copyright (c) 2014-2017, The Monero Project<br>
-  Date: June 28, 2017</p>
+  Date: September 19, 2017</p>
 
 <h2>Preface</h2>
 
@@ -23,8 +23,8 @@
 
 <h2>Content of the Package</h2>
 
-  <p>You just installed the Beta 2 of the <i>Monero GUI Wallet</i> for Windows, more exact version 0.10.3.1. The wallet
-  enables you to send and receive moneroj in a secure and very private way.
+  <p>You just installed the <i>Monero GUI wallet</i> for Windows, release Helium Hydra, more exact version 0.11.1.0.
+  The wallet enables you to send and receive Moneroj in a secure and very private way.
   </p>
 
   <p>Also included is the <i>Monero daemon</i>, so you have everything now to run a so-called <i>full node</i>
@@ -35,6 +35,21 @@
   <a href="https://getmonero.org/downloads/">Downloads</a> page on <a href="https://getmonero.org/home">getmonero.org</a>,
   the official Monero site.</p>
 
+<h2>Upgrading</h2>
+  
+  <p>If you have already a release of the GUI wallet software on your computer that was installed with the help
+  of this installer (in an earlier version), upgrading is easy: Just run the new installer; there is no need to
+  uninstall the old Monero release first.</p>
+
+  <p>But if you run a release of the GUI wallet software that you downloaded as a .zip file and unzipped into a
+  folder, if you "installed it manually" so to say, don't try to upgrade by pointing the installer to that folder,
+  because this might lead to problems e.g. if you try to uninstall everything later.</p>
+  
+  <p>It's better to let the installer put the software into another folder and then delete the old folder, either
+  outright or after moving away any additional files that you may have stored there. (If you did not change
+  default locations for wallets and the blockchain, you don't have to worry about them, they won't be in that
+  particular folder, but elsewhere "in safety".)</p>
+
 <h2>Access to the Blockchain</h2>
 
   <p>Any Monero wallet needs access to the <i>blockchain</i>, the ongoing ledger of all Monero transactions. For the
@@ -46,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 (over 17 GB in summer 2017, and of course growing), you can compromise and try to connect
+  the blockchain locally (over 30 GB in fall 2017, 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/pages/nodes.html">this page</a>.
   </p>
@@ -90,21 +105,13 @@
 
 <h2>Troubleshooting</h2>
 
-  <p>The Monero software and especially the GUI wallet are "work in progress", as you can expect seeing the word
-  <i>Beta</i> in the name of the package, and sometimes things go wrong.</p>
+  <p>The Monero software and especially the GUI wallet are "work in progress", and sometimes things go wrong.</p>
 
   <p>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 <b>is</b> critical, however: <b>Never loose your
   seed!</b></p>
 
-  <p>There is a <b>bug</b> in this beta of the GUI wallet that triggers if it is installed in a path that contains spaces /
-  blank characters, like the default location for Windows programs <i>C:\Program Files</i> unfortunately does.
-  Symptoms are problems in the communication between the wallet and the daemon, e.g. the wallet not "seeing" the
-  daemon and then not knowing whether it is "synchronized" with the network and thus ready to work or not. You can
-  avoid these problems by starting the daemon yourself, with the help of the <i>Monero Daemon</i> icon in the
-  <i>Utilities</i> sub-folder of the Monero program group.</p>
-
   <p>In the <i>Utilities</i> sub-folder there are several more icons that may help you to solve problems.
   These are the icons with a <i>x</i> in front and the name <i>(in parenthesis)</i> to make them visually stand
   apart from the "normal" ones because you will probably only need them in case of trouble, but not during normal
@@ -142,15 +149,15 @@
     <tr>
       <td><i>x (Check GUI Wallet Log)</i></td>
       <td>Open the log with status and error messages of the GUI wallet program in Notepad;
-      experienced people have a chance to diagnose technical problems with the wallet by looking at the last few lines
-      of this log</td>
+      experienced people have a chance to diagnose technical problems with the wallet,
+      usually by looking at the last few lines of this log</td>
     </tr>
 
     <tr>
       <td><i>x (Check Daemon Log)</i></td>
       <td>
         Open the log with status and error messages of the daemon in Notepad; again, the last few
-        lines of this (possible very long) log are the most important for troubleshooting
+        lines of this (possible very long) log are usually the most important for troubleshooting
       </td>
     </tr>