diff --git a/cat.c b/cat.c index e3562cb..5accecd 100644 --- a/cat.c +++ b/cat.c @@ -5,10 +5,8 @@ #include #include #include -#include int main(int argc,char *argv[]) { - if(argc==1) { read_from_stdin(); return 0; diff --git a/meson.build b/meson.build index c52b376..52e47be 100644 --- a/meson.build +++ b/meson.build @@ -1,10 +1,11 @@ project('patricus utils', 'c', version: '3.4') - -# Get the short git commit hash -git_hash = run_command('git', 'rev-parse', 'HEAD', check: true).stdout().strip() - -# Combine version and hash -full_version = '@0@(@1@)'.format(meson.project_version(), git_hash) +branch_name = run_command('git', 'rev-parse', '--abbrev-ref', 'HEAD', check: true).stdout().strip() +if branch_name.startswith('stable/') + full_version = meson.project_version() +else + git_hash = run_command('git', 'rev-parse', 'HEAD', check: true).stdout().strip() + full_version = '@0@(@1@)'.format(meson.project_version(), git_hash) +endif # Generate header conf = configuration_data() diff --git a/version.h b/version.h deleted file mode 100644 index 49d5957..0000000 --- a/version.h +++ /dev/null @@ -1 +0,0 @@ -0.1 diff --git a/version.hcode b/version.hcode deleted file mode 100644 index 9e45084..0000000 --- a/version.hcode +++ /dev/null @@ -1 +0,0 @@ -0.1 meow.c