diff options
| author | jade <lix@jade.fyi> | 2024-06-07 03:53:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-06-07 03:53:31 +0000 |
| commit | 4f94531209510c7d580e525a017ea01f18894ded (patch) | |
| tree | c5b8e06f73a5fd27ed6afa53a22b9fca145c4638 /perl | |
| parent | ec768df0046659e75974919f5923661a29ff52c9 (diff) | |
| parent | 611b1de441a54d3ed7781ca0a26b51b6cb9c45cc (diff) | |
Merge changes from topic "releng" into main
* changes:
Add meson release note
Move version to a JSON file so we can have release names
Remove rl-next-dev
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/default.nix | 2 | ||||
| -rw-r--r-- | perl/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perl/default.nix b/perl/default.nix index 7ce418402..ed2584c7f 100644 --- a/perl/default.nix +++ b/perl/default.nix @@ -23,7 +23,7 @@ perl.pkgs.toPerlModule ( src = fileset.toSource { root = ../.; fileset = fileset.unions ([ - ../.version + ../version.json ./lib ./meson.build ]); diff --git a/perl/meson.build b/perl/meson.build index 4b179da8f..b542f3e8a 100644 --- a/perl/meson.build +++ b/perl/meson.build @@ -1,5 +1,5 @@ project('lix-perl', 'cpp', - version : run_command('bash', '-c', 'echo -n $(cat ../.version)$VERSION_SUFFIX', check : true).stdout().strip(), + version : run_command('bash', '-c', 'echo -n $(jq -r .version < ../version.json)$VERSION_SUFFIX', check : true).stdout().strip(), default_options : [ 'cpp_std=c++2a', # TODO(Qyriad): increase the warning level |