X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbRegeneratePackageDoc%2FbbRegeneratePackageDoc.cpp;h=0f74c0ec8503332d5a2a4e6f11288af33c37b04d;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=9faa7d56b429a860da732a44964672510b24ddca;hpb=b9463ff95b371ee89376c35d12172ad082ab14d0;p=bbtk.git

diff --git a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
index 9faa7d5..0f74c0e 100644
--- a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
+++ b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
 
 #include <bbtkWx.h>
 #include <bbtkInterpreter.h>
@@ -7,6 +34,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 +52,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 +94,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");
+//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 +135,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;
 }
 //==========================================================================