From 25147845d953c7ae55ae9fee9e5153bc635081bd Mon Sep 17 00:00:00 2001 From: Craig Date: Thu, 17 Mar 2016 13:20:47 +0100 Subject: [PATCH] Changed version numbering to major.minor.patch-type.build e.g 1.3.0-rc.1, or 1.3.0 Also, changed version number to 1.3.0-rc1 --- OpenBoard.pro | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/OpenBoard.pro b/OpenBoard.pro index 1147ed52..a6dd1f75 100644 --- a/OpenBoard.pro +++ b/OpenBoard.pro @@ -9,17 +9,22 @@ CONFIG += debug_and_release \ VERSION_MAJ = 1 -VERSION_MIN = 10 -VERSION_TYPE = a # a = alpha, b = beta, rc = release candidate, r = release, other => error -VERSION_PATCH = 12 +VERSION_MIN = 3 +VERSION_PATCH = 0 +VERSION_TYPE = rc # a = alpha, b = beta, rc = release candidate, r = release, other => error +VERSION_BUILD = 1 + +VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_PATCH}-$${VERSION_TYPE}.$${VERSION_BUILD}" + +equals(VERSION_TYPE, r) { + VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_PATCH}" +} -VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" -VERSION = $$replace(VERSION, "\\.r", "") LONG_VERSION = "$${VERSION}.$${SVN_VERSION}" macx:OSX_VERSION = "$${VERSION} (r$${SVN_VERSION})" -VERSION_RC = $$VERSION_MAJ,$$VERSION_MIN,$$VERSION_TYPE,$$VERSION_PATCH +VERSION_RC = $$VERSION_MAJ,$$VERSION_MIN,$$VERSION_PATCH,$$VERSION_TYPE,$$VERSION_BUILD VERSION_RC = $$replace(VERSION_RC, "a", "160") # 0xA0 VERSION_RC = $$replace(VERSION_RC, "b", "176") # 0xB0 VERSION_RC = $$replace(VERSION_RC, "rc", "192" ) # 0xC0