Fix --version number output and add -dirty suffix as required

Author: Simon Inns

CMakeLists.txt

@@ -131,6 +131,18 @@ execute_process(
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+# Check if there are uncommitted changes
+execute_process(
+    COMMAND git diff-index --quiet HEAD --
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    RESULT_VARIABLE GIT_DIRTY
+)
+
+# Add -dirty suffix if there are uncommitted changes
+if(GIT_DIRTY)
+    set(GIT_COMMIT_HASH "${GIT_COMMIT_HASH}-dirty")
+endif()
+
 add_compile_definitions(APP_BRANCH=\"${GIT_BRANCH}\")
 add_compile_definitions(APP_COMMIT=\"${GIT_COMMIT_HASH}\")
 

src/efm-decoder/CMakeLists.txt

@@ -5,21 +5,7 @@ project(efm-tools)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
 
-# Get the Git branch and revision
-execute_process(
-    COMMAND git rev-parse --abbrev-ref HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-execute_process(
-    COMMAND git log -1 --format=%h
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_COMMIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-add_compile_definitions(APP_BRANCH=\"${GIT_BRANCH}\")
-add_compile_definitions(APP_COMMIT=\"${GIT_COMMIT_HASH}\")
+# Git branch and commit are defined in the parent CMakeLists.txt
 
 # Add subdirectories
 add_subdirectory(libs/efm)

src/efm-decoder/tools/efm-decoder-audio/src/main.cpp

@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     // Set application name and version
     QCoreApplication::setApplicationName("efm-decoder-audio");
     QCoreApplication::setApplicationVersion(
-            QString("Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
+            QString("ld-decode-tools - Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
     QCoreApplication::setOrganizationDomain("domesday86.com");
 
     // Set up the command line parser

src/efm-decoder/tools/efm-decoder-d24/src/main.cpp

@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     // Set application name and version
     QCoreApplication::setApplicationName("efm-decoder-d24");
     QCoreApplication::setApplicationVersion(
-            QString("Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
+            QString("ld-decode-tools - Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
     QCoreApplication::setOrganizationDomain("domesday86.com");
 
     // Set up the command line parser

src/efm-decoder/tools/efm-decoder-data/src/main.cpp

@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     // Set application name and version
     QCoreApplication::setApplicationName("efm-decoder-data");
     QCoreApplication::setApplicationVersion(
-            QString("Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
+            QString("ld-decode-tools - Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
     QCoreApplication::setOrganizationDomain("domesday86.com");
 
     // Set up the command line parser

src/efm-decoder/tools/efm-decoder-f2/src/main.cpp

@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     // Set application name and version
     QCoreApplication::setApplicationName("efm-decoder-f2");
     QCoreApplication::setApplicationVersion(
-            QString("Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
+            QString("ld-decode-tools - Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
     QCoreApplication::setOrganizationDomain("domesday86.com");
 
     // Set up the command line parser

src/efm-decoder/tools/efm-stacker-f2/src/main.cpp

@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     // Set application name and version
     QCoreApplication::setApplicationName("efm-stacker-f2");
     QCoreApplication::setApplicationVersion(
-            QString("Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
+            QString("ld-decode-tools - Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
     QCoreApplication::setOrganizationDomain("domesday86.com");
 
     // Set up the command line parser

src/efm-decoder/tools/vfs-verifier/src/main.cpp

@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     // Set application name and version
     QCoreApplication::setApplicationName("vfs-verifier");
     QCoreApplication::setApplicationVersion(
-            QString("Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
+            QString("ld-decode-tools - Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
     QCoreApplication::setOrganizationDomain("domesday86.com");
 
     // Set up the command line parser

src/ld-analyse/main.cpp

@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
 
     // Set application name and version
     QCoreApplication::setApplicationName("ld-analyse");
-    QCoreApplication::setApplicationVersion(QString("Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
+    QCoreApplication::setApplicationVersion(QString("ld-decode-tools - Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
     QCoreApplication::setOrganizationDomain("domesday86.com");
 
     // Set desktop file name for proper GNOME integration

src/ld-chroma-decoder/encoder/main.cpp

@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
 
     // Set application name and version
     QCoreApplication::setApplicationName("ld-chroma-encoder");
-    QCoreApplication::setApplicationVersion(QString("Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
+    QCoreApplication::setApplicationVersion(QString("ld-decode-tools - Branch: %1 / Commit: %2").arg(APP_BRANCH, APP_COMMIT));
     QCoreApplication::setOrganizationDomain("domesday86.com");
 
     // Set up the command line parser