Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add an option to force using local updater binary (for updater development)

Browse Source
This commit is contained in:
Petr Mrázek 2014-01-05 14:24:33 +01:00
parent 613c01dab5
commit a64eebf8eb
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -503,7 +503,8 @@ IF(WIN32)
) )
ENDIF(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) OPTION(MultiMC_CODE_COVERAGE "Compiles for code coverage" OFF)
IF(MultiMC_CODE_COVERAGE) IF(MultiMC_CODE_COVERAGE)

3
config.h.in
View File

@ -21,6 +21,9 @@
// enabled for updater dry run // enabled for updater dry run
#cmakedefine MultiMC_UPDATER_DRY_RUN #cmakedefine MultiMC_UPDATER_DRY_RUN
// enabled for updater dry run
#cmakedefine MultiMC_UPDATER_FORCE_LOCAL
// The commit hash of this build // The commit hash of this build
#define GIT_COMMIT "@MultiMC_GIT_COMMIT@" #define GIT_COMMIT "@MultiMC_GIT_COMMIT@"

2
logic/updater/DownloadUpdateTask.cpp
View File

@ -404,7 +404,7 @@ DownloadUpdateTask::processFileLists(NetJob *job,
if (isUpdater) if (isUpdater)
{ {
#ifdef MultiMC_UPDATER_DRY_RUN #ifdef MultiMC_UPDATER_FORCE_LOCAL
QLOG_DEBUG() << "Skipping updater download and using local version."; QLOG_DEBUG() << "Skipping updater download and using local version.";
#else #else
auto cache_entry = MMC->metacache()->resolveEntry("root", entry.path); auto cache_entry = MMC->metacache()->resolveEntry("root", entry.path);