Skip to content

Commit ce050d3

Browse files
committed
fix: use of version.sh in meson.build to get current version
1 parent 712c273 commit ce050d3

File tree

3 files changed

+8
-77
lines changed

3 files changed

+8
-77
lines changed

meson.build

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
project(
22
'pandora',
33
'cpp',
4-
version: '1.6.3a1',
4+
version: run_command(
5+
'version.sh',
6+
'get-vcs',
7+
).stdout().strip(),
58
default_options: [
69
'cpp_std=c++17',
710
],
811
)
912

10-
meson.add_dist_script('python', meson.source_root() / 'version.py', 'set-dist', meson.project_version())
13+
meson.add_dist_script( meson.source_root() / 'version.sh', 'set-dist', meson.project_version())
14+
1115

1216
py = import('python').find_installation(pure: false)
1317

@@ -46,6 +50,6 @@ subdir(
4650
'pandora/matching_cost/cpp'
4751
)
4852

49-
# subdir(
53+
#subdir(
5054
# 'tests/test_cpp/'
51-
# )
55+
#)

version.py

-73
This file was deleted.

version.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)