X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbRegeneratePackageDoc%2FbbRegeneratePackageDoc.cpp;h=0f74c0ec8503332d5a2a4e6f11288af33c37b04d;hb=9345dab3810e17c346913dec3506f69122f620ab;hp=cfae87e14c61df4804ee3c97759240b53a92ddac;hpb=98e18224b83c6955a804d79d4e7083626ea8afcd;p=bbtk.git

diff --git a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
index cfae87e..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>
@@ -45,7 +72,6 @@ void Usage()
 //==========================================================================
 int main(int argc, char **argv)
 {
-
   std::string pack("-a");
   if (argc==2) 
     {
@@ -68,34 +94,37 @@ int main(int argc, char **argv)
       Usage();
       return 0;
     }
-  
+ 
   try
     {
 		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);
+//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");
 		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 *");
+//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);
 	    }
@@ -106,6 +135,10 @@ I->InterpretLine( "include *");
       std::cout << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
       return 1;
     }
+    // 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;
 }
 //==========================================================================