Append "-git" to the version string.

This avoids confusion with the released tarballs.

This fixes bug #609.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 049c955ec76400ee6df04009e7c11b2102a2265e..66e8ba151222c629f4496c59a3eb7fe2a6aaf313 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,8 +125,9 @@ set(PV_DESCRIPTION "A GUI for sigrok")
 set(PV_VERSION_MAJOR 0)
 set(PV_VERSION_MINOR 2)
 set(PV_VERSION_MICRO 0)
+set(PV_VERSION_SUFFIX -git)
 set(PV_VERSION_STRING
-       ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
+       ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}${PV_VERSION_SUFFIX}
 )
 
 configure_file (
@@ -431,7 +432,7 @@ set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README)
 set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME
-       "${CMAKE_PROJECT_NAME}-${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}")
+       "${CMAKE_PROJECT_NAME}-${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}${PV_VERSION_SUFFIX}")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 
 include(CPack)

diff --git a/config.h.in b/config.h.in
index aa6062df96f33deb226dd7e0536722e7bfb3e67d..8da6dafbb811c1c4335019f155f76ef83e575a61 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -29,6 +29,7 @@
 #define PV_VERSION_MAJOR @PV_VERSION_MAJOR@
 #define PV_VERSION_MINOR @PV_VERSION_MINOR@
 #define PV_VERSION_MICRO @PV_VERSION_MICRO@
+#define PV_VERSION_SUFFIX @PV_VERSION_SUFFIX@
 #define PV_VERSION_STRING "@PV_VERSION_STRING@"
 
 /* Platform properties */