From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Tue, 24 Mar 2009 13:42:59 +0000 (+0000)
Subject: BUG Documentation MAC
X-Git-Tag: EED.02Oct2009~69
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=3194643ec93a3ca8c423011a52d9509e2651d1cb;p=bbtk.git

BUG Documentation MAC
---

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 58a1943..45f39dc 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/03/23 13:06:41 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2009/03/24 13:42:59 $
+  Version:   $Revision: 1.30 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -54,7 +54,7 @@ namespace bbtk
   ConfigurationFile::ConfigurationFile()
   {
 
-    mFile_separator = VALID_FILE_SEPARATOR;
+	mFile_separator = VALID_FILE_SEPARATOR;
     
     // ==> Set system paths 
     mBin_path = Utilities::GetExecutablePath();
@@ -70,7 +70,16 @@ namespace bbtk
 #endif
 */    
 #ifdef MACOSX
-	  mBin_path = mBin_path + "/../../..";
+	  
+	  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 + "/..";
 
diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index 618f804..b6581d0 100644
--- a/kernel/src/bbtkWxGUIScriptingInterface.cxx
+++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/23 13:06:41 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2009/03/24 13:42:59 $
+  Version:   $Revision: 1.35 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -93,7 +93,7 @@ namespace bbtk
     
     mInterpreter = bbtk::Interpreter::New();
     mInterpreter->SetUser(this);
-    mInterpreter->SetCommandLine(true);
+	mInterpreter->SetCommandLine(true);
     mInterpreter->SetThrow(true);
     //    mInterpreter->AddBreakObserver
     //boost::bind( &WxGUIScriptingInterface::InterpreterUserOnBreak, this ));
@@ -558,7 +558,8 @@ namespace bbtk
 #endif
 	command += " " + pack + " -q";
     bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);
-    
+
+printf("EED WxGUIScriptingInterface::DoRegeneratePackageDoc %s",  command.c_str());	  
 
     if ( ! system ( command.c_str() ) )
       {