From ba9b1c6786a18fc6da414138ed2be6c40fcdc0a7 Mon Sep 17 00:00:00 2001 From: Kees Bakker Date: Sat, 24 Feb 2024 22:26:01 +0100 Subject: [PATCH 1/2] feat: use git-describe to add "dirty" suffix to version --- utils/gen_ver/gen_ver.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/utils/gen_ver/gen_ver.py b/utils/gen_ver/gen_ver.py index 54aa01c..9f8d527 100755 --- a/utils/gen_ver/gen_ver.py +++ b/utils/gen_ver/gen_ver.py @@ -11,13 +11,10 @@ def make_ver(git_dir=None): # Get the version string - ver = subprocess.check_output(['git', 'describe', '--match', 'v[0-9]*', '--abbrev=7', 'HEAD'], cwd=git_dir, encoding='UTF-8') - # Check for local changes - chngs = subprocess.check_output(['git', 'diff-index', '--name-only', 'HEAD', '--'], cwd=git_dir, encoding='UTF-8') + ver = subprocess.check_output(['git', 'describe', '--tags', '--match', 'v[0-9]*', '--abbrev=7', '--dirty'], + cwd=git_dir, universal_newlines=True) ver_str = ver.rstrip() - if len(chngs) > 0: - ver_str += ".dirty" txt = ["/* Generated automatically by {} */".format(os.path.basename(__file__)), '#define GEN_VER_VERSION_STRING "{}"'.format(ver_str), From b9e7c1856b5beb02699fde1240427194bd6ed928 Mon Sep 17 00:00:00 2001 From: Kees Bakker Date: Sat, 24 Feb 2024 22:26:56 +0100 Subject: [PATCH 2/2] fix: add proper newline to last line of ccsm_ver.h There really is no excuse to _not_ have an newline on the last line of a file. --- src/CcsmOptionsHandler.cpp | 2 +- utils/gen_ver/gen_ver.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CcsmOptionsHandler.cpp b/src/CcsmOptionsHandler.cpp index c8f593e..ea413b1 100755 --- a/src/CcsmOptionsHandler.cpp +++ b/src/CcsmOptionsHandler.cpp @@ -159,7 +159,7 @@ static llvm::cl::opt llvm::cl::desc("Enable condition analysis for path counting"), llvm::cl::init(false), llvm::cl::cat(CCSMToolCategory)); -static llvm::cl::extrahelp MoreHelp("\nVersion: " GEN_VER_VERSION_STRING); +static llvm::cl::extrahelp MoreHelp("\nVersion: " GEN_VER_VERSION_STRING "\n"); static void PrintVersion(llvm::raw_ostream &OS) { OS << "CCSM (https://github.com/bright-tools/ccsm):" << '\n' diff --git a/utils/gen_ver/gen_ver.py b/utils/gen_ver/gen_ver.py index 9f8d527..cbe9d76 100755 --- a/utils/gen_ver/gen_ver.py +++ b/utils/gen_ver/gen_ver.py @@ -20,7 +20,7 @@ def make_ver(git_dir=None): '#define GEN_VER_VERSION_STRING "{}"'.format(ver_str), ] - return "\n".join(txt) + return "\n".join(txt) + "\n" class Usage(Exception):