From 6aa9bd0f77dcb5128167fae62e32aa5252fe85c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 2 Dec 2013 00:55:24 +0100 Subject: Renew the updater branch Now with some actual consensus on what the updater will do! --- config.h.in | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'config.h.in') diff --git a/config.h.in b/config.h.in index 34841817..26c8b1e9 100644 --- a/config.h.in +++ b/config.h.in @@ -1,16 +1,20 @@ +// Minor and major version, used to communicate changes to users. #define VERSION_MAJOR @MultiMC_VERSION_MAJOR@ #define VERSION_MINOR @MultiMC_VERSION_MINOR@ + +// Build number and type -- numer is used by the updater, type is purely visual #define VERSION_BUILD @MultiMC_VERSION_BUILD@ #define VERSION_BUILD_TYPE "@MultiMC_VERSION_BUILD_TYPE@" -#define GIT_COMMIT "@MultiMC_GIT_COMMIT@" - -#define VERSION_STR "@MultiMC_VERSION_STRING@" - -#define x86 1 -#define x64 2 +// URL base for the updater +#define VERSION_REPO "@MultiMC_REPO_BASE_URL@" -#define ARCH @MultiMC_ARCH@ +// The branch used for this build. User can switch between 'stable' and 'develop' +// if this is one of them. Otherwise, it pulls only from this one. +#define VERSION_BRANCH "@MultiMC_VERSION_BRANCH@" -#define USE_HTTPS @MultiMC_USE_HTTPS@ +// the commit hash of this build +#define GIT_COMMIT "@MultiMC_GIT_COMMIT@" +// This is printed on start to standard output +#define VERSION_STR "@MultiMC_VERSION_STRING@" -- cgit v1.2.3 From bf94aaea7527a8f5b9f3b8c1ab6ff4e88cbd748f Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 4 Dec 2013 12:34:12 -0600 Subject: Rework the update checking system --- config.h.in | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'config.h.in') diff --git a/config.h.in b/config.h.in index 26c8b1e9..b58dc322 100644 --- a/config.h.in +++ b/config.h.in @@ -2,19 +2,17 @@ #define VERSION_MAJOR @MultiMC_VERSION_MAJOR@ #define VERSION_MINOR @MultiMC_VERSION_MINOR@ -// Build number and type -- numer is used by the updater, type is purely visual +// Build number, channel, and type -- number and channel are used by the updater, type is purely visual #define VERSION_BUILD @MultiMC_VERSION_BUILD@ +#define VERSION_CHANNEL "@MultiMC_VERSION_CHANNEL@" #define VERSION_BUILD_TYPE "@MultiMC_VERSION_BUILD_TYPE@" -// URL base for the updater -#define VERSION_REPO "@MultiMC_REPO_BASE_URL@" +// URL for the updater's channel +#define CHANLIST_URL "@MultiMC_CHANLIST_URL@" -// The branch used for this build. User can switch between 'stable' and 'develop' -// if this is one of them. Otherwise, it pulls only from this one. -#define VERSION_BRANCH "@MultiMC_VERSION_BRANCH@" - -// the commit hash of this build +// The commit hash of this build #define GIT_COMMIT "@MultiMC_GIT_COMMIT@" // This is printed on start to standard output #define VERSION_STR "@MultiMC_VERSION_STRING@" + -- cgit v1.2.3