Compare commits

..

1 commit

4 changed files with 6 additions and 34 deletions

2
cat.c
View file

@ -13,7 +13,7 @@ return 0;
} }
if(strcmp(argv[1],"-v")==0) if(strcmp(argv[1],"-v")==0)
{ {
printf("patricus utils, version %s",VERSION); printf("patricus utils, version %s",version);
return 0; return 0;
} }
for(int meowing=1;meowing<argc;meowing++){ for(int meowing=1;meowing<argc;meowing++){

View file

@ -11,7 +11,7 @@ int main(int argc, char *argv[]) {
return 1; return 1;
} }
else if(strcmp("-v", argv[1]) == 0) { else if(strcmp("-v", argv[1]) == 0) {
printf("patricus utils, version %s", VERSION); printf("patricus utils, version %s", version);
return 0; return 0;
} }
else if(argc == 2) { else if(argc == 2) {

View file

@ -1,5 +1,4 @@
project('patricus utils', 'c', 'cpp', version: '4.0', default_options: ['cpp_std=c++20']) project('patricus utils', 'c', version: '3.4')
branch_name = run_command('git', 'rev-parse', '--abbrev-ref', 'HEAD', check: true).stdout().strip() branch_name = run_command('git', 'rev-parse', '--abbrev-ref', 'HEAD', check: true).stdout().strip()
if branch_name.startswith('stable/') if branch_name.startswith('stable/')
full_version = meson.project_version() full_version = meson.project_version()
@ -8,8 +7,9 @@ else
full_version = '@0@(@1@)'.format(meson.project_version(), git_hash) full_version = '@0@(@1@)'.format(meson.project_version(), git_hash)
endif endif
# Generate header
conf = configuration_data() conf = configuration_data()
conf.set('VERSION', '"@0@"'.format(full_version)) conf.set('version', '"@0@"'.format(full_version))
configure_file( configure_file(
output: 'version.h', output: 'version.h',
@ -17,5 +17,4 @@ configure_file(
) )
executable('cat', ['cat.c', 'stdin.c'], include_directories: '.') executable('cat', ['cat.c', 'stdin.c'], include_directories: '.')
executable('cmpsize', ['cmpsize.c', 'bytes.c']) executable('cmpsize', ['cmpsize.c', 'bytes.c'], include_directories: '.')
executable('nuke', ['nuke.cpp'], include_directories: '.')

View file

@ -1,27 +0,0 @@
#include<version.h>
#include<string>
#include<filesystem>
#include<iostream>
using namespace std;
int main(int argc, char* argv[])
{
for(int i=1;i<argc;i++){
if (string(argv[i]) == "-v")
{
cout<<"patricus utils, version "+string(VERSION);
return 0;
}
if(!filesystem::exists(argv[i]))
{
cerr<<"error, no such file or directory";
return 1;
}
try
{
filesystem::remove_all(argv[i]);
}
catch(std::filesystem::filesystem_error){
cout<<"error: permission denied";
}
}
}