X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbRegeneratePackageDoc%2FbbRegeneratePackageDoc.cpp;h=a3306d1ec69e77da9dd94cc464aef1085bac4e1d;hb=1744f62d045b2b08dc432165e68a73ec8842822b;hp=1f8249a731713ab528a5289d6a647a2b13c5e47a;hpb=8822f9075c66dcf742b9edae47271bb46af6a9b7;p=bbtk.git

diff --git a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
index 1f8249a..a3306d1 100644
--- a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
+++ b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
@@ -7,6 +7,7 @@
 //==========================================================================
 void RegenerateDoc ( bbtk::Package::Pointer p, std::string& doc_path )
 {
+	
   std::string pack_name(p->GetName());
   std::string pack_path = doc_path + pack_name;
   // Creating directory
@@ -24,7 +25,11 @@ void RegenerateDoc ( bbtk::Package::Pointer p, std::string& doc_path )
   
   p->SetDocURL(pack_index);
   p->SetDocRelativeURL("index.html");
-  p->CreateHtmlPage(pack_index,"bbtk",pack_name,"","",0,0,false); //true);
+	
+	
+  p->CreateHtmlPage(pack_index,"bbtk",pack_name,"","",0,0,true); //true);
+	
+	
 }
 
 
@@ -62,32 +67,37 @@ int main(int argc, char **argv)
       Usage();
       return 0;
     }
-  
+ 
   try
     {
-      std::string doc_path = bbtk::ConfigurationFile::GetInstance().Get_doc_path();
+		std::string doc_path = bbtk::ConfigurationFile::GetInstance().Get_doc_path();
       doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
       doc_path += "bbdoc";
       doc_path += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
-      
       bbtk::Interpreter::Pointer I = bbtk::Interpreter::New();
       I->SetCommandLine(true);
       I->SetThrow(false);
-      I->InterpretLine( "exec freeze_no_error");
+//std::cout<<"JCP bbRegeneratePackageDoc.cpp  I->InterpretLine( exec freeze_no_error);"<<std::endl;
+	  I->InterpretLine( "exec freeze_no_error");
       if (pack != "-a") 
 	{
-	  I->InterpretLine( "include "+pack);
-	  I->InterpretLine( "include "+pack+"-appli");
-	  RegenerateDoc(I->GetExecuter()->GetFactory()->GetPackage(pack),doc_path);
+
+		I->InterpretLine( "include "+pack);
+		I->InterpretLine( "include "+pack+"-appli");
+		bbtk::Package::Pointer p = I->GetExecuter()->GetFactory()->GetPackage(pack);
+//std::cout<<"JCP bbRegeneratePackageDoc.cpp RegenerateDoc(I->GetExecuter()->GetFactory()->GetPackage(pack),doc_path);"<<std::endl;
+		RegenerateDoc(I->GetExecuter()->GetFactory()->GetPackage(pack),doc_path);
 	}
       else
 	{
-	  I->InterpretLine( "include *");
-	  bbtk::Factory::PackageMapType::const_iterator i;
+//std::cout<<"JCP bbRegeneratePackageDoc.cpp I->InterpretLine( include );"<<std::endl;
+		I->InterpretLine( "include *");
+		bbtk::Factory::PackageMapType::const_iterator i;
 	  for (i  = I->GetExecuter()->GetFactory()->GetPackageMap().begin();
 	       i != I->GetExecuter()->GetFactory()->GetPackageMap().end();
 	       ++i)
 	    {
+//std::cout<<" if (i->second->GetName()==user) continue;"<<std::endl;
 	      if (i->second->GetName()=="user") continue;
 	      RegenerateDoc(i->second,doc_path);
 	    }
@@ -98,7 +108,11 @@ int main(int argc, char **argv)
       std::cout << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
       return 1;
     }
-  return 0;
+    // JGRR & CM : this kills this never-ending process when it's supposed to! 
+    std::cout << "bbRegeneratePackageDoc has finished normally. It will be aborted on purpose."<< std::endl; 
+    abort();
+    // EO JGRR CM
+	return 0;
 }
 //==========================================================================