Merge pull request '1.0.0 fixes [2]' (#396) from tobtoht/feather:1.0.0-fixes into master

Reviewed-on: https://git.featherwallet.org/feather/feather/pulls/396

CMakeLists.txt

@@ -16,6 +16,7 @@ option(LOCALMONERO "Include LocalMonero module" ON)
 option(XMRIG "Include XMRig module" ON)
 option(TOR_BIN "Path to Tor binary to embed inside Feather" OFF)
 option(CHECK_UPDATES "Enable checking for application updates" OFF)
+option(PLATFORM_INSTALLER "Built-in updater fetches installer (windows-only)" OFF)
 option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
 option(DONATE_BEG "Prompt donation window every once in a while" ON)
 option(WITH_SCANNER "Enable webcam QR scanner" OFF)

Makefile

@@ -69,6 +69,20 @@ depends:
 		../../.. && \
 	$(MAKE)
 
+win-installer:
+	mkdir -p build/$(target)/release && \
+	cd build/$(target)/release && \
+	cmake \
+	    -D PLATFORM_INSTALLER=On \
+		-DARCH=x86-64 \
+		-D BUILD_TAG=$(tag) \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D STATIC=ON \
+		-D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake \
+		$(CMAKEFLAGS) \
+		../../.. && \
+	$(MAKE)
+
 mac-release:
 	mkdir -p build && \
 	cd build && \

src/CMakeLists.txt

@@ -180,6 +180,10 @@ endif()
 # TODO: PLACEHOLDER
 target_compile_definitions(feather PRIVATE HAS_WEBSOCKET=1)
 
+if(PLATFORM_INSTALLER)
+    target_compile_definitions(feather PRIVATE PLATFORM_INSTALLER=1)
+endif()
+
 if(HAVE_SYS_PRCTL_H)
     target_compile_definitions(feather PRIVATE HAVE_SYS_PRCTL_H=1)
 endif()

src/MainWindow.cpp

@@ -1483,6 +1483,9 @@ QString MainWindow::getPlatformTag() {
     return "mac";
 #endif
 #ifdef Q_OS_WIN
+#ifdef PLATFORM_INSTALLER
+    return "win-installer";
+#endif
     return "win";
 #endif
 #ifdef Q_OS_LINUX