Skip to content

A few minor fixes for gen_ver.py #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keestux wants to merge 2 commits into
base: master
Choose a base branch
from
Open

A few minor fixes for gen_ver.py #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba9b1c6
feat: use git-describe to add "dirty" suffix to version
keestux Feb 24, 2024
b9e7c18
fix: add proper newline to last line of ccsm_ver.h
keestux Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CcsmOptionsHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static llvm::cl::opt<bool>
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'
Expand Down
9 changes: 3 additions & 6 deletions utils/gen_ver/gen_ver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,16 @@
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),
]

return "\n".join(txt)
return "\n".join(txt) + "\n"


class Usage(Exception):
Expand Down