X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkConfigurationFile.cxx;h=d7806817f50d6c0e4bcc3f4230df76ea5adce7f1;hb=63005ec659612d567c00bfbb9ecbd62566a3217d;hp=f24c0d3c8e02c8eda18daf3c30eb7762968d3336;hpb=9edc48dd1cb5a2fe6a09d147eed459cb6e9f0fca;p=bbtk.git

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index f24c0d3..d780681 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 10:47:51 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/02/21 09:37:23 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -43,11 +43,12 @@ namespace bbtk
     mFile_separator = "/";
 #endif
     
-    // ==> Set system paths
+    // ==> Set system paths 
     mBin_path = GetExecutablePath();
     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);
     // 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)
@@ -75,16 +76,20 @@ namespace bbtk
     // always add "." (current working directory) at the begining
     mBbs_paths.push_back("."); 
     // add system bbs path 
+#ifdef WIN32
+//EED for windows BUILD tree
+    mBbs_paths.push_back(mInstall_path + mFile_separator + ".." + mFile_separator + mBbs_rel_path);
+#endif
     mBbs_paths.push_back(mBbs_path);
+
     
     // always add "." (current working directory) at the begining
     mPackage_paths.push_back(".");   
-#ifndef WIN32
-    // add system bin path (for build tree)
-    // mPackage_paths.push_back(mBin_path);
+    // add system bin path (for build tree / standalone folder install)
+    mPackage_paths.push_back(mBin_path);
     // add system lib path (for install tree)
     mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
-#else 
+#ifdef WIN32
     // 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");
@@ -453,11 +458,11 @@ namespace bbtk
     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);
+    bbtkMessage("Help",level, "bbtk_config.xml    : [" << config_xml_full_path  << "]" << std::endl); 
+    bbtkMessage("Help",level, "Documentation Path : [" << url             << "]" << std::endl);
+    bbtkMessage("Help",level, "Data Path          : [" << data_path       << "]" << std::endl);
+    bbtkMessage("Help",level, "Temp Directory     : [" << default_temp_dir << "]" << std::endl);
+    bbtkMessage("Help",level, "File Separator     : [" << file_separator  << "]" << std::endl);
 
     std::vector<std::string>::const_iterator i;