Skip to content

Commit

Permalink
Release 2021.07.22
Browse files Browse the repository at this point in the history
  • Loading branch information
Prince781 committed Jul 22, 2021
1 parent 32c7b9f commit f30a5c4
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 8 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('valdo', 'vala', 'c',
version: '0.0.1',
version: '2021.07.22',
license: 'LGPL-2.1-only')

valac = meson.get_compiler('vala')
Expand Down
File renamed without changes.
12 changes: 11 additions & 1 deletion src/main.vala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
[CCode (array_length = false, array_null_terminated = true)]
private string[] template_names; // we only want one template, and we discard the rest

private bool version;

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

if (version) {
stdout.printf ("valdo %s\n", Config.PROJECT_VERSION);
return 0;
}

if (template_names.length == 0) {
return list_templates (args);
} else if (template_names.length != 1) {
}

if (template_names.length != 1) {
stderr.printf ("%s", ctx.get_help (false, null));
return 1;
}
Expand Down
14 changes: 8 additions & 6 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ conf_data = configuration_data()
conf_data.set('DATA_DIR', templates_dir)
conf_data.set('VCS_TAG', '@VCS_TAG@')

config_vala_in = configure_file(
input: 'config.vala.in.in',
output: 'config.vala.in',
config_vala = configure_file(
input: 'config.vala.in',
output: 'config.vala',
configuration: conf_data
)
config_vala = vcs_tag(
input: config_vala_in,
output: 'config.vala',
version_vala = vcs_tag(
input: 'version.vala.in',
output: 'version.vala',
command: ['git', 'describe', '--tags', '--dirty']
)

executable('valdo',
config_vala,
version_vala,
'main.vala',
'template.vala',
'templateengine.vala',
Expand Down
3 changes: 3 additions & 0 deletions src/version.vala.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
namespace Config {
const string PROJECT_VERSION = "@VCS_TAG@";
}

0 comments on commit f30a5c4

Please sign in to comment.