*** empty log message ***

[bbtk.git] / kernel / src / bbtkConfigurationFile.cxx

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index d7806817f50d6c0e4bcc3f4230df76ea5adce7f1..8181a6aef371991c66bfa01cfe4a7a0eaf9ab4a8 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/21 09:37:23 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2008/03/03 08:06:36 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -36,6 +36,7 @@ namespace bbtk
   /// Constructor
   ConfigurationFile::ConfigurationFile()
   {
+
     // file separator
 #if defined(_WIN32)
     mFile_separator = "\\";
@@ -48,7 +49,7 @@ namespace bbtk
     mInstall_path = mBin_path + mFile_separator + "..";
     // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
     mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH);
-    mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(doc);
+//EED    mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(doc);
     // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
     mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path;
     // The relative path to the doc folder (=BBTK_BBS_REL_PATH)
@@ -68,7 +69,6 @@ namespace bbtk
     bbtkMessage("Config",1," ==> prefix : '"<<mInstall_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> doc    : '"<<mDoc_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> bbs    : '"<<mBbs_path<<"'"<<std::endl);
-    //   bbtkMessage("Config",1," ==> rsc    : '"<<mRsc_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> data   : '"<<mData_path<<"'"<<std::endl);
     
     
@@ -76,12 +76,20 @@ namespace bbtk
     // always add "." (current working directory) at the begining
     mBbs_paths.push_back("."); 
     // add system bbs path 
+    mBbs_paths.push_back(mBbs_path);
+    // add toolsbbtk/appli 
+    std::string toolsappli_rel_path(mFile_separator);
+    toolsappli_rel_path +=  "toolsbbtk" + mFile_separator + "appli";
+    mBbs_paths.push_back(mBbs_path + toolsappli_rel_path);
 #ifdef WIN32
-//EED for windows BUILD tree
-    mBbs_paths.push_back(mInstall_path + mFile_separator + ".." + mFile_separator + mBbs_rel_path);
+    //EED for windows BUILD tree
+    std::string winbbspath = mInstall_path + mFile_separator + ".." + mFile_separator + mBbs_rel_path;
+    mBbs_paths.push_back(winbbspath);
+    // add toolsbbtk/appli 
+    mBbs_paths.push_back(winbbspath + toolsappli_rel_path);
 #endif
-    mBbs_paths.push_back(mBbs_path);
 
+   
     
     // always add "." (current working directory) at the begining
     mPackage_paths.push_back(".");