summaryrefslogtreecommitdiffstats
path: root/application/BuildConfig.cpp.in
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-12-28 04:45:49 +0100
committerPetr Mrázek <peterix@gmail.com>2015-12-28 05:36:17 +0100
commit5402acb3c6cf9b63c9df69ee463cae02259dfdef (patch)
tree76bbfd58704b3634fe6a707c6ec13a5dccb267ea /application/BuildConfig.cpp.in
parente8063d193d56acc10c5a533cffd95c9271b24e65 (diff)
downloadMultiMC-5402acb3c6cf9b63c9df69ee463cae02259dfdef.tar
MultiMC-5402acb3c6cf9b63c9df69ee463cae02259dfdef.tar.gz
MultiMC-5402acb3c6cf9b63c9df69ee463cae02259dfdef.tar.lz
MultiMC-5402acb3c6cf9b63c9df69ee463cae02259dfdef.tar.xz
MultiMC-5402acb3c6cf9b63c9df69ee463cae02259dfdef.zip
GH-1360 add basic changelog based on github API, fix update dialog buttons
Diffstat (limited to 'application/BuildConfig.cpp.in')
-rw-r--r--application/BuildConfig.cpp.in45
1 files changed, 25 insertions, 20 deletions
diff --git a/application/BuildConfig.cpp.in b/application/BuildConfig.cpp.in
index 36337aa4..be1797cb 100644
--- a/application/BuildConfig.cpp.in
+++ b/application/BuildConfig.cpp.in
@@ -6,18 +6,29 @@ Config BuildConfig;
Config::Config()
{
// Version information
- VERSION_MAJOR = @MultiMC_VERSION_MAJOR@;
+ VERSION_MAJOR = @MultiMC_VERSION_MAJOR@;
VERSION_MINOR = @MultiMC_VERSION_MINOR@;
VERSION_HOTFIX = @MultiMC_VERSION_HOTFIX@;
VERSION_BUILD = @MultiMC_VERSION_BUILD@;
- VERSION_CHANNEL = "@MultiMC_VERSION_CHANNEL@";
BUILD_PLATFORM = "@MultiMC_BUILD_PLATFORM@";
CHANLIST_URL = "@MultiMC_CHANLIST_URL@";
NOTIFICATION_URL = "@MultiMC_NOTIFICATION_URL@";
FULL_VERSION_STR = "@MultiMC_VERSION_MAJOR@.@MultiMC_VERSION_MINOR@.@MultiMC_VERSION_BUILD@";
GIT_COMMIT = "@MultiMC_GIT_COMMIT@";
+ GIT_REFSPEC = "@MultiMC_GIT_REFSPEC@";
+ if(GIT_REFSPEC.startsWith("refs/heads/") && !CHANLIST_URL.isEmpty() && VERSION_BUILD >= 0)
+ {
+ VERSION_CHANNEL = GIT_REFSPEC;
+ VERSION_CHANNEL.remove("refs/heads/");
+ UPDATER_ENABLED = true;
+ }
+ else
+ {
+ VERSION_CHANNEL = QObject::tr("custom");
+ }
+
VERSION_STR = "@MultiMC_VERSION_STRING@";
NEWS_RSS_URL = "@MultiMC_NEWS_RSS_URL@";
PASTE_EE_KEY = "@MultiMC_PASTE_EE_API_KEY@";
@@ -25,30 +36,24 @@ Config::Config()
QString Config::printableVersionString() const
{
- QString vstr = QString("%1.%2").arg(QString::number(VERSION_MAJOR), QString::number(VERSION_MINOR));
-
- if (VERSION_HOTFIX > 0) vstr += "." + QString::number(VERSION_HOTFIX);
+ QString vstr = QString("%1.%2").arg(QString::number(VERSION_MAJOR), QString::number(VERSION_MINOR));
- // If the build is a development build or release candidate, add that info to the end.
- if(VERSION_CHANNEL == "stable")
+ // if this is a hotfix release, append that
+ if (VERSION_HOTFIX > 0)
{
- return vstr;
+ vstr += "." + QString::number(VERSION_HOTFIX);
}
- else if(VERSION_CHANNEL == "develop")
- {
- vstr += "-dev-" + QString::number(VERSION_BUILD);
- }
- else if(VERSION_CHANNEL == "unstable")
- {
- vstr += "-nuke-" + QString::number(VERSION_BUILD);
- }
- else if(VERSION_CHANNEL == "custom")
+
+ // If the build is not a main release, append the channel
+ if(VERSION_CHANNEL != "stable")
{
- vstr += "-local";
+ vstr += "-" + VERSION_CHANNEL;
}
- else
+
+ // if a build number is set, also add it to the end
+ if(VERSION_BUILD >= 0)
{
- vstr += "-" + VERSION_CHANNEL + "-" + QString::number(VERSION_BUILD);
+ vstr += "-" + QString::number(VERSION_BUILD);
}
return vstr;
}