Skip to content

Commit f30a5c4

Browse files
committed
Release 2021.07.22
1 parent 32c7b9f commit f30a5c4

File tree

5 files changed

+23
-8
lines changed

5 files changed

+23
-8
lines changed

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project('valdo', 'vala', 'c',
2-
version: '0.0.1',
2+
version: '2021.07.22',
33
license: 'LGPL-2.1-only')
44

55
valac = meson.get_compiler('vala')
File renamed without changes.

src/main.vala

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
[CCode (array_length = false, array_null_terminated = true)]
2020
private string[] template_names; // we only want one template, and we discard the rest
2121

22+
private bool version;
23+
2224
private const OptionEntry[] entries = {
25+
{ "version", 'V', 0, OptionArg.NONE, ref version, "Output version", null },
2326
{ OPTION_REMAINING, 0, 0, OptionArg.STRING_ARRAY, ref template_names, (string)0, "TEMPLATE" },
2427
// list terminator (we can't use `null` here, see https://gitlab.gnome.org/GNOME/vala/-/issues/1185)
2528
{ }
@@ -81,9 +84,16 @@ int main (string[] args) {
8184
return 1;
8285
}
8386

87+
if (version) {
88+
stdout.printf ("valdo %s\n", Config.PROJECT_VERSION);
89+
return 0;
90+
}
91+
8492
if (template_names.length == 0) {
8593
return list_templates (args);
86-
} else if (template_names.length != 1) {
94+
}
95+
96+
if (template_names.length != 1) {
8797
stderr.printf ("%s", ctx.get_help (false, null));
8898
return 1;
8999
}

src/meson.build

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@ conf_data = configuration_data()
22
conf_data.set('DATA_DIR', templates_dir)
33
conf_data.set('VCS_TAG', '@VCS_TAG@')
44

5-
config_vala_in = configure_file(
6-
input: 'config.vala.in.in',
7-
output: 'config.vala.in',
5+
config_vala = configure_file(
6+
input: 'config.vala.in',
7+
output: 'config.vala',
88
configuration: conf_data
99
)
10-
config_vala = vcs_tag(
11-
input: config_vala_in,
12-
output: 'config.vala',
10+
version_vala = vcs_tag(
11+
input: 'version.vala.in',
12+
output: 'version.vala',
13+
command: ['git', 'describe', '--tags', '--dirty']
1314
)
1415

1516
executable('valdo',
1617
config_vala,
18+
version_vala,
1719
'main.vala',
1820
'template.vala',
1921
'templateengine.vala',

src/version.vala.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
namespace Config {
2+
const string PROJECT_VERSION = "@VCS_TAG@";
3+
}

0 commit comments

Comments
 (0)