X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConfigurationFile.cxx;h=4d59d575727d8b3379fa0522ba6af7575dd8033a;hb=49007dc0a651edf71dca840e43953886120d1965;hp=c8e155c6c89777b27fbb712adfa7664c5e17f9e6;hpb=554eb3a09fb2700fa281cc46e04642f11cdbad28;p=bbtk.git

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index c8e155c..4d59d57 100644
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/09 13:47:29 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2008/12/12 10:20:48 $
+  Version:   $Revision: 1.25 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -69,39 +69,43 @@ namespace bbtk
     
     // ==> Set system paths 
     mBin_path = GetExecutablePath();
-//EED    mInstall_path = mBin_path + mFile_separator + "..";
+
 #ifdef MACOSX
-	  mInstall_path = mBin_path + "/../../../..";
+    mInstall_path = mBin_path + "/../../../..";
 #else
-	  mInstall_path = mBin_path + "/..";
+    mInstall_path = mBin_path + "/..";
 #endif
-	  // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
+
+    // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
     mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH);
     // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
-//EED    mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path;
     mDoc_path = mInstall_path + "/" + mDoc_rel_path;
     // The relative path to the doc folder (=BBTK_BBS_REL_PATH)
     mBbs_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_BBS_REL_PATH);
     // The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path)
-//EED    mBbs_path = mInstall_path + mFile_separator + mBbs_rel_path;
     mBbs_path = mInstall_path + "/" + mBbs_rel_path;
-    // The relative path to the rsc folder (=BBTK_RSC_REL_PATH)
-    //   mRsc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_RSC_REL_PATH);
-    // The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path)
-    //   mRsc_path = mInstall_path + mFile_separator + mRsc_rel_path;
-    // The path to the bbtk data folder 
-    // Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH
-    // But can be overriden by value read from bbtk_config.xml
-//EED    mData_path = mInstall_path + mFile_separator + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
+    
     mData_path = mInstall_path + "/" + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
-
-	Utilities::replace( mBin_path		, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-	Utilities::replace( mInstall_path	, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-	Utilities::replace( mDoc_rel_path	, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-	Utilities::replace( mDoc_path		, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-	Utilities::replace( mBbs_path		, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-	Utilities::replace( mData_path		, INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-
+    
+    Utilities::replace( mBin_path, 
+			INVALID_FILE_SEPARATOR,
+			VALID_FILE_SEPARATOR);
+    Utilities::replace( mInstall_path,
+			INVALID_FILE_SEPARATOR,
+			VALID_FILE_SEPARATOR);
+    Utilities::replace( mDoc_rel_path,
+			INVALID_FILE_SEPARATOR,
+			VALID_FILE_SEPARATOR);
+    Utilities::replace( mDoc_path,
+			INVALID_FILE_SEPARATOR,
+			VALID_FILE_SEPARATOR);
+    Utilities::replace( mBbs_path,
+			INVALID_FILE_SEPARATOR,
+			VALID_FILE_SEPARATOR);
+    Utilities::replace( mData_path,
+			INVALID_FILE_SEPARATOR,
+			VALID_FILE_SEPARATOR);
+    
     bbtkMessage("Config",1," ==> bin    : '"<<mBin_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> prefix : '"<<mInstall_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> doc    : '"<<mDoc_path<<"'"<<std::endl);
@@ -113,7 +117,7 @@ namespace bbtk
     
     // bbs_paths
     // always add "." (current working directory) at the begining
-	mBbs_paths.push_back( "." ); 
+    mBbs_paths.push_back( "." ); 
     // add system bbs path 
     mBbs_paths.push_back(mBbs_path);
     // add toolsbbtk/appli 
@@ -133,32 +137,32 @@ namespace bbtk
     for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
       Utilities::replace( mBbs_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
     }
-
+    
     
     // always add "." (current working directory) at the begining
     mPackage_paths.push_back(".");   
     // add system bin path (for build tree / standalone folder install)
     mPackage_paths.push_back(mBin_path);
     // add system lib path (for install tree)
-//EED    mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
+    //EED    mPackage_paths.push_back(mInstall_path + mFile_separator + "lib");
     mPackage_paths.push_back(mInstall_path + "/lib");
 #ifdef WIN32
     // add bin/Debug bin/Release paths (for build/install tree)
-//EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Debug");
+    //EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Debug");
     mPackage_paths.push_back(mBin_path + "/Debug");
-//EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Release");
+    //EED    mPackage_paths.push_back(mBin_path + mFile_separator + "Release");
     mPackage_paths.push_back(mBin_path + "/Release");
 #endif
-
-	sizeStrVec = mPackage_paths.size();
-	for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
-		Utilities::replace( mPackage_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-	}
-
-
-
+    
+    sizeStrVec = mPackage_paths.size();
+    for (iStrVec=0;iStrVec<sizeStrVec;iStrVec++){
+      Utilities::replace( mPackage_paths[iStrVec] , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+    }
+    
+    
+    
     GetHelp(2);
-   
+    
     // ==> First we look for bbtk_config.xml in "."
     char buf[2048];
     const char *currentDir = getcwd(buf, 2048);
@@ -171,11 +175,11 @@ namespace bbtk
 	// LG : throw an exception 
       }
     
-//    std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml";
+    //    std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml";
     std::string configXmlFullPathName = currentDir ;
-                configXmlFullPathName += "/bbtk_config.xml";
-	Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
-
+    configXmlFullPathName += "/bbtk_config.xml";
+    Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+    
     if ( Utilities::FileExists( configXmlFullPathName ))
       {
 	bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName << 
@@ -373,7 +377,6 @@ namespace bbtk
 	  {
 		  *slash = 0;
 	  }
-	  //printf("EED ConfigurationFile::GetExecutablePath  %s\n",name);
 	  return name;
   }