X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbPlugPackage%2FbbPlugPackage.cpp;h=8ced93949321a22c41a3e11b1fbd1a412bd4ab4c;hb=ab180f23cb155da45dce2bc83cf79955950dad7b;hp=2c7aadb08fa28ab80621eacc6a665c82faf8b06b;hpb=794eb77fdbaa7b0be791fb744205e75391344ce5;p=bbtk.git

diff --git a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
index 2c7aadb..8ced939 100644
--- a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
+++ b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
@@ -1,43 +1,108 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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 <bbtkConfigurationFile.h>
 #include <bbtkUtilities.h>
+#include <stdlib.h>
 using namespace bbtk;
+
+
 //==========================================================================
 int main(int argc, char **argv)
 {
   if (argc!=2)
     {
       std::cout << "usage : bbPlugPackage <path_to_package>" << std::endl;
-      return 0;
+      return (int)1;
     }
 
-  std::string path(argv[1]);
-  std::string fname = path + "/bbtkPackage"; 
-
+  std::string path = argv[1] ;
+  #ifdef WIN32
+  std::string fname = path + "\\bbtkPackage"; 
+  #else
+  std::string fname = path + "/bbtkPackage" ;
+  #endif
+  
   if ( ! Utilities::FileExists( fname ) )
     {
-      std::cout << "* ERROR : The directory '"<<path<<"' does not contain a 'bbtkPackage' file"
-		<< std::endl;
-      return 1; 
+      std::cout << "* ERROR : The directory '"<< path <<" ' does not contain a 'bbtkPackage' file" << std::endl;
+      return (int)2; 
+
     }
 	
   std::ifstream f;
   f.open(fname.c_str());
   std::string pname;
   f >> pname;
+  while(pname[0] == '#')
+  {
+    getline(f, pname, '\n');
+    f >> pname;
+  }
+    
   f.close();
   
   
   ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path );
   
   std::string command;
-  command = ConfigurationFile::GetInstance().Get_bin_path();
+#if defined(WIN32)
+	command = "\"";
+#endif
+  command += ConfigurationFile::GetInstance().Get_bin_path();
   command += ConfigurationFile::GetInstance().Get_file_separator();
-  command += "bbRegeneratePackageDoc " + pname + " -q && ";
+  command += "bbRegeneratePackageDoc";
+#if defined(WIN32)
+  command += "\"";
+#endif
+  command += " " + pname + " -q";
+  std::cout << "executing '" << command << "'" << std::endl;
+if ( system ( command.c_str() ) )
+ {
+    std::cout << "An error occured while running '" 
+		<< command << "'" << std::endl;
+     // return 1; Feature #1676 - DFGO
+  }
+
+	 
+
+  command = "";
+#if defined(WIN32)
+  command = "\"";
+#endif
   command += ConfigurationFile::GetInstance().Get_bin_path();
   command += ConfigurationFile::GetInstance().Get_file_separator();
-  command += "bbRegenerateBoxesLists -q ";
- 
+  command += "bbRegenerateBoxesLists";
+#if defined(WIN32)
+  command += "\"";
+#endif
+  command += " -q";
+ std::cout << "executing '" << command << "'" << std::endl;
   if ( ! system ( command.c_str() ) )
     {
       std::cout << "Package '" 
@@ -47,9 +112,9 @@ int main(int argc, char **argv)
     {
       std::cout << "An error occured while running '" 
 		<< command << "'" << std::endl;
-      return 1;
+      //return 1; Feature #1676 - DFGO
     }
-  return 0;
+  return (int)0;
 }
 //==========================================================================