Changeset 1299ea5b49 in tspsg

Timestamp:

Jul 10, 2012, 5:34:54 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

b26801b000

Parents:

7ba743d983

Message:

Updated version info to be set based on git tags.

'git describe' is now used for version definition. Major, minor and
release are taken from the latest git tag. Build is defined as number of
commits since the latest tag. If we're out of source, then .tag file
should contain output of 'git describe --abbrev=40' command.

Also, moved version related code from tspsg.pro to version.pri.

Files:

• resources/tspsg.rc (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)
• src/mainwindow.cpp (modified) (1 diff)
• src/version.h (modified) (2 diffs)
• tspsg.pro (modified) (1 diff)
• version.pri (added)

resources/tspsg.rc

@@ -23 +23 @@
         PRODUCTVERSION BUILD_VERSION_MAJOR,BUILD_VERSION_MINOR,BUILD_RELEASE,BUILD_NUMBER
         FILEFLAGSMASK 0x17L
-#if defined(DEBUG)
+#ifdef DEBUG
         FILEFLAGS VS_FF_DEBUG | VS_FF_PRERELEASE | VS_FF_PRIVATEBUILD
-#elif !defined(TSPSG_RELEASE_BUILD) || (BUILD_NUMBER == 65535)
-        FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
-#elif BUILD_RELEASE < 11
+#elif !defined(TSPSG_RELEASE_BUILD)
         FILEFLAGS VS_FF_PRERELEASE
 #else
@@ -51 +49 @@
             VALUE "InternalName", "TSPSG"
             VALUE "LegalCopyright", "Copyright © 2007-2010 Oleksii ""Lёppa"" Serdiuk <contacts[at]oleksii[dot]name>"
-#ifdef QT_NO_DEBUG
+#ifdef DEBUG
+            VALUE "OriginalFilename", "tspsgd.exe"
+#else
             VALUE "OriginalFilename", "tspsg.exe"
-#else
-            VALUE "OriginalFilename", "tspsgd.exe"
 #endif
-#ifndef QT_NO_DEBUG
+#ifdef DEBUG
             VALUE "PrivateBuild", "Debug development build"
-#elif BUILD_NUMBER == 65535
-            VALUE "SpecialBuild", "Internal development build"
 #endif
         END

src/main.cpp

@@ -42 +42 @@
 {
 #ifdef Q_WS_S60
-    // No enough memory for solution graph generation with tasks
+    // Not enough memory for solution graph generation with tasks
     // of 20 and more cities if we use non-raster graphics system.
     QApplication::setGraphicsSystem("raster");

src/mainwindow.cpp

@@ -552 +552 @@
     about += QString("&nbsp;&nbsp;&nbsp;&nbsp;%1: <b>%2</b><br>").arg(tr("Runtime"), qVersion());
     about.append(QString("%1: <b>%2x%3</b><br>").arg(tr("Logical screen DPI")).arg(logicalDpiX()).arg(logicalDpiY()));
-    about += tr("Buid <b>%1</b>, built on <b>%2</b> at <b>%3</b> with <b>%4</b> compiler.").arg(BUILD_NUMBER).arg(__DATE__).arg(__TIME__).arg(COMPILER) + "<br>";
+QString tag;
+#ifdef REVISION_STR
+    tag = tr(" from git revision <b>%1</b>").arg(REVISION_STR);
+#endif
+    about += tr("Build <b>%1</b>, built%5 on <b>%2</b> at <b>%3</b> with <b>%4</b> compiler.").arg(BUILD_NUMBER).arg(__DATE__).arg(__TIME__).arg(COMPILER).arg(tag) + "<br>";
     about += QString("%1: <b>%2</b><br>").arg(tr("Algorithm"), CTSPSolver::getVersionId());
     about += "<br>";

src/version.h

@@ -49 +49 @@
 /*!
  * \def BUILD_STATUS
- * \brief TSPSG build status
+ * \brief TSPSG build status (e.g., alpha1, beta3)
  */
 #ifdef DEBUG
-#   ifndef BUILD_STATUS_TYPE
-#       define BUILD_STATUS (debug build BUILD_NUMBER)
+#   ifndef BUILD_STATUS
+#       define BUILD_STATUS_STR (debug build)
 #   else
-#       define BUILD_STATUS (debug BUILD_STATUS_TYPE BUILD_STATUS_NUMBER)
+#       define BUILD_STATUS_STR (debug BUILD_STATUS)
 #   endif
 #else
 #   if !defined(TSPSG_RELEASE_BUILD)
-#       define BUILD_STATUS (nightly build)
-#   elif !defined(BUILD_STATUS_TYPE)
-#       define BUILD_STATUS (build BUILD_NUMBER)
+#       define BUILD_STATUS_STR (nightly build)
+#   elif !defined(BUILD_STATUS)
+#       define BUILD_STATUS_STR (build BUILD_NUMBER)
 #   else
-#       define BUILD_STATUS (BUILD_STATUS_TYPE BUILD_STATUS_NUMBER)
+#       define BUILD_STATUS_STR (BUILD_STATUS)
 #   endif // TSPSG_RELEASE_BUILD
 #endif // DEBUG
@@ -73 +73 @@
 
 //! Full version of TSPSG in the form: \c major.minor.release.build \c status.
-#define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE BUILD_STATUS)
+#define BUILD_VERSION QUOTE(BUILD_VERSION_MAJOR.BUILD_VERSION_MINOR.BUILD_RELEASE BUILD_STATUS_STR)
+
+/*!
+ * \def REVISION_STR
+ * \brief Git revision from which build was made
+ */
+#ifdef REVISION
+#   define REVISION_STR QUOTE(REVISION)
+#else
+#   define REVISION_STR "$Format:%H$"
+#endif
 
 #endif // VERSION_H

tspsg.pro

@@ -31 +31 @@
 QMAKE_TARGET_COPYRIGHT = Copyright © 2007-2011 Oleksii "Lёppa" Serdiuk <contacts[at]oleksii[dot]name>
 
-# Versioning
-BUILD_VERSION_MAJOR = 0
-BUILD_VERSION_MINOR = 1
-BUILD_RELEASE = 5
-
-# These are only defined on releases
-#DEFINES += TSPSG_RELEASE_BUILD
-#DEFINES += BUILD_STATUS_TYPE=beta
-#DEFINES += BUILD_STATUS_NUMBER=2
-
-#REVISION = 170
-isEmpty(REVISION) {
-    REVISION = $$system(svnversion)
-}
-isEmpty(REVISION)|isEqual(REVISION,exported) {
-    REVISION = 0
-} else {
-    REVISION = $$replace(REVISION,":","")
-    REVISION = $$replace(REVISION,"M","")
-}
-SHORT_VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)
-win32-msvc*|wincewm* {
-    VERSION = $$SHORT_VERSION
-} else {
-    VERSION = $$sprintf("%1.%2",$$SHORT_VERSION,$$BUILD_RELEASE)
-}
+# Version detection
+include(version.pri)
 
 DEFINES += BUILD_VERSION_MAJOR=$$BUILD_VERSION_MAJOR \
     BUILD_VERSION_MINOR=$$BUILD_VERSION_MINOR \
     BUILD_RELEASE=$$BUILD_RELEASE \
-    BUILD_NUMBER=$$REVISION
+    BUILD_NUMBER=$$BUILD_NUMBER
 
 CONFIG(release, debug|release) {