From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Tue, 6 Oct 2015 09:08:44 +0000 (+0200)
Subject: Merge branch 'wt-version'
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=bbtk.git;a=commitdiff_plain;h=12f2166f201f4e5a99c9c7876dadd09da81bfb51;hp=-c

Merge branch 'wt-version'
---

12f2166f201f4e5a99c9c7876dadd09da81bfb51
diff --combined kernel/src/bbtkInterpreterVirtual.cxx
index c1a6fac,58552fc..8d27b32
--- a/kernel/src/bbtkInterpreterVirtual.cxx
+++ b/kernel/src/bbtkInterpreterVirtual.cxx
@@@ -346,7 -346,6 +346,6 @@@ namespace bbt
      */
  
  
- 
    } 
    //=======================================================================
    
@@@ -804,8 -803,7 +803,7 @@@
  	
    //=======================================================================  
    void InterpreterVirtual::DoInterpretLine( const std::string& line )
-   {
- 	  
+   {  
      bbtkDebugMessage("interpreter",6,"==> InterpreterVirtual::DoInterpretLine(\""
  		     <<line<<"\")"<<std::endl);
      std::vector<std::string> words;
@@@ -892,19 -890,19 +890,19 @@@
  
      // break and quit commands
      if ((command.code==cBreak) || (command.code==cQuit))
 -      {
 -	bool in_script = false;
 -	std::string file("");
 -	int line = 0;
 -
 -	if (mFileName.size()) 
 -	  {
 -	    std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
 -	    if (fs!=0) in_script = true;	  
 -	    file = mFileName.back();
 -	    line = mLine.back();
 -	  } 
 -	if (command.code==cBreak)
 +    {
 +//EED-Borrame	bool in_script = false;
 +//EED-Borrame	std::string file("");
 +//EED-Borrame	int line = 0;
 +
 +//EED-Borrame	if (mFileName.size()) 
 +//EED-Borrame	  {
 +//EED-Borrame	    std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
 +//EED-Borrame	    if (fs!=0) in_script = true;	  
 +//EED-Borrame	    file = mFileName.back();
 +//EED-Borrame	    line = mLine.back();
 +//EED-Borrame	  } 
 +	  if (command.code==cBreak)
  	  {
  	    /*
  	    std::cout << "BreakException(" 
@@@ -915,13 -913,15 +913,13 @@@
  		  commandBreak();
  //EED Borrame	    bbtkError("break");//,in_script,file,line);
  	    //	    throw BreakException(in_script,file,line);
 -	  }	  
 -	else 
 -	  {
 +	  } else {
  		  commandQuit();
  //EED Borrame	    bbtkError("quit");//,in_script,file,line);
  	      //throw QuitException(in_script,file,line);
 -	  }
 -	return;
 -      }   
 +	  } // cBreak
 +	  return;
 +   } // cBreak  cQuit  
  //std::cout<<" mVirtualExecuter->Create(words[1],words[2]); "<<line<<std::endl;
      // other cammands
  
@@@ -1128,7 -1128,7 +1126,7 @@@
  
      bbtkDebugMessage("interpreter",6,"<== InterpreterVirtual::DoInterpretLine(\""
  		     <<line<<"\")"<<std::endl);
-     	  
+ 
    }
    //=======================================================================  
  
@@@ -1370,7 -1370,7 +1368,7 @@@ printf("EED InterpreterVirtual::SwitchT
  	for (i=script_paths.begin();i!=script_paths.end();i++)
  	  {
  
- printf("EED InterpreterVirtual::SwitchToFile jaja >>  %s\n", (*i).c_str() );
+ printf("EED InterpreterVirtual::SwitchToFile (1) >>  %s\n", (*i).c_str() );
  		  
  	    bbtkMessage("interpreter",1,
  			"--> Looking in '" << *i << "'" << std::endl);
@@@ -1404,7 -1404,7 +1402,7 @@@
  		 j!= Filenames.end(); ++j)
  	      {
  			  
- printf("EED InterpreterVirtual::SwitchToFile kkkkk     >>  %s\n", (*j).c_str() );
+ printf("EED InterpreterVirtual::SwitchToFile (2)     >>  %s\n", (*j).c_str() );
  			  
  		int lgr = (*j).size();
  		if (lgr < 5) continue;  
diff --combined kernel/src/bbtkPackage.cxx
index f292957,7cf93fc..91cdb51
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@@ -85,8 -85,10 +85,10 @@@ namespace bbt
      mDescription(description),
      mVersion(version)
    {
+ 
      bbtkDebugMessage("object",2,"==> Package('"<<name<<"',...)"
  		     <<bbtkendl);
+ 
      std::string default_doc_dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
      char c = default_doc_dir.c_str()[strlen(default_doc_dir.c_str())-1];
      std::string url = default_doc_dir; 
@@@ -396,7 -398,6 +398,7 @@@
      bbtkDebugMessage("package",3,"* Symbol ["<<getvername
  		     <<"] found"<<std::endl);
      // version matches ?
 +
      if (getbbtkversion() != bbtk::GetVersion())
        {
  	bbtkMessage("package",0,