X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConfigurationFile.cxx;h=c163a5b6a9907cad8cc9b58ec30403648be0ceed;hb=a280c10c9ba7730cd9105a91bf1a40e72503a6e3;hp=764024a04d4e0552ff3994da7cceba4a74219e58;hpb=d9a9ad1dfc4015176c8e6220b56f9246e112fd87;p=bbtk.git

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 764024a..c163a5b 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: 2009/01/28 11:54:04 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2009/05/28 14:22:10 $
+  Version:   $Revision: 1.31 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -54,18 +54,37 @@ namespace bbtk
   ConfigurationFile::ConfigurationFile()
   {
 
-    mFile_separator = VALID_FILE_SEPARATOR;
+	mFile_separator = VALID_FILE_SEPARATOR;
     
     // ==> Set system paths 
     mBin_path = Utilities::GetExecutablePath();
-    
+
+	  
+	  
+	  
+/*	EED 23 Mars 2009  
 #ifdef MACOSX
     mInstall_path = mBin_path + "/../../../..";
 #else
     mInstall_path = mBin_path + "/..";
 #endif
-    
-    
+*/    
+#ifdef MACOSX
+	  
+	  std::string macPath("Contents/MacOS"); 
+	  int sbp = mBin_path.length();
+	  int smp = macPath.length();
+	  if (mBin_path.compare( sbp-smp, smp, macPath )==0 )
+	  {
+		  mBin_path = mBin_path + "/../../..";
+	  }
+	  
+	  
+#endif	  
+	  mInstall_path = mBin_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)
@@ -97,11 +116,11 @@ namespace bbtk
 			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);
-    bbtkMessage("Config",1," ==> bbs    : '"<<mBbs_path<<"'"<<std::endl);
-    bbtkMessage("Config",1," ==> data   : '"<<mData_path<<"'"<<std::endl);
+    bbtkMessage("config",1," ==> bin    : '"<<mBin_path<<"'"<<std::endl);
+    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," ==> data   : '"<<mData_path<<"'"<<std::endl);
 
 
 
@@ -173,7 +192,7 @@ namespace bbtk
     
     if ( Utilities::FileExists( configXmlFullPathName ))
       {
-	bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName << 
+	bbtkMessage("config",1, "ConfigurationFile : [" << configXmlFullPathName << 
 		    "] found in current directory" << std::endl); 
 	//Read(configXmlFullPathName.c_str());
 	// traiter le fichier local     
@@ -221,7 +240,7 @@ namespace bbtk
     std::string filename = Utilities::MakeUserSettingsFullFileName("doc/help_contents.html");
     if (!Utilities::FileExists(filename))
       {
-	bbtkDebugMessage("Config",1, 
+	bbtkDebugMessage("config",1, 
 			 "* Creating [" << filename << "]" << std::endl);
 	// The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
 	std::string doc_path = mInstall_path + "/" 
@@ -278,7 +297,7 @@ namespace bbtk
     FILE *fp;
     char configXml[250];
     sprintf (configXml , "%s/bbtk_config.xml", rootDirectory);
-    bbtkDebugMessage("Config",1, "in CreateConfigXML[" << configXml << "]" << std::endl);
+    bbtkDebugMessage("config",1, "in CreateConfigXML[" << configXml << "]" << std::endl);
     fp = fopen (configXml, "w");
     fprintf(fp, "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n");
     fprintf(fp, "<config>\n");
@@ -391,7 +410,7 @@ namespace bbtk
     sprintf(copyFile,"copy %s\\bbtk_config.xml.tmp \"%s\"\\bbtk_config.xml ",bbtk_path,rootDirectory );
     
     int attribs = GetFileAttributes (rootDirectory);
-    bbtkMessage("Config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl);
+    bbtkMessage("config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl);
     if ( attribs != 0xFFFFFFFF)
       {
 	if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check !
@@ -427,7 +446,7 @@ namespace bbtk
   void ConfigurationFile::Read(const std::string& filename)
   {
     
-    bbtkDebugMessage("Config",1,"ConfigurationFile::Read(" <<filename << ")" << std::endl);
+    bbtkDebugMessage("config",1,"ConfigurationFile::Read(" <<filename << ")" << std::endl);
     
     mConfig_xml_full_path = filename;
     XMLResults* res = new XMLResults;
@@ -437,12 +456,12 @@ namespace bbtk
       {
 	std::string mess = GetErrorMessage(res,filename);
 	delete res;
-	bbtkDebugMessage("Config",1,mess<< std::endl);
+	bbtkDebugMessage("config",1,mess<< std::endl);
  	bbtkError(mess);
       }
     delete res;
     
-    bbtkDebugMessage("Config",1,"OK" << std::endl);
+    bbtkDebugMessage("config",1,"OK" << std::endl);
   
     int i,j;
     
@@ -503,7 +522,7 @@ namespace bbtk
   //=========================================================================
   bool ConfigurationFile::AddPackagePathsAndWrite( const std::string& path )
   {
-    bbtkDebugMessageInc("Config",9,
+    bbtkDebugMessageInc("config",9,
 			"ConfigurationFile::AddPackagePathsAndWrite("
 			<<path<<")"<<std::endl);
     
@@ -516,7 +535,7 @@ namespace bbtk
       {
 	std::string mess = GetErrorMessage(res,Get_config_xml_full_path());
 	delete res;
-	bbtkDebugMessage("Config",1,mess<< std::endl);
+	bbtkDebugMessage("config",1,mess<< std::endl);
  	bbtkError(mess);
       }
    delete res;
@@ -542,6 +561,11 @@ namespace bbtk
     mPackage_paths.push_back(pack_path);
 
 #ifdef _WIN32
+    pack_path = path + "/RelWithDebInfo";
+    PACKPATH = BB.addChild((XMLCSTR)"package_path");
+    PACKPATH.addText((XMLCSTR)pack_path.c_str());
+    Utilities::replace(pack_path,INVALID_FILE_SEPARATOR,VALID_FILE_SEPARATOR);
+    mPackage_paths.push_back(pack_path);
     pack_path = path + "/Debug";
     PACKPATH = BB.addChild((XMLCSTR)"package_path");
     PACKPATH.addText((XMLCSTR)pack_path.c_str());
@@ -559,7 +583,7 @@ namespace bbtk
     if ( err != eXMLErrorNone ) 
       {
 	std::string mess = GetErrorMessage(res,Get_config_xml_full_path());
-	bbtkDebugMessage("Config",1,mess<< std::endl);
+	bbtkDebugMessage("config",1,mess<< std::endl);
  	bbtkError(mess);
       }
 
@@ -570,7 +594,7 @@ namespace bbtk
   //=========================================================================
   void ConfigurationFile::GetHelp(int level) const
   {
-    bbtkDebugMessageInc("Config",9,"ConfigurationFile::GetHelp("<<level
+    bbtkDebugMessageInc("config",9,"ConfigurationFile::GetHelp("<<level
 			<<")"<<std::endl);
     
     const std::string config_xml_full_path      = Get_config_xml_full_path();    
@@ -582,30 +606,30 @@ namespace bbtk
     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 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);
+    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 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;
            
-    bbtkMessage("Help",level, "BBS Paths   " << std::endl);     
+    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,"--- ["<<*i<<"]"<<std::endl);
     }    
     
-    bbtkMessage("Help",level, "PACKAGE Paths : " << 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);
+      bbtkMessage("help",level,"--- ["<<*i<<"]"<<std::endl);
     }
 
-    bbtkDebugDecTab("Config",9);
+    bbtkDebugDecTab("config",9);
   }
   //=========================================================================