From e197544903772944c87a3693e9a9c1715916bcd0 Mon Sep 17 00:00:00 2001 From: selsta Date: Fri, 15 Jul 2022 22:21:47 +0200 Subject: [PATCH] build: prepare v0.18.0.0 --- CMakeLists.txt | 6 +++--- Dockerfile.windows | 4 ++-- README.md | 4 ++-- installers/windows/Monero.iss | 2 +- installers/windows/README.md | 8 ++++---- installers/windows/ReadMe.htm | 6 +++--- monero | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc2f5f3d..376f6f9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,9 @@ project(monero-gui) message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") -set(VERSION_MAJOR "17") -set(VERSION_MINOR "3") -set(VERSION_REVISION "2") +set(VERSION_MAJOR "18") +set(VERSION_MINOR "0") +set(VERSION_REVISION "0") set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}") option(STATIC "Link libraries statically, requires static Qt") diff --git a/Dockerfile.windows b/Dockerfile.windows index 7320b8da..a1dfd824 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -12,9 +12,9 @@ RUN apt update && \ RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \ update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix) -RUN git clone -b v0.17.3.0 --depth 1 https://github.com/monero-project/monero && \ +RUN git clone -b v0.18.0.0 --depth 1 https://github.com/monero-project/monero && \ cd monero && \ - git reset --hard ab18fea3500841fc312630d49ed6840b3aedb34d && \ + git reset --hard b6a029f222abada36c7bc6c65899a4ac969d7dee && \ cp -a contrib/depends / && \ cd .. && \ rm -rf monero diff --git a/README.md b/README.md index 2881c4f9..8f515c48 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ Packaging for your favorite distribution would be a welcome contribution! ``` git clone --branch master --recursive https://github.com/monero-project/monero-gui.git ``` - \* `master` - replace with the desired version tag (e.g. `v0.17.1.9`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.0.0`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui @@ -131,7 +131,7 @@ Packaging for your favorite distribution would be a welcome contribution! ``` git clone --branch master --recursive https://github.com/monero-project/monero-gui.git ``` - \* `master` - replace with the desired version tag (e.g. `v0.17.1.9`) to build the release binaries. + \* `master` - replace with the desired version tag (e.g. `v0.18.0.0`) to build the release binaries. 3. Prepare build environment ``` cd monero-gui diff --git a/installers/windows/Monero.iss b/installers/windows/Monero.iss index 98831d57..3cb70fc7 100644 --- a/installers/windows/Monero.iss +++ b/installers/windows/Monero.iss @@ -1,4 +1,4 @@ -; Monero Oxygen Orion GUI Wallet Installer for Windows +; Monero Fluorine Fermi GUI Wallet Installer for Windows ; Copyright (c) 2017-2020, The Monero Project ; See LICENSE #define GuiVersion GetFileVersion("bin\monero-wallet-gui.exe") diff --git a/installers/windows/README.md b/installers/windows/README.md index f86fb480..b771998a 100644 --- a/installers/windows/README.md +++ b/installers/windows/README.md @@ -6,7 +6,7 @@ Copyright (c) 2017-2020, 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 Oxygen Orion release of Monero. +the GUI wallet that comes with the Fluorine Fermi 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 *Oxygen Orion* that you find on +for Monero release *Fluorine Fermi* that you find on [the official download page](https://getmonero.org/downloads/). It should however be easy to modify the script for future @@ -39,8 +39,8 @@ Note that the installer build process is now reproducible / deterministic. For d 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.17`. -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.17.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. +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.18.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 1068d935..139204c0 100644 --- a/installers/windows/ReadMe.htm +++ b/installers/windows/ReadMe.htm @@ -1,10 +1,10 @@ -Monero Oxygen Orion GUI Wallet +Monero Fluorine Fermi GUI Wallet -

Monero Oxygen Orion GUI Wallet

+

Monero Fluorine Fermi GUI Wallet

Copyright (c) 2014-2020, The Monero Project

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

Content of the Package

-

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

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

diff --git a/monero b/monero index 424e4de1..b6a029f2 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 424e4de16b98506170db7b0d7d87a79ccf541744 +Subproject commit b6a029f222abada36c7bc6c65899a4ac969d7dee