RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: check git root

pull/676/head
Alex 2020-05-24 19:14:27 +02:00
parent 2585360a3e
commit 49ae944d65
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meson.build
View File

@ -32,10 +32,15 @@ git = find_program('git', native: true, required: false)
if not git.found() if not git.found()
add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp') add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
else else
git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip() git_path = run_command([git.path(), 'rev-parse', '--show-toplevel']).stdout().strip()
git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip() if meson.source_root() == git_path
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch) git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip()
add_project_arguments('-DVERSION=@0@'.format(version), language: 'cpp') git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip()
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)
add_project_arguments('-DVERSION=@0@'.format(version), language: 'cpp')
else
add_project_arguments('-DVERSION="@0@"'.format(meson.project_version()), language: 'cpp')
endif
endif endif
if not compiler.has_header('filesystem') if not compiler.has_header('filesystem')