diff --git a/framework/BUILD b/framework/BUILD index 61f3f2d6aa22ed3cdf81bc93a444a364e8863695..fdd54a6c6a2d91afeb49ae16aa87665184e595af 100644 --- a/framework/BUILD +++ b/framework/BUILD @@ -19,7 +19,8 @@ cc_library( ], deps = [ ":cybertron_common", - "@glog//:glog" + "@glog//:glog", + "//external:gflags", ] ) diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index 9475661d027b2c45787c332337aaa14f14c73254..4e52a207c386e2b16d0caa6a65faccd9143924ec 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt @@ -50,7 +50,8 @@ file(GLOB CYBERTRON_SRCS "cybertron/croutine/context/*.cpp" "cybertron/event/*.cpp" "cybertron/croutine/system/system_hook.cpp" - "cybertron/mainboard/*.cpp" + "cybertron/mainboard/module_argument.cpp" + "cybertron/mainboard/module_controller.cpp" "cybertron/message/*.cpp" ) @@ -72,6 +73,7 @@ target_link_libraries(cybertron fastcdr -lrt glog + gflags PocoFoundation -Wl,--no-undefined atomic diff --git a/framework/cybertron/conf/cybertron.pb.conf b/framework/cybertron/conf/cybertron.pb.conf index ac2d6b4deca736f08268c3d245f7d9e4ab291402..344d38af7c30a4985c81ebcad52efcdb8fc08c23 100644 --- a/framework/cybertron/conf/cybertron.pb.conf +++ b/framework/cybertron/conf/cybertron.pb.conf @@ -1,5 +1,5 @@ log_conf { - log_dir: "log" + log_dir: "/apollo/data/log" log_to_stderr: true # DEBUG INFO WARNING ERROR FATAL min_log_level: INFO diff --git a/framework/cybertron/mainboard/CMakeLists.txt b/framework/cybertron/mainboard/CMakeLists.txt index 1128e6c2db34f5d401f36e4fc66686963368d49c..36d7360305148f29bb74b387bed2b4455442d3f5 100644 --- a/framework/cybertron/mainboard/CMakeLists.txt +++ b/framework/cybertron/mainboard/CMakeLists.txt @@ -2,8 +2,6 @@ project(mainboard) add_executable(mainboard mainboard.cpp - module_argument.cpp - module_controller.cpp ) target_link_libraries(mainboard -pthread cybertron) diff --git a/framework/cybertron/mainboard/mainboard.cpp b/framework/cybertron/mainboard/mainboard.cpp index 948061c499f547f3c8227cbec9b5f20e51987478..f91686c012f353aa2cf5c5cb13d322c39c9b146f 100644 --- a/framework/cybertron/mainboard/mainboard.cpp +++ b/framework/cybertron/mainboard/mainboard.cpp @@ -21,6 +21,7 @@ #include "cybertron/init.h" #include "cybertron/mainboard/module_argument.h" #include "cybertron/mainboard/module_controller.h" +#include "gflags/gflags.h" using apollo::cybertron::common::WorkRoot; using apollo::cybertron::common::GetAbsolutePath; @@ -32,6 +33,7 @@ using apollo::cybertron::mainboard::ModuleController; int main(int argc, char** argv) { // Initialize cybertron internal static objects apollo::cybertron::Init(argv[0]); + google::SetUsageMessage("This program used for load dag and run user apps."); // parser the argument ModuleArgument module_args;