From: guigues Date: Thu, 14 Feb 2008 10:47:51 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: r0.6.1~218 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9edc48dd1cb5a2fe6a09d147eed459cb6e9f0fca;p=bbtk.git *** empty log message *** --- diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake index 8671319..a1462c4 100644 --- a/kernel/cmake/BBTKKernelConfig.cmake +++ b/kernel/cmake/BBTKKernelConfig.cmake @@ -13,7 +13,6 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src ) SET(BBTK_CORE_PACKAGE TRUE) #---------------------------------------------------------------------------- - #----------------------------------------------------------------------------- # Path for binaries SET (EXECUTABLE_OUTPUT_REL_PATH bin) diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index 767f2b0..e60a894 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -25,6 +25,7 @@ SET(INDEX_OUTPUT ${BBTK_INDEX_ALPHA_FILE} ${BBTK_INDEX_PACKAGES_FILE} ${BBTK_INDEX_CATEGORIES_FILE} ) + CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/make-index.bbs.in ${CMAKE_CURRENT_BINARY_DIR}/make-index.bbs @@ -39,6 +40,11 @@ ADD_CUSTOM_COMMAND( ADD_CUSTOM_TARGET(bbdoc_index ALL DEPENDS ${INDEX_OUTPUT} ) +INSTALL( + FILES ${INDEX_OUTPUT} + DESTINATION ${BBTK_BBDOC_INSTALL_PATH} + ) + # create make-index.bbs for build / install tree SET(BBTK_INDEX_ALPHA_FILE index-alpha.html) SET(BBTK_INDEX_PACKAGES_FILE index-package.html) diff --git a/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in b/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in new file mode 100755 index 0000000..835627f --- /dev/null +++ b/kernel/doc/bbtkWebSite/bbtk-make-index.sh.in @@ -0,0 +1,19 @@ +#!/bin/bash +# Have to source the bashrc for potential LD_LIBRARY_PATH additions +# (typical /usr/local install) +source ${HOME}/.bashrc +#echo ${LD_LIBRARY_PATH} + +echo "** Recreating bbtk doc index **" + +TMP=$(which $0|rev) +TMP2=$(echo ${TMP#*/}|rev) +DIR=${TMP2}/../@bbtk_install_gnome_DATA_REL_PATH@ + +echo "> cd ${DIR}/@BBTK_BBDOC_REL_PATH@" +cd ${DIR}/@BBTK_BBDOC_REL_PATH@ + +echo "> bbi -n ./make-index" +bbi -n ./make-index + +echo "** Done ! **" diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index 1dd5780..f24c0d3 100644 --- a/kernel/src/bbtkConfigurationFile.cxx +++ b/kernel/src/bbtkConfigurationFile.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkConfigurationFile.cxx,v $ Language: C++ - Date: $Date: 2008/02/14 09:57:18 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/02/14 10:47:51 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -79,19 +79,19 @@ namespace bbtk // always add "." (current working directory) at the begining mPackage_paths.push_back("."); -#ifdef UNIX +#ifndef WIN32 // add system bin path (for build tree) // mPackage_paths.push_back(mBin_path); // add system lib path (for install tree) mPackage_paths.push_back(mInstall_path + mFile_separator + "lib"); -#endif -#ifdef WIN32 +#else // add bin/Debug bin/Release paths (for build/install tree) mPackage_paths.push_back(mBin_path + mFile_separator + "Debug"); mPackage_paths.push_back(mBin_path + mFile_separator + "Release"); #endif - + GetHelp(2); + // ==> First we look for bbtk_config.xml in "." char buf[2048]; const char *currentDir = getcwd(buf, 2048); @@ -429,8 +429,53 @@ namespace bbtk size_t pos = mConfig_xml_full_path.find("bbtk_config.xml"); mDefault_temp_dir = mConfig_xml_full_path.substr (0,pos); } - + + GetHelp(2); } //========================================================================= + + + //========================================================================= + void ConfigurationFile::GetHelp(int level) const + { + bbtkDebugMessageInc("Config",9,"ConfigurationFile::GetHelp("<bbs_paths = Get_bbs_paths(); + const std::vectorpackage_paths = Get_package_paths(); + + bbtkMessage("Help",level, "=============" << std::endl); + bbtkMessage("Help",level, "Configuration" << std::endl); + bbtkMessage("Help",level, "=============" << std::endl); + bbtkMessage("Help",level, "bbtk_config.xml : [" << config_xml_full_path << "]" << std::endl); + bbtkMessage("Help",level, "Documentation Url : [" << url << "]" << std::endl); + bbtkMessage("Help",level, "Data Path : [" << data_path << "]" << std::endl); + bbtkMessage("Help",level, "Default Temp-Dir : [" << default_temp_dir << "]" << std::endl); + bbtkMessage("Help",level, "File Separator : [" << file_separator << "]" << std::endl); + + std::vector::const_iterator i; + + bbtkMessage("Help",level, "BBS Paths " << std::endl); + for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i ) + { + bbtkMessage("Help",level,"--- ["<<*i<<"]"<& words) #ifdef _USE_WXWIDGETS_ if ( WxConsole::GetInstance() != 0 ) { - std::string url = ConfigurationFile::GetInstance().Get_url(); + std::string url = + ConfigurationFile::GetInstance().Get_doc_path(); url += "/bbdoc/" + words[1] + "/index.html"; if (Utilities::FileExists(url)) { @@ -1104,7 +1105,8 @@ void Interpreter::Help(const std::vector& words) #ifdef _USE_WXWIDGETS_ if ( WxConsole::GetInstance() != 0 ) { - std::string url = ConfigurationFile::GetInstance().Get_url(); + std::string url = + ConfigurationFile::GetInstance().Get_doc_path(); url += "/bbdoc/" + package + "/index.html"; if (Utilities::FileExists(url)) { @@ -1162,44 +1164,9 @@ void Interpreter::Help(const std::vector& words) /// Displays the Configuration void Interpreter::Config() const { - bbtkDebugMessageInc("Kernel",9,"Factory::Config"<bbs_paths = cf.Get_bbs_paths(); - const std::vectorpackage_paths = cf.Get_package_paths(); - - bbtkMessage("Help",1, "=============" << std::endl); - bbtkMessage("Help",1, "Configuration" << std::endl); - bbtkMessage("Help",1, "=============" << std::endl); - bbtkMessage("Help",1, "bbtk_config.xml : [" << config_xml_full_path << "]" << std::endl); - bbtkMessage("Help",1, "Documentation Url : [" << url << "]" << std::endl); - bbtkMessage("Help",1, "Data Path : [" << data_path << "]" << std::endl); - bbtkMessage("Help",1, "Default Temp-Dir : [" << default_temp_dir << "]" << std::endl); - bbtkMessage("Help",1, "File Separator : [" << file_separator << "]" << std::endl); - - std::vector::const_iterator i; - - bbtkMessage("Help",1, "BBS Paths " << std::endl); - for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i ) - { - bbtkMessage("Help",1,"--- ["<<*i<<"]"<