Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

basename -> filename, fixes #2027

Browse Source
This commit is contained in:
Patrick Niklaus 2016-04-08 01:50:25 +02:00
parent 6033c05ff0
commit dea12779cf
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -220,8 +220,7 @@ if(NOT WIN32)
endif() endif()
add_definitions(-DBOOST_SPIRIT_USE_PHOENIX_V3) add_definitions(-DBOOST_SPIRIT_USE_PHOENIX_V3)
add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
# XXX: activate when we're clean of deprecated Boost.FS features add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
# add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
find_package(Threads REQUIRED) find_package(Threads REQUIRED)

3
src/tools/contract.cpp
View File

@ -61,8 +61,9 @@ return_code parseArguments(int argc, char *argv[], contractor::ContractorConfig
boost::program_options::options_description cmdline_options; boost::program_options::options_description cmdline_options;
cmdline_options.add(generic_options).add(config_options).add(hidden_options); cmdline_options.add(generic_options).add(config_options).add(hidden_options);
const auto* executable = argv[0];
boost::program_options::options_description visible_options( boost::program_options::options_description visible_options(
"Usage: " + boost::filesystem::basename(argv[0]) + " <input.osrm> [options]"); "Usage: " + boost::filesystem::path(executable).filename().string() + " <input.osrm> [options]");
visible_options.add(generic_options).add(config_options); visible_options.add(generic_options).add(config_options);
// parse command line options // parse command line options

3
src/tools/extract.cpp
View File

@ -64,8 +64,9 @@ return_code parseArguments(int argc, char *argv[], extractor::ExtractorConfig &e
boost::program_options::options_description cmdline_options; boost::program_options::options_description cmdline_options;
cmdline_options.add(generic_options).add(config_options).add(hidden_options); cmdline_options.add(generic_options).add(config_options).add(hidden_options);
const auto* executable = argv[0];
boost::program_options::options_description visible_options( boost::program_options::options_description visible_options(
boost::filesystem::basename(argv[0]) + " <input.osm/.osm.bz2/.osm.pbf> [options]"); boost::filesystem::path(executable).filename().string() + " <input.osm/.osm.bz2/.osm.pbf> [options]");
visible_options.add(generic_options).add(config_options); visible_options.add(generic_options).add(config_options);
// parse command line options // parse command line options

2
src/tools/routed.cpp
View File

@ -111,7 +111,7 @@ generateServerProgramOptions(const int argc,
const auto* executable = argv[0]; const auto* executable = argv[0];
boost::program_options::options_description visible_options( boost::program_options::options_description visible_options(
boost::filesystem::path(executable).stem().string() + " <base.osrm> [<options>]"); boost::filesystem::path(executable).filename().string() + " <base.osrm> [<options>]");
visible_options.add(generic_options).add(config_options); visible_options.add(generic_options).add(config_options);
// parse command line options // parse command line options

3
src/tools/store.cpp
View File

@ -35,8 +35,9 @@ bool generateDataStoreOptions(const int argc, const char *argv[], boost::filesys
boost::program_options::options_description cmdline_options; boost::program_options::options_description cmdline_options;
cmdline_options.add(generic_options).add(config_options).add(hidden_options); cmdline_options.add(generic_options).add(config_options).add(hidden_options);
const auto* executable = argv[0];
boost::program_options::options_description visible_options( boost::program_options::options_description visible_options(
boost::filesystem::basename(argv[0]) + " [<options>] <configuration>"); boost::filesystem::path(executable).filename().string() + " [<options>] <configuration>");
visible_options.add(generic_options).add(config_options); visible_options.add(generic_options).add(config_options);
// print help options if no infile is specified // print help options if no infile is specified