From d918bf0b79d67ae98ec9b0c0966525bfa879dacb Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Wed, 26 Jun 2013 11:34:24 +0200 Subject: [PATCH] Feature #2042 bbpConfigurator This application should replace the macro BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT in order to organize the includes so the dependecies are taken into account. Fix: Command line comments on execution. --- .../appli/bbpConfigurator/bbpConfigurator.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/kernel/appli/bbpConfigurator/bbpConfigurator.cpp b/kernel/appli/bbpConfigurator/bbpConfigurator.cpp index 4d71e23..fdabc26 100644 --- a/kernel/appli/bbpConfigurator/bbpConfigurator.cpp +++ b/kernel/appli/bbpConfigurator/bbpConfigurator.cpp @@ -55,7 +55,7 @@ int main(int argc, char **argv) // Check arguments if (argc != 4) { - std::cout << "usage : bbConfigurator " << std::endl; + std::cout << "bbpConfigurator usage: bbConfigurator " << std::endl; return 1; } @@ -63,11 +63,16 @@ int main(int argc, char **argv) std::string package_name(argv[2]); std::string path_out(argv[3]); + std::cout << "bbpConfigurator launched with bbs path: '" << path_bbs << + "', package: '" << package_name << + "', output path: '" << path_out << "'." << std::endl; + // Get bbs files in path_bbs std::vector files = getFileList(path_bbs); if(files.size() == 0) { - std::cout << "No files to check." << std::endl; + std::cout << "bbpConfigurator: No files to check in bbs path. " + "An empty bbp will be created for the package '" << package_name << "'." << std::endl; // Write results to bbp file #ifdef WIN32 @@ -161,12 +166,13 @@ int main(int argc, char **argv) // Check there are no cycles in graph if(isCycle(g)) { - std::cout << "there are dependency cycles, please check your scripts." << std::endl; + std::cout << "bbpConfigurator: There are dependency cycles, please check your scripts in '" << + path_bbs << "'. No bbp file created." << std::endl; return 2; } else { - std::cout << "no cycles, we keep going." << std::endl; + std::cout << "bbpConfigurator: No cycles detected in dependency graph." << std::endl; std::vector priorities(boxs.size(), -1); setPriorities(g, priorities); // for (int i = 0; i < (int)priorities.size(); i++) @@ -222,6 +228,8 @@ int main(int argc, char **argv) out << "#-- EOF ----------------------------------" << std::endl; out.close(); + + std::cout << "bbpConfigurator: bbp file created at '" << fname << "'." << std::endl; } return 0; } @@ -314,7 +322,7 @@ std::vector getFileList(const std::string& path) } else { - std::cout<< "the path to the bbs's should be a folder and not a file."; + std::cout<< "bbpConfigurator: The path to the bbs's doesn't exist or is not a folder. ('" << path << "')" << std::endl; return files; } -- 2.47.1