Update versions for P3 delivery

6 files changed, 11 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73913f9..d02e780 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,8 @@ endif()
 set(HEAPTRACK_VERSION_MAJOR 1)
 set(HEAPTRACK_VERSION_MINOR 1)
 set(HEAPTRACK_VERSION_PATCH 0)
-set(HEAPTRACK_LIB_VERSION 1.0.0)
+set(HEAPTRACK_VERSION_SUFFIX 0.1)
+set(HEAPTRACK_LIB_VERSION 1.0.0-0.1)
 set(HEAPTRACK_LIB_SOVERSION 1)
 set(HEAPTRACK_FILE_FORMAT_VERSION 2)
 
diff --git a/packaging/heaptrack.spec b/packaging/heaptrack.spec
index 6d88bdb..8f64c0e 100644
--- a/packaging/heaptrack.spec
+++ b/packaging/heaptrack.spec
@@ -1,5 +1,6 @@
 Name:       heaptrack
 Summary:    heaptrack for dotnet apps
+# Version corresponds to CMake @HEAPTRACK_VERSION_MAJOR@.@HEAPTRACK_VERSION_MINOR@.@HEAPTRACK_VERSION_PATCH@-@HEAPTRACK_VERSION_SUFFIX@
 Version:    1.1.0
 Release:    0.1
 Group:      Application Framework/Application State Management
@@ -67,7 +68,7 @@ cmake \
 %define arch_dir x86
 %endif
 
-cd profiler; 
+cd profiler;
 	ROOTFS_DIR=/ \
 	CC=clang CXX=clang++ \
 	cmake \
@@ -102,4 +103,3 @@ echo %{_prefix}
 %{_prefix}/lib/heaptrack/libheaptrack_inject.so*
 %{_prefix}/lib/heaptrack/libprofiler.so
 %{_prefix}/lib/heaptrack/libexec/heaptrack_interpret
-
diff --git a/src/analyze/gui/aboutdata.cpp b/src/analyze/gui/aboutdata.cpp
index 9bb4886..37ce232 100644
--- a/src/analyze/gui/aboutdata.cpp
+++ b/src/analyze/gui/aboutdata.cpp
@@ -19,7 +19,8 @@ const QString& AboutData::ShortName = QStringLiteral("Tizen Memory Profiler");
 
 const QString& AboutData::DisplayName = i18n("Tizen Memory Profiler");
 
-const QString& AboutData::Version = QStringLiteral("0.2");
+// Version corresponds to CMake @HEAPTRACK_VERSION_MAJOR@.@HEAPTRACK_VERSION_MINOR@.@HEAPTRACK_VERSION_PATCH@-@HEAPTRACK_VERSION_SUFFIX@
+const QString& AboutData::Version = QStringLiteral("1.1.0-0.1");
 
 const QString& AboutData::ShortDescription = i18n("A visualizer for Tizen Memory Profiler data files");
 
@@ -35,7 +36,8 @@ const QString& AboutData::ShortName = QStringLiteral("heaptrack");
 
 const QString& AboutData::DisplayName = i18n("Heaptrack GUI");
 
-const QString& AboutData::Version = QStringLiteral("0.1");
+// Version corresponds to CMake @HEAPTRACK_VERSION_MAJOR@.@HEAPTRACK_VERSION_MINOR@.@HEAPTRACK_VERSION_PATCH@
+const QString& AboutData::Version = QStringLiteral("1.1.0");
 
 const QString& AboutData::ShortDescription = i18n("A visualizer for heaptrack data files");
 
diff --git a/src/track/heaptrack.sh.cmake b/src/track/heaptrack.sh.cmake
index 4cca4c0..f9f8d97 100755
--- a/src/track/heaptrack.sh.cmake
+++ b/src/track/heaptrack.sh.cmake
@@ -89,7 +89,7 @@ while true; do
             break
             ;;
         "-v" | "--version")
-            echo "heaptrack @HEAPTRACK_VERSION_MAJOR@.@HEAPTRACK_VERSION_MINOR@.@HEAPTRACK_VERSION_PATCH@"
+            echo "heaptrack @HEAPTRACK_VERSION_MAJOR@.@HEAPTRACK_VERSION_MINOR@.@HEAPTRACK_VERSION_PATCH@-@HEAPTRACK_VERSION_SUFFIX@"
             exit 0
             ;;
         *)
diff --git a/src/util/config.h b/src/util/config.h
index aef8c2d..ea6c3fa 100644
--- a/src/util/config.h
+++ b/src/util/config.h
@@ -19,7 +19,7 @@
 #ifndef HEAPTRACK_CONFIG_H
 #define HEAPTRACK_CONFIG_H
 
-#define HEAPTRACK_VERSION_STRING "1.1.0"
+#define HEAPTRACK_VERSION_STRING "1.1.0-0.1"
 #define HEAPTRACK_VERSION_MAJOR 1
 #define HEAPTRACK_VERSION_MINOR 1
 #define HEAPTRACK_VERSION_PATCH 0
diff --git a/src/util/config.h.cmake b/src/util/config.h.cmake
index 861c1f7..d86aa35 100644
--- a/src/util/config.h.cmake
+++ b/src/util/config.h.cmake
@@ -19,7 +19,7 @@
 #ifndef HEAPTRACK_CONFIG_H
 #define HEAPTRACK_CONFIG_H
 
-#define HEAPTRACK_VERSION_STRING "@HEAPTRACK_VERSION_MAJOR@.@HEAPTRACK_VERSION_MINOR@.@HEAPTRACK_VERSION_PATCH@"
+#define HEAPTRACK_VERSION_STRING "@HEAPTRACK_VERSION_MAJOR@.@HEAPTRACK_VERSION_MINOR@.@HEAPTRACK_VERSION_PATCH@-@HEAPTRACK_VERSION_SUFFIX@"
 #define HEAPTRACK_VERSION_MAJOR @HEAPTRACK_VERSION_MAJOR@
 #define HEAPTRACK_VERSION_MINOR @HEAPTRACK_VERSION_MINOR@
 #define HEAPTRACK_VERSION_PATCH @HEAPTRACK_VERSION_PATCH@