From a64eebf8eb758971b090b2e87212c2458424797e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 5 Jan 2014 14:24:33 +0100
Subject: Add an option to force using local updater binary (for updater
 development)

---
 CMakeLists.txt                       | 3 ++-
 config.h.in                          | 3 +++
 logic/updater/DownloadUpdateTask.cpp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 068282d2..df7ebc64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,7 +503,8 @@ IF(WIN32)
 	)
 ENDIF(WIN32)
 
-OPTION(MultiMC_UPDATER_DRY_RUN "Enable updater dry-run mode." OFF)
+OPTION(MultiMC_UPDATER_DRY_RUN "Enable updater dry-run mode -- for updater development." OFF)
+OPTION(MultiMC_UPDATER_FORCE_LOCAL "Do not download updated updater -- for updater development." OFF)
 
 OPTION(MultiMC_CODE_COVERAGE "Compiles for code coverage" OFF)
 IF(MultiMC_CODE_COVERAGE)
diff --git a/config.h.in b/config.h.in
index 6eb3fcef..8df1fc75 100644
--- a/config.h.in
+++ b/config.h.in
@@ -21,6 +21,9 @@
 // enabled for updater dry run
 #cmakedefine MultiMC_UPDATER_DRY_RUN
 
+// enabled for updater dry run
+#cmakedefine MultiMC_UPDATER_FORCE_LOCAL
+
 // The commit hash of this build
 #define GIT_COMMIT		   "@MultiMC_GIT_COMMIT@"
 
diff --git a/logic/updater/DownloadUpdateTask.cpp b/logic/updater/DownloadUpdateTask.cpp
index 6f9d7189..e16d2aa2 100644
--- a/logic/updater/DownloadUpdateTask.cpp
+++ b/logic/updater/DownloadUpdateTask.cpp
@@ -404,7 +404,7 @@ DownloadUpdateTask::processFileLists(NetJob *job,
 
 				if (isUpdater)
 				{
-#ifdef MultiMC_UPDATER_DRY_RUN
+#ifdef MultiMC_UPDATER_FORCE_LOCAL
 					QLOG_DEBUG() << "Skipping updater download and using local version.";
 #else
 					auto cache_entry = MMC->metacache()->resolveEntry("root", entry.path);
-- 
cgit v1.2.3