From 9244821a79f4853a78564d37b993b48d4b2ad4e9 Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 5 Feb 2008 08:25:21 +0000 Subject: [PATCH] *** empty log message *** --- kernel/appli/bbi/bbs-mode.el | 2 + kernel/cmake/BBTKConfigurePackage.cmake | 39 ++++++++- kernel/cmake/BBTKConfigurePackage_src.cmake | 7 +- kernel/cmake/BBTKSetDeducedPaths.cmake | 19 +++++ kernel/doc/bbtkWebSite/CMakeLists.txt | 20 +---- kernel/src/bbtkInterpreter.cxx | 92 ++++++++++----------- kernel/src/bbtkInterpreter.h | 13 +-- kernel/src/bbtkWxConsole.h | 6 +- 8 files changed, 116 insertions(+), 82 deletions(-) diff --git a/kernel/appli/bbi/bbs-mode.el b/kernel/appli/bbi/bbs-mode.el index 16007a0..e6d0df0 100644 --- a/kernel/appli/bbi/bbs-mode.el +++ b/kernel/appli/bbi/bbs-mode.el @@ -41,6 +41,8 @@ "reset" "set" "unload" + "index" + "keyword" ) t ) "Highlighting expressions for bbs mode.") ) diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index 1faac16..dfcc6b1 100644 --- a/kernel/cmake/BBTKConfigurePackage.cmake +++ b/kernel/cmake/BBTKConfigurePackage.cmake @@ -19,12 +19,34 @@ OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME} "Build the bbtk package ${BBTK_PACKAGE_NAME} ?" OFF) SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) #----------------------------------------------------------------------------- + +#----------------------------------------------------------------------------- +# Package dependencies +#IF(UNIX) +SET(${BBTK_PACKAGE_NAME}_DEPS bb${BBTK_PACKAGE_NAME}) +#${EXECUTABLE_OUTPUT_PATH}/libbb${BBTK_PACKAGE_NAME}.so) +#ELSE(UNIX) +#SET(${BBTK_PACKAGE_NAME}_DEPS ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbs) +#ENDIF(UNIX) +STRING(REGEX MATCH "${${BBTK_PACKAGE_NAME}_DEPS}" + ${BBTK_PACKAGE_NAME}_IN_DEPS + "${BBTK_PACKAGES_DEPS}") +ENDIF(UNIX) +#----------------------------------------------------------------------------- #----------------------------------------------------------------------------- # IF THE USER HAS CHOSEN TO BUILD THE PACKAGE IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) #--------------------------------------------------------------------------- + #--------------------------------------------------------------------------- + # If package deps not in global deps : add them + IF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS) + SET(BBTK_PACKAGES_DEPS "${${BBTK_PACKAGE_NAME}_DEPS};${BBTK_PACKAGES_DEPS}" + CACHE INTERNAL "bbtk packages dependencies" FORCE) + ENDIF(NOT ${BBTK_PACKAGE_NAME}_IN_DEPS) + #--------------------------------------------------------------------------- + #--------------------------------------------------------------------------- # Package dependencies IF(${BBTK_PACKAGE_NAME}_USE_VTK) @@ -104,7 +126,22 @@ IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) SUBDIRS(bbs) #--------------------------------------------------------------------------- - +#--------------------------------------------------------------------------- +ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) + #------------------------------------------------------------------------- + + #----------------------------------------------------------------------- + # If package deps in global deps : remove them + IF(${BBTK_PACKAGE_NAME}_IN_DEPS) + STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};" + "" TEMP + ${BBTK_PACKAGES_DEPS}) + + SET(BBTK_PACKAGES_DEPS ${TEMP} + CACHE INTERNAL "bbtk packages dependencies" FORCE) + ENDIF(${BBTK_PACKAGE_NAME}_IN_DEPS) + #----------------------------------------------------------------------- + #--------------------------------------------------------------------------- ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 22d9338..c854b7b 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -66,11 +66,6 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES}) GET_FILENAME_COMPONENT(filename "${xmlfile}" NAME_WE) - IF(EXISTS ${BBTK_BBFY}) - SET(BBFY_DEPENDENCY) - ELSE(EXISTS ${BBTK_BBFY}) - SET(BBFY_DEPENDENCY ${BBTK_BBFY}) - ENDIF(EXISTS ${BBTK_BBFY}) SET(BBFY_CXX_OUT ${CMAKE_CURRENT_BINARY_DIR}/${filename}.cxx) @@ -79,7 +74,7 @@ FOREACH(xmlfile ${BBTK_PACKAGE_XML_SOURCES}) COMMAND ${BBTK_BBFY} ${xmlfile} ${CMAKE_CURRENT_BINARY_DIR}/ -q DEPENDS ${xmlfile} - ${BBFY_DEPENDENCY} + ${BBTK_BBFY_DEPENDENCY} ) SET_SOURCE_FILES_PROPERTIES( diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake index db5999c..c314293 100644 --- a/kernel/cmake/BBTKSetDeducedPaths.cmake +++ b/kernel/cmake/BBTKSetDeducedPaths.cmake @@ -33,3 +33,22 @@ SET (LIBRARY_OUTPUT_PATH # When installed as a separate project will have to find it with FIND_PACKAGE SET(CMakeCreateFindPackage_DIR ${BBTK_CMAKE_DIR}) #----------------------------------------------------------------------------- + + +#----------------------------------------------------------------------------- +# Dependencies added only the first time ! +IF(EXISTS ${BBTK_BBI}) + SET(BBTK_BBI_DEPENDENCY) +ELSE(EXISTS ${BBTK_BBI}) + SET(BBTK_BBI_DEPENDENCY ${BBTK_BBI}) +ENDIF(EXISTS ${BBTK_BBI}) + + +IF(EXISTS ${BBTK_BBFY}) + SET(BBTK_BBFY_DEPENDENCY) +ELSE(EXISTS ${BBTK_BBFY}) + SET(BBTK_BBFY_DEPENDENCY ${BBTK_BBFY}) +ENDIF(EXISTS ${BBTK_BBFY}) + +#----------------------------------------------------------------------------- + diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index 8357831..62e1307 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -1,17 +1,7 @@ - +# Configure & install images BBTK_DOC_INSTALL_IMAGES(bbtkWebSite) -#FILE(GLOB PNG_IMAGES "." "*.png") -#FOREACH(image ${PNG_IMAGES}) -# GET_FILENAME_COMPONENT(filename "${image}" NAME) -# CONFIGURE_FILE( -# ${image} -# ${CMAKE_CURRENT_BINARY_DIR}/${filename} -# COPYONLY -# ) -#ENDFOREACH(image) - -# Configure for build tree and install +# Configure html pages for build tree and install FILE(GLOB HTML_PAGES "." "*.html") FOREACH(page ${HTML_PAGES}) GET_FILENAME_COMPONENT(filename "${page}" NAME) @@ -27,8 +17,7 @@ FOREACH(page ${HTML_PAGES}) ) ENDFOREACH(page) - -# Index +# Index generation SET(BBTK_INDEX_ALPHA_FILE ${BBTK_BBDOC_BUILD_PATH}/index-alpha.html) SET(BBTK_INDEX_PACKAGES_FILE ${BBTK_BBDOC_BUILD_PATH}/index-package.html) SET(BBTK_INDEX_KEYWORDS_FILE ${BBTK_BBDOC_BUILD_PATH}/index-keyword.html) @@ -36,7 +25,6 @@ SET(INDEX_OUTPUT ${BBTK_INDEX_ALPHA_FILE} ${BBTK_INDEX_PACKAGES_FILE} ${BBTK_INDEX_KEYWORDS_FILE} ) - CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/make-index.bbs.in ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs @@ -46,7 +34,7 @@ ADD_CUSTOM_COMMAND( OUTPUT ${INDEX_OUTPUT} COMMAND cd ${BBTK_BIN_PATH} && ${BBTK_BBI} -n ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs - # DEPENDS ${PACKAGE_NAME} + DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS} ) ADD_CUSTOM_TARGET(bbdoc_index ALL DEPENDS ${INDEX_OUTPUT} diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 7a57fe9..d0906a6 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/02/04 13:51:30 $ - Version: $Revision: 1.19 $ + Date: $Date: 2008/02/05 08:25:22 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -44,7 +44,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; */ Interpreter::Interpreter() : - mCommandLine(false), verbose(false) + mCommandLine(false) { bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1); bbtk::MessageManager::RegisterMessageType("Interpreter","Messages of the interpreter",0); @@ -157,9 +157,9 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.keyword = "config"; // JPR info.argmin = 0; - info.argmax = 1; + info.argmax = 0; info.code = cConfig; - info.syntax = "config [|]"; + info.syntax = "config"; info.help = "Prints the value of all configuration parameters"; mCommandDict[info.keyword] = info; @@ -287,7 +287,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; delete mExecuter; //delete mFactory; - // std::cout <<"EO Interpreter::~Interpreter()"<0) { @@ -548,11 +548,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cConfig : - if (words.size()>1) // any param for config means verbose = true - verbose = true; - else - verbose = false; - Config(verbose); + Config(); break; case cReset : // EED @@ -562,16 +558,16 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) case cInclude : if (mCommandLine) { - InterpretFile(words[1], true, verbose); // true : better pass use_config_file + InterpretFile(words[1], true ); // true : better pass use_config_file } else { - SwitchToFile(words[1], true, verbose); // true : better pass use_config_file + SwitchToFile(words[1], true ); // true : better pass use_config_file } break; case cLoad: - LoadPackage(words[1], true, verbose); // true : better pass use_config_file + LoadPackage(words[1], true ); // true : better pass use_config_file break; case cUnload: @@ -647,18 +643,15 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // Replaces substrings "\\n" by a real carriage return "\n" void SubsBackslashN ( std::string& s ) { - // std::cout << "BEFORE=["<& { // Found a text token, add it to the vector. chains.push_back(str.substr(lastPos, pos - lastPos)); - // std::cout << "text='"<& tok = str.substr(lastPos, pos - lastPos); Utilities::SplitAroundFirstDot(tok,box,output); chains.push_back( mExecuter->Get(box,output) ); - // std::cout << "outp='"<& // is_text = !is_text; } - // std::cout << "nb="<::iterator i; for (i= chains.begin(); i!=chains.end(); ++i) { @@ -728,7 +718,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // =================================================================================== void Interpreter::SwitchToFile( const std::string& name, - bool use_configuration_file, bool verbose) + bool use_configuration_file ) { // Note : in the following : // name : the user supplied name @@ -743,9 +733,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \"" < script_paths; std::string fullPathScriptName; // full path script name std::string pkgname; // e.g. .bbs @@ -756,13 +743,14 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // The following is *NOT* a debug time message : // It's a user intended message. // Please don't remove it. - if (verbose) - std::cout << "look for : [" << name << "] (use_configuration_file == TRUE)" << std::endl; + bbtkMessage("Interpreter",1, + "look for : [" << name + << "] (use_configuration_file == TRUE)" << std::endl); script_paths = ConfigurationFile::GetInstance().Get_bbs_paths(); } std::string upath; pkgname = Utilities::ExtractScriptName(name,upath); -//std::cout <<"name [" << name << "] pkgname [" << pkgname << "] upath [" << upath << "]" << std::endl; + bool fullnameGiven = false; bool foundFile = false; @@ -782,8 +770,9 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& nbBssFiles++; } if (nbBssFiles==0) - if (verbose) - std::cout << "WARNING : No '.bbs' file found in [" << upath << "]" << std::endl; + bbtkMessage("Interpreter",2, + "WARNING : No '.bbs' file found in [" + << upath << "]" << std::endl); return; } @@ -805,9 +794,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& } fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false); -//std::cout <<"fullpath [" << fullDirectoryName << "]" <& // The following is *NOT* a debug time message : // It's a user intended message. // Please don't remove it. - if (verbose) - std::cout <<" [" <::iterator i = Filenames.begin(); i!= Filenames.end(); ++i) { - // std::cout << "=== "<<*i<<" =="<& // ===========================================================check user supplied location fullnameGiven = true; - fullPathScriptName = Utilities::ExpandLibName(name, verbose); + + fullPathScriptName = Utilities::ExpandLibName(name, false); // allow user to always forget ".bbs" int l = fullPathScriptName.size(); @@ -902,7 +890,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); //pkgname); fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); -//std::cout << "FULL PATH = "<& // The following is *NOT* a debug time message : // It's a user intended message. // Please don't remove it. - if (verbose) - std::cout <<" [" <& if (find(mFileName.begin(),mFileName.end(),fullPathScriptName) !=mFileName.end()) { - bbtkMessage("Interpreter",1,"file '"<& return; } - //if (verbose) - std::cout << " -->[" << fullPathScriptName << "] found" << std::endl; + bbtkMessage("Interpreter",1," -->[" << fullPathScriptName + << "] found" << std::endl); mFile.push_back(s); mFileName.push_back(fullPathScriptName); @@ -1137,7 +1129,7 @@ void Interpreter::Help(const std::vector& words) //=================================================================== /// Displays the Configuration - void Interpreter::Config( bool verbose ) const + void Interpreter::Config() const { bbtkDebugMessageInc("Core",9,"Factory::Config"<SetDialogMode(t); } /// Runs the interpretation of a file - void InterpretFile( const std::string& filename, bool use_configuration_file=true, bool verbose=false); + void InterpretFile( const std::string& filename, + bool use_configuration_file=true); /// Interprets a line (either from a file or typed interactively) void InterpretLine( const std::string& line, bool &insideComment ); @@ -130,7 +131,8 @@ namespace bbtk CommandInfoType& info ); /// Switch to the interpretation of a file - void SwitchToFile( const std::string& filename, bool use_configuration_file=true, bool verbose=false ); + void SwitchToFile( const std::string& filename, + bool use_configuration_file=true); /// Closes the currently open file void CloseCurrentFile(); @@ -151,7 +153,7 @@ namespace bbtk void Graph(const std::vector& words); /// - void Config(bool verbose) const; // JPR + void Config() const; /// void Print(const std::string&); @@ -198,7 +200,6 @@ namespace bbtk /// The history of commands std::deque< char* > mHistory; - bool verbose; // true -> displays the search results (for packages) }; diff --git a/kernel/src/bbtkWxConsole.h b/kernel/src/bbtkWxConsole.h index 5de4ea9..407e5d1 100644 --- a/kernel/src/bbtkWxConsole.h +++ b/kernel/src/bbtkWxConsole.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxConsole.h,v $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/05 08:25:23 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -72,7 +72,7 @@ namespace bbtk /// Runs the interpretation of a file void InterpretFile( const std::string& filename, bool use_configuration_file = true) - { mInterpreter->InterpretFile(filename,use_configuration_file, false); } + { mInterpreter->InterpretFile(filename,use_configuration_file); } void OnMenuQuit(wxCommandEvent& event); void OnMenuAbout(wxCommandEvent& event); -- 2.45.1