*** empty log message ***

diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index 86713191cffd301d715858524063e6700bc49281..a1462c423990ebe7258307e2aca2002691f707e1 100644 (file)
--- 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 767f2b0550317274dacb21ca37cf002b304587d7..e60a894f48afee770e747266a477eaf1a01f21a1 100644 (file)
--- 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 (executable)
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 1dd5780150951a1384e8d10c127799930cb4423c..f24c0d3c8e02c8eda18daf3c30eb7762968d3336 100644 (file)
--- 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("<<level
+                       <<")"<<std::endl);
+    
+    const std::string config_xml_full_path      = Get_config_xml_full_path();    
+    const std::string description               = Get_description();
+    const std::string url                       = Get_doc_path();
+    const std::string data_path                 = Get_data_path();
+    const std::string default_temp_dir          = Get_default_temp_dir();    
+    const std::string file_separator            = Get_file_separator();    
+    const std::vector<std::string>bbs_paths     = Get_bbs_paths();
+    const std::vector<std::string>package_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<std::string>::const_iterator i;
+           
+    bbtkMessage("Help",level, "BBS Paths   " << std::endl);     
+    for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i )
+    {
+      bbtkMessage("Help",level,"--- ["<<*i<<"]"<<std::endl);
+    }    
+    
+    bbtkMessage("Help",level, "PACKAGE Paths : " << std::endl);     
+    for (i = package_paths.begin(); i!=package_paths.end(); ++i )
+    {
+      bbtkMessage("Help",level,"--- ["<<*i<<"]"<<std::endl);
+    }
+
+    bbtkDebugDecTab("Config",9);
+  }
+  //=========================================================================
+
 
 } // namespace bbtk

diff --git a/kernel/src/bbtkConfigurationFile.h b/kernel/src/bbtkConfigurationFile.h
index c871f14b81fe68f7b53febb8e70f4aea830cae93..8f15528987461855d36a0008b5c62501a8742e73 100644 (file)
--- a/kernel/src/bbtkConfigurationFile.h
+++ b/kernel/src/bbtkConfigurationFile.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/14 09:32:54 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/02/14 10:47:51 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -73,10 +73,12 @@ namespace bbtk
     void InstallPath ();
     
   public:
+    void GetHelp(int level) const;
+
     inline const std::string& Get_description() const
     { return mDescription;}
-    inline const std::string& Get_url() const
-    { return mUrl;}
+    //    inline const std::string& Get_url() const
+    //    { return mUrl;}
     inline const std::string& Get_data_path() const
     { return mData_path;}  
     inline const std::string& Get_file_separator() const

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index f0617c087e76bd851916bbfabb8d9032e4264f32..a6e4869da13ba3aa37898565273e3e165fe20cdc 100644 (file)
--- 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/12 12:55:16 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2008/02/14 10:47:51 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1086,7 +1086,8 @@ void Interpreter::Help(const std::vector<std::string>& 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<std::string>& 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<std::string>& words)
   /// Displays the Configuration
   void Interpreter::Config() const
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::Config"<<std::endl);
-    
-    ConfigurationFile cf = ConfigurationFile::GetInstance();
-    
-    const std::string config_xml_full_path      = cf.Get_config_xml_full_path();    
-    const std::string description               = cf.Get_description();
-    const std::string url                       = cf.Get_url();
-    const std::string data_path                 = cf.Get_data_path();
-    const std::string default_temp_dir          = cf.Get_default_temp_dir();    
-    const std::string file_separator            = cf.Get_file_separator();    
-    const std::vector<std::string>bbs_paths     = cf.Get_bbs_paths();
-    const std::vector<std::string>package_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<std::string>::const_iterator i;
-           
-    bbtkMessage("Help",1, "BBS Paths   " << std::endl);     
-    for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i )
-    {
-      bbtkMessage("Help",1,"--- ["<<*i<<"]"<<std::endl);
-    }    
-    
-    bbtkMessage("Help",1, "PACKAGE Paths : " << std::endl);     
-    for (i = package_paths.begin(); i!=package_paths.end(); ++i )
-    {
-      bbtkMessage("Help",1,"--- ["<<*i<<"]"<<std::endl);
-    }
-
-    bbtkDebugDecTab("Kernel",9);
+    ConfigurationFile::GetInstance().GetHelp(1);
   }  
+   //===================================================================    
 
   //=======================================================================
   /// Displays help on all the commands

diff --git a/kernel/src/bbtkWxBrowser.cxx b/kernel/src/bbtkWxBrowser.cxx
index 5a24a95b5d18b48f7db7955c101e240e566bcafa..b9f73ce404ad2534fd19892811ec63855db00f53 100644 (file)
--- a/kernel/src/bbtkWxBrowser.cxx
+++ b/kernel/src/bbtkWxBrowser.cxx
@@ -193,7 +193,7 @@ namespace bbtk
   //========================================================================
   void WxBrowser::GoHome()
   {
-    std::string url = ConfigurationFile::GetInstance().Get_url();
+    std::string url = ConfigurationFile::GetInstance().Get_doc_path();
     url += "/bbtkWebSite/menu.html";
     if (Utilities::FileExists(url)) 
       {