feat(build): use git commit hash instead of auto-increment version

Author: alphagocc

CMakeLists.txt

@@ -109,9 +109,41 @@ endif()
 # ==================================================================================
 
 file(STRINGS "${CMAKE_SOURCE_DIR}/makespec/VERSION" VERSION)
-file(STRINGS "${CMAKE_SOURCE_DIR}/makespec/BUILDVERSION" BUILD_VERSION)
 file(STRINGS "${CMAKE_SOURCE_DIR}/makespec/VERSIONSUFFIX" VERSION_SUFFIX)
 
+# Get git commit hash as build version
+find_package(Git QUIET)
+if(GIT_FOUND)
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        RESULT_VARIABLE GIT_RESULT
+        OUTPUT_VARIABLE GIT_COMMIT_HASH
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if(GIT_RESULT EQUAL 0 AND NOT GIT_COMMIT_HASH STREQUAL "")
+        set(BUILD_VERSION "${GIT_COMMIT_HASH}")
+    else()
+        set(BUILD_VERSION "no-git")
+    endif()
+else()
+    # Fallback if git is not found
+    execute_process(
+        COMMAND "git" rev-parse --short HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        RESULT_VARIABLE GIT_RESULT
+        OUTPUT_VARIABLE GIT_COMMIT_HASH
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if(GIT_RESULT EQUAL 0 AND NOT GIT_COMMIT_HASH STREQUAL "")
+        set(BUILD_VERSION "${GIT_COMMIT_HASH}")
+    else()
+        set(BUILD_VERSION "no-git")
+    endif()
+endif()
+
 set(VERSION_STRING "${VERSION}${VERSION_SUFFIX}")
 set(VERSION_LIST ${VERSION})
 string(REPLACE "." ";" VERSION_LIST ${VERSION_LIST})
@@ -124,7 +156,7 @@ list(GET VERSION_LIST 2 CPACK_PACKAGE_VERSION_PATCH)
 add_definitions(-DLEMON_VERSION_MAJOR=${CMAKE_PROJECT_VERSION_MAJOR})
 add_definitions(-DLEMON_VERSION_MINOR=${CMAKE_PROJECT_VERSION_MINOR})
 add_definitions(-DLEMON_VERSION_BUGFIX=${CPACK_PACKAGE_VERSION_PATCH})
-add_definitions(-DLEMON_VERSION_BUILD=${BUILD_VERSION})
+add_definitions(-DLEMON_VERSION_BUILD="${BUILD_VERSION}")
 
 add_definitions(-DLEMON_VERSION_STRING="${VERSION_STRING}")
 

hooks/pre-commit

@@ -1,12 +1,4 @@
 #!/bin/bash
-STAGE_FILES=$(git diff --cached --name-only --diff-filter=ACM -- 'makespec/BUILDVERSION')
-#echo $STAGE_FILES
-if test ${#STAGE_FILES} -gt 0
-then
-    echo 'BUILDVERSION already changed, not touching'
-else
-    echo 'Increasing BUILDVERSION'
-    expr $(cat ./makespec/BUILDVERSION) + 1 > ./makespec/BUILDVERSION
-    cat ./makespec/BUILDVERSION
-    git add ./makespec/BUILDVERSION
-fi
+# Pre-commit hook - no longer increments build version
+# Build version now uses git commit hash instead
+echo 'Using git commit hash for build version - no manual increment needed'

makespec/BUILDVERSION

@@ -5,7 +5,6 @@
     <qresource prefix="/asset">
         <file>makespec/VERSION</file>
         <file>makespec/VERSIONSUFFIX</file>
-        <file>makespec/BUILDVERSION</file>
         <file>assets/lemon-lime.ico</file>
     </qresource>
     <qresource prefix="/icon">

resource.qrc

@@ -999,11 +999,11 @@ void LemonLime::changeContestName() {
 }
 
 void LemonLime::aboutLemon() {
-	QString text;
+QString text;
 	text += "<h2>Project LemonLime</h2>";
 	text += "<h3>" +
 	        tr("Version: %1")
-	            .arg(QString(LEMON_VERSION_STRING) + QString(":") + QString::number(LEMON_VERSION_BUILD)) +
+	            .arg(QString(LEMON_VERSION_STRING) + QString(":") + QString(LEMON_VERSION_BUILD)) +
 	        "</h3>";
 	text += tr("This is a tiny judging environment for OI contest based on Project LemonPlus.") + "<br>";
 	text += tr("Based on Project Lemon version 1.2 Beta by Zhipeng Jia, 2011") + "<br>";