Fix build git version tags

Signed-off-by: Siddharth Chandrasekaran <sidcha.dev@gmail.com>

Author: sidcha

cmake/GitInfo.cmake

@@ -4,37 +4,58 @@
 #  SPDX-License-Identifier: Apache-2.0
 #
 
+set(GIT_REV "")
+set(GIT_DIFF "")
+set(GIT_TAG "")
+set(GIT_BRANCH "None")
+
 execute_process(
-	COMMAND git -C ${CMAKE_CURRENT_LIST_DIR} log --pretty=format:'%h' -n 1
-	OUTPUT_VARIABLE GIT_REV
+	COMMAND git -C ${CMAKE_SOURCE_DIR} rev-parse --is-inside-work-tree
+	RESULT_VARIABLE _git_ok
+	OUTPUT_QUIET
 	ERROR_QUIET
-	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-if ("${GIT_REV}" STREQUAL "")
-	set(GIT_REV "")
-	set(GIT_DIFF "")
-	set(GIT_TAG "")
-	set(GIT_BRANCH "None")
-else()
+if(_git_ok EQUAL 0)
 	execute_process(
-		COMMAND git -C ${CMAKE_CURRENT_LIST_DIR} diff --quiet --exit-code
-		RESULT_VARIABLE RETURN_CODE
+		COMMAND git -C ${CMAKE_SOURCE_DIR} describe --tags --long --always --abbrev=7
+		OUTPUT_VARIABLE GIT_REV
+		ERROR_QUIET
 		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+
+	execute_process(
+		COMMAND git -C ${CMAKE_SOURCE_DIR} describe --exact-match --tags HEAD
+		RESULT_VARIABLE _tag_rc
+		OUTPUT_VARIABLE GIT_TAG
 		ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
-	if(RETURN_CODE AND NOT RETURN_CODE EQUAL 0)
-		set(GIT_DIFF "+")
+	if(NOT _tag_rc EQUAL 0)
+		set(GIT_TAG "")
 	endif()
+
 	execute_process(
-		COMMAND git -C ${CMAKE_CURRENT_LIST_DIR} describe --exact-match --tags
-		OUTPUT_VARIABLE GIT_TAG ERROR_QUIET
+		COMMAND git -C ${CMAKE_SOURCE_DIR} symbolic-ref --short -q HEAD
+		RESULT_VARIABLE _branch_rc
+		OUTPUT_VARIABLE GIT_BRANCH
+		ERROR_QUIET
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
+	if(NOT _branch_rc EQUAL 0 OR "${GIT_BRANCH}" STREQUAL "")
+		set(GIT_BRANCH "detached")
+	endif()
+
 	execute_process(
-		COMMAND git -C ${CMAKE_CURRENT_LIST_DIR} rev-parse --abbrev-ref HEAD
-		OUTPUT_VARIABLE GIT_BRANCH
+		COMMAND git -C ${CMAKE_SOURCE_DIR} status --porcelain --untracked-files=normal
+		OUTPUT_VARIABLE _git_status
+		ERROR_QUIET
 		OUTPUT_STRIP_TRAILING_WHITESPACE
 	)
-	string(SUBSTRING "${GIT_REV}" 1 7 GIT_REV)
+	if(NOT "${_git_status}" STREQUAL "")
+		set(GIT_DIFF "+")
+		if(NOT "${GIT_TAG}" STREQUAL "")
+			set(GIT_TAG "${GIT_TAG}+")
+		endif()
+	endif()
 endif()

python/setup.py

@@ -23,17 +23,47 @@ def add_prefix_to_path(src_list, path, check_files=True):
                 raise RuntimeError(f"Path '{path}' does not exist")
     return paths
 
-def exec_cmd(cmd):
-    r = subprocess.run(cmd, capture_output = True, text = True)
-    return r.stdout.strip()
+def exec_cmd(cmd, cwd=None):
+    r = subprocess.run(cmd, capture_output=True, text=True, cwd=cwd)
+    return r.returncode, r.stdout.strip()
 
 def get_git_info():
-    d = {}
-    d["branch"] = exec_cmd(["git", "rev-parse", "--abbrev-ref", "HEAD"])
-    d["tag"] = exec_cmd([ "git", "describe", "--exact-match", "--tags" ])
-    d["diff"] = exec_cmd([ "git", "diff", "--quiet", "--exit-code" ])
-    d["rev"] = exec_cmd(["git", "log", "--pretty=format:%h", "-n", "1"])
-    d["root"] = exec_cmd(["git", "rev-parse", "--show-toplevel"])
+    d = {
+        "branch": "None",
+        "tag": "",
+        "diff": "",
+        "rev": "",
+        "root": repo_root,
+    }
+
+    rc, _ = exec_cmd(["git", "rev-parse", "--is-inside-work-tree"], cwd=repo_root)
+    if rc != 0:
+        return d
+
+    rc, root = exec_cmd(["git", "rev-parse", "--show-toplevel"], cwd=repo_root)
+    if rc == 0 and root:
+        d["root"] = root
+
+    rc, branch = exec_cmd(["git", "symbolic-ref", "--short", "-q", "HEAD"], cwd=repo_root)
+    if rc == 0 and branch:
+        d["branch"] = branch
+    else:
+        d["branch"] = "detached"
+
+    rc, rev = exec_cmd(["git", "describe", "--tags", "--long", "--always", "--abbrev=7"], cwd=repo_root)
+    if rc == 0:
+        d["rev"] = rev
+
+    rc, tag = exec_cmd(["git", "describe", "--exact-match", "--tags", "HEAD"], cwd=repo_root)
+    if rc == 0 and tag:
+        d["tag"] = tag
+
+    rc, status = exec_cmd(["git", "status", "--porcelain", "--untracked-files=normal"], cwd=repo_root)
+    if rc == 0 and status:
+        d["diff"] = "+"
+        if d["tag"]:
+            d["tag"] = d["tag"] + "+"
+
     return d
 
 def configure_file(file, replacements):