From aba5a0b4ad0c2c0d32dc5c707d2661d19fe7e822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Brunner?= Date: Fri, 2 Nov 2018 13:18:41 +0100 Subject: [PATCH] Windows Installer: Update for Beryllium Bullet 0.13.0.4, take one+two --- installers/windows/Monero.iss | 52 +++++++++++++++++++++++----- installers/windows/README.md | 12 +++---- installers/windows/ReadMe.htm | 10 +++--- installers/windows/WelcomeImage.bmp | Bin 450054 -> 450054 bytes 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 @@ -Monero Lithium Luna GUI Wallet +Monero Beryllium Bullet GUI Wallet -

Monero Lithium Luna GUI Wallet

+

Monero Beryllium Bullet GUI Wallet

Copyright (c) 2014-2018, The Monero Project
- Date: July 27, 2018

+ Date: November 2, 2018

Preface

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

Content of the Package

-

You just installed the Monero GUI wallet for Windows, release Lithium Luna, more exact version 0.12.3.0. +

You just installed the Monero GUI wallet 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.

@@ -61,7 +61,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 (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 this page.

diff --git a/installers/windows/WelcomeImage.bmp b/installers/windows/WelcomeImage.bmp index b85e21ef703adae03491a536e966d4e799270b15..3d065826e301d61c6179e33b9c806267cb89cd0b 100644 GIT binary patch delta 5133 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 Y-EN=$>DKre13#1TljFqCxHe4vA7rO81^@s6 delta 3883 zcmb_fYiv_x80PyvsB|7JD-gs9+3&X)CWXKd3kxLMc$z%yc10;$|TrxB&7rFdE z2r-8B$M!0MZm0|*flZ1>F2R`%jTmHzWCR@>NR-RK3CTNV#M^W?Vc#C?ul|ieuG&vger!qT&f?c3~SRyc}0-9SNJLI zIT5BKCO&XEkBTL-h|T7fpRi_~_Y?3RC6?T+{~et(XtEDYH=osG}I)^3F(K z#B|YsT3H$~1NMz`i-gxmPfwpRWy-pB>sne`NQ_ngSd%u(0?Ef*)%&D7h5u{{Ocx=_ z+$#cX_s-twg@MXLjh(=IbBiow5O9=DAKs%3YAr^f7l$b~HD{?V`@;Ga!fnmiD$`^i zFv3h%4$XQ8=O>+&M)h`C!eE>T@RE5SAUr-;1!(2pGC<|SR6g^WO)KXMgUs_Xr0VMG zsCKn@B4Rc$jBs_cG^`OjsQf1jKxg0wFxJyg~X zYx9;fV;imdJ#xH^m_|wffa#`h_afp`F9OQeX6bVvsL%#F^MITaa|;YRf%Q;S`Xi>t z&e!ns@LchzI>B57DYFuF{zkb#oqK4|Ybc(MujH?wBQ=^;i-94h74&ti#^KrXP@Ku> zD&+XxwBx$;Mogd0d1krDo-~`?1SUdraRr^L- zJybClKlU9*WKKXdeG7-EZ0fpMPhQq+-zTEx~-SL zmqYu6qG>=RIUJ=f_g*ul&Z9(L1qV?kry#7EAyzF(5F8g zMOQvrC8fU}LT>qMpC()s-ot|@Ks6)ndEuk9X^1eRRX)(CN3fc&+m$jF3ulsh#w-f; z=XjR=dirvPK(;HMW3P4L7x^$erYbT`;{WNO-89z6*KRWnRwGX^dMEQec8QC%2K zbnzQ>YG!}sC;Lu4u=R{AjBk}-?3!&QIb5sqoE(El6Q@fbek*E3-rajk&S_?w3|a49 zmi@7c9#UxUc=sU4o_f<*UG&AP!s`@v-6fIDoVaO8xj^%3=t*Ha+e=;61ZcVR*c=hC zD*uu{2+Ev{*6)Rnrz)z2Q8^)7Xz>(x6E8V(o#P*dovPM9WH>fv5_6+LCKyfK?m(Ak z&-j{w3WNTpoN6^*mrIjy;zolGe~MZB7Oy{aup^1#W(jq{!*zuL#Sy4tCOzD+NlYeN z^yx`#567MVA`u0n)P<-TDtnWLqaOO8L5f;y{}lGvn%{*Gb41Xv_FjNErwlgc$dPe;}6Pawq0yz9mBuQwy!cL~;vc zLte%0_3{S5wgKEg^M^pG>C~<^l-KJZq=5YOh`G$BhSi02I9+u^FZehcetPB;sK0$6 zx2QoH3dX7C5<21H4yO@oXyJIY7?l8dWzdhmVY##w;{)j(N9Jh(0p&`VwFt(b(;vg& zxg8v>%UOe3SVs2HO~T}HA!ne28m1%pyRHg{LF1tkFJ|ZV&!8uknJ7m_!=t8Gj{uE_ ztZgWr`m2~_aZT<*`uMrv>nwGZ!Q(+!o>h9nYw}-4f6I5)G zxe+}g=AfUf!=~0P$SAd*;(-v|BC*U*#1LbA#m4!nqpZS%Jpp>E*I{bESAygx*s!Hv zA)Y=W=2_c>Wj-AnxH