*** empty log message ***

diff --git a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
index bcbae90610659c486f75913e95133497bcb01624..9faa7d56b429a860da732a44964672510b24ddca 100644 (file)
--- a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
+++ b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
@@ -7,27 +7,36 @@
 //==========================================================================
 void RegenerateDoc ( bbtk::Package::Pointer p, std::string& doc_path )
 {
 //==========================================================================
 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
-       if ( ! bbtk::Utilities::FileExists(pack_path) )
-       {
-               std::string command("mkdir \"" +pack_path+ "\"");
-               system( command.c_str() );
-       }
-       std::string pack_index(pack_path);
-       pack_index += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
-       pack_index += "index.html";
-
-       std::cout << "* Generating doc for package '"<<pack_name<<"' in "
-                         << pack_index << std::endl;
-                       
-       p->SetDocURL(pack_index);
-       p->SetDocRelativeURL("index.html");
-       p->CreateHtmlPage(pack_index,"bbtk",pack_name,"","",0,0,false); //true);
+  std::string pack_name(p->GetName());
+  std::string pack_path = doc_path + pack_name;
+  // Creating directory
+  if ( ! bbtk::Utilities::FileExists(pack_path) )
+    {
+      std::string command("mkdir \"" +pack_path+ "\"");
+      system( command.c_str() );
+    }
+  std::string pack_index(pack_path);
+  pack_index += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
+  pack_index += "index.html";
+  
+  std::cout << "* Generating doc for package '"<<pack_name<<"' in "
+           << pack_index << std::endl;
+  
+  p->SetDocURL(pack_index);
+  p->SetDocRelativeURL("index.html");
+  p->CreateHtmlPage(pack_index,"bbtk",pack_name,"","",0,0,false); //true);

 }
 
 
 }
 
 

+void Usage()
+{
+  std::cout << "usage : bbRegeneratePackageDoc [<package name>|-a] [-q|-v]" 
+           << std::endl
+           << "        -a : All packages"<<std::endl
+           << "        -q : Quiet"<<std::endl
+           << "        -v : Verbose"<<std::endl;
+}
+

 //==========================================================================
 int main(int argc, char **argv)
 {
 //==========================================================================
 int main(int argc, char **argv)
 {


@@ -39,11 +48,18 @@ int main(int argc, char **argv)
   else if (argc==3)
     {
       pack = std::string(argv[1]);
   else if (argc==3)
     {
       pack = std::string(argv[1]);

-      bbtk::MessageManager::SetMessageLevel("max",0);
+      std::string param(argv[2]);
+      if (param=="-q") bbtk::MessageManager::SetMessageLevel("max",0);
+      else if (param=="-v") bbtk::MessageManager::SetMessageLevel("all",9);
+      else 
+       {
+         Usage();
+         return 0;
+       }

     }
   else 
     {
     }
   else 
     {

-      std::cout << "usage : bbRegeneratePackageDoc [<package name>|-a] [-quiet]" << std::endl;
+      Usage();

       return 0;
     }
   
       return 0;
     }
   

diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake
index 21d8599efa703b2993b885ca72c00b90cb05da26..e781d61838ad78bdbe6e77d2ab1f1d0a5fafc4f5 100644 (file)
--- a/kernel/cmake/BBTKFindLibraries.cmake
+++ b/kernel/cmake/BBTKFindLibraries.cmake
@@ -13,11 +13,16 @@ IF(USE_VTK)
     INCLUDE(${VTK_USE_FILE})
     ADD_DEF( _USE_VTK_ )
     SET(BBTK_VTK_LIBRARIES
     INCLUDE(${VTK_USE_FILE})
     ADD_DEF( _USE_VTK_ )
     SET(BBTK_VTK_LIBRARIES

-      #     vtkCommon 
-      vtkImaging  vtkGraphics vtkRendering vtkFiltering vtkCommon vtkWidgets
-      vtkVolumeRendering
-      # LG : removed vtkIO because conflict with itktiff lib in ITKIO 
-      ) 
+      vtkCommon     # Mandatory
+      vtkFiltering  # vtkImageData
+      vtkRendering  # vtkProp3D
+      vtkWidgets    # vtkImagePlaneWidget
+      vtkIO         # vtkMetaImageReader/Writer
+      vtkImaging    # filters such as vtkImageAnisotropicDiffusion3D
+      vtkGraphics   # vtkContourFilter, sources
+      vtkVolumeRendering # Mappers 
+#      vtkGenericFiltering
+     ) 

     MARK_AS_ADVANCED(VTK_DIR)
   ELSE(VTK_FOUND)
      message(FATAL_ERROR "VTK_DIR not found")
     MARK_AS_ADVANCED(VTK_DIR)
   ELSE(VTK_FOUND)
      message(FATAL_ERROR "VTK_DIR not found")

diff --git a/kernel/doc/bbtkWebSite/install.html b/kernel/doc/bbtkWebSite/install.html
index f3a11a78acb81c29a966ba7a13ba59d934193c1e..76aea2913302f3a6c2fb96f05ed0bbc0e440df9f 100644 (file)
--- a/kernel/doc/bbtkWebSite/install.html
+++ b/kernel/doc/bbtkWebSite/install.html
@@ -157,6 +157,23 @@ then type 'g', to generate.</span><br>
 &nbsp;&nbsp; Enjoy !<br>
 <br>
 </span>
 &nbsp;&nbsp; Enjoy !<br>
 <br>
 </span>

+<h2><a class="mozTocH3" name="mozTocId410988"></a><big><span
+ style="font-weight: normal;">Uninstall<br>
+</span></big></h2>
+&nbsp;&nbsp;&nbsp; You can run <span style="font-style: italic;">bbtk-uninstall.sh</span>
+as root.<br>
+<span style="font-weight: bold;">&nbsp;&nbsp;&nbsp; WARNING : </span><br
+ style="font-weight: bold;">
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; This is a brute force **UNSAFE**
+uninstaller which removes all files and folders starting with 'bb' in :<br>
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; INSTALL-PREFIX/bin <br>
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; INSTALL-PREFIX/lib <br>
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; INSTALL-PREFIX/include<br>
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; INSTALL-PREFIX/share/bbtk<br>
+&nbsp;&nbsp;&nbsp; However it lists the files found and prompts you
+before proceeding...<br>
+<br>
+<br>

 <hr style="width: 100%; height: 2px;">
 <h1><a class="mozTocH2" name="mozTocId777026"></a><big><big><big><small><small><span
  style="font-weight: normal;">Windows </span></small></small></big></big></big></h1>
 <hr style="width: 100%; height: 2px;">
 <h1><a class="mozTocH2" name="mozTocId777026"></a><big><big><big><small><small><span
  style="font-weight: normal;">Windows </span></small></small></big></big></big></h1>

diff --git a/packages/toolsbbtk/bbs/appli/MakePackageDoc.bbs b/packages/toolsbbtk/bbs/appli/MakePackageDoc.bbs
deleted file mode 100644 (file)
index 142745b..0000000
--- a/packages/toolsbbtk/bbs/appli/MakePackageDoc.bbs
+++ /dev/null
@@ -1,8 +0,0 @@
-description "t"
-
-
-include toolsbbtk/boxes/bbMakePackageDoc
-new MakePackageDoc makedoc
-input Package makedoc.Package "The name of the package"
-exec makedoc
-print $makedoc.Command$

diff --git a/packages/toolsbbtk/bbs/appli/TestPackages.bbs b/packages/toolsbbtk/bbs/appli/TestPackages.bbs
new file mode 100644 (file)
index 0000000..637b164
--- /dev/null
+++ b/packages/toolsbbtk/bbs/appli/TestPackages.bbs
@@ -0,0 +1,40 @@
+print "vtk..."
+load vtk
+print " - load ok"
+unload vtk
+print " - unload ok"
+
+print "std..."
+load std
+print " - load ok"
+unload std
+#message package 1
+print " - unload ok"
+
+print "wx..."
+load wx
+print " - load ok"
+unload wx
+print " - unload ok"
+
+
+print "wxvtk..."
+load wxvtk
+print " - load ok"
+unload wxvtk
+print " - unload ok"
+
+print "itk..."
+load itk
+print " - load ok"
+unload itk
+print " - unload ok"
+
+print "itkvtk..."
+load itkvtk
+print " - load ok"
+unload itkvtk
+print " - unload ok"
+
+print "done !"
+

diff --git a/packages/toolsbbtk/bbs/boxes/bbMakePackageDoc.bbs b/packages/toolsbbtk/bbs/boxes/bbMakePackageDoc.bbs
deleted file mode 100644 (file)
index 4a1484b..0000000
--- a/packages/toolsbbtk/bbs/boxes/bbMakePackageDoc.bbs
+++ /dev/null
@@ -1,47 +0,0 @@
-
-include std
-
-define MakePackageDoc toolsbbtk
-  description "Creates the html documentation of a package. The doc is generated at the 'canonical' location. Works both for a build tree or an installed toolkit."
-  author "laurent.guigues at creatis.insa-lyon.fr"
-  category "toolsbbtk"
-       
-  new StringRelay package
-
-  input Package package.In "The name of the package"
-  print "== Creating html doc for package $package.Out$ =="
-
-  new ConcatStrings command
-  set command.In1 "exec freeze; include "
-  connect package.Out command.In2
-  set command.In3 "; include "
-  connect package.Out command.In4
-  set command.In5 "-appli; graph "
-  connect package.Out command.In6
-  set command.In7 " 0 0 "
- 
-  new Configuration conf
-  new ConcatStrings path
-  connect conf.DocPath path.In1
-  connect conf.FileSeparator path.In2
-  set path.In3 "bbdoc"
-  connect conf.FileSeparator path.In4  
-  connect package.Out path.In5
-  connect conf.FileSeparator path.In6
-  
-  new ConcatStrings command2
-  connect command.Out command2.In1
-  connect path.Out command2.In2
-  set command2.In3 "index.html "
-  connect path.Out command2.In4
-  set command2.In5 "header.html 'Package "
-  connect package.Out command2.In6
-  set command2.In7 " documentation'"
-
-  output Command command2.Out "The command issued"
-
-  new ExecBbiCommand exec
-  connect command2.Out exec.In 
-
-  exec exec
-endefine