Skip to content
Snippets Groups Projects
Commit fdab38a3 authored by Maël Madon's avatar Maël Madon
Browse files

clean: rename project, #3

parent ded5259a
Branches
Tags
1 merge request!4Clean repo
project('batsched', 'cpp', project('batmen', 'cpp',
version: '1.4.0', version: '1.0',
license: 'free', license: 'LGPLv3',
default_options: ['cpp_std=c++11'], default_options: ['cpp_std=c++11'],
meson_version: '>=0.40.0' meson_version: '>=0.40.0'
) )
...@@ -15,7 +15,7 @@ loguru_dep = dependency('loguru') ...@@ -15,7 +15,7 @@ loguru_dep = dependency('loguru')
intervalset_dep = dependency('intervalset') intervalset_dep = dependency('intervalset')
gmpxx_dep = dependency('gmpxx') gmpxx_dep = dependency('gmpxx')
batsched_deps = [ batmen_deps = [
boost_dep, boost_dep,
rapidjson_dep, rapidjson_dep,
libzmq_dep, libzmq_dep,
...@@ -74,9 +74,9 @@ src = [ ...@@ -74,9 +74,9 @@ src = [
] ]
include_dir = include_directories('src') include_dir = include_directories('src')
batsched = executable('batsched', src, batmen = executable('batmen', src,
include_directories: include_dir, include_directories: include_dir,
dependencies: batsched_deps, dependencies: batmen_deps,
cpp_args: '-DBATSCHED_VERSION=@0@'.format(meson.project_version()), cpp_args: '-DBATMEN_VERSION=@0@'.format(meson.project_version()),
install: true install: true
) )
...@@ -45,14 +45,6 @@ void run(Network &n, ISchedulingAlgorithm *algo, SchedulingDecision &d, Workload ...@@ -45,14 +45,6 @@ void run(Network &n, ISchedulingAlgorithm *algo, SchedulingDecision &d, Workload
*/ */
#define STR(x) STR_HELPER(x) #define STR(x) STR_HELPER(x)
/** @def BATSCHED_VERSION
* @brief What batsched --version should return.
*
* It is either set by CMake or set to vUNKNOWN_PLEASE_COMPILE_VIA_CMAKE
**/
#ifndef BATSCHED_VERSION
#define BATSCHED_VERSION vUNKNOWN_PLEASE_COMPILE_VIA_CMAKE
#endif
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
...@@ -96,7 +88,6 @@ int main(int argc, char **argv) ...@@ -96,7 +88,6 @@ int main(int argc, char **argv)
args::ValueFlag<bool> flag_call_make_decisions_on_single_nop(parser, "flag", args::ValueFlag<bool> flag_call_make_decisions_on_single_nop(parser, "flag",
"If set to true, make_decisions will be called after single NOP messages.", "If set to true, make_decisions will be called after single NOP messages.",
{ "call_make_decisions_on_single_nop" }, true); { "call_make_decisions_on_single_nop" }, true);
args::Flag flag_version(parser, "version", "Shows batsched version", { "version" });
try try
{ {
...@@ -135,11 +126,6 @@ int main(int argc, char **argv) ...@@ -135,11 +126,6 @@ int main(int argc, char **argv)
return 1; return 1;
} }
if (flag_version)
{
printf("%s\n", STR(BATSCHED_VERSION));
return 0;
}
string socket_endpoint = flag_socket_endpoint.Get(); string socket_endpoint = flag_socket_endpoint.Get();
string scheduling_variant = flag_scheduling_variant.Get(); string scheduling_variant = flag_scheduling_variant.Get();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment