From b9463ff95b371ee89376c35d12172ad082ab14d0 Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 28 Oct 2008 13:39:55 +0000 Subject: [PATCH 1/1] *** empty log message *** --- .../bbRegeneratePackageDoc.cpp | 56 ++++++++++++------- kernel/cmake/BBTKFindLibraries.cmake | 15 +++-- kernel/doc/bbtkWebSite/install.html | 17 ++++++ .../toolsbbtk/bbs/appli/MakePackageDoc.bbs | 8 --- packages/toolsbbtk/bbs/appli/TestPackages.bbs | 40 +++++++++++++ .../toolsbbtk/bbs/boxes/bbMakePackageDoc.bbs | 47 ---------------- 6 files changed, 103 insertions(+), 80 deletions(-) delete mode 100644 packages/toolsbbtk/bbs/appli/MakePackageDoc.bbs create mode 100644 packages/toolsbbtk/bbs/appli/TestPackages.bbs delete mode 100644 packages/toolsbbtk/bbs/boxes/bbMakePackageDoc.bbs diff --git a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp index bcbae90..9faa7d5 100644 --- 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 ) { - 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 '"<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 '"<SetDocURL(pack_index); + p->SetDocRelativeURL("index.html"); + p->CreateHtmlPage(pack_index,"bbtk",pack_name,"","",0,0,false); //true); } +void Usage() +{ + std::cout << "usage : bbRegeneratePackageDoc [|-a] [-q|-v]" + << std::endl + << " -a : All packages"<|-a] [-quiet]" << std::endl; + Usage(); return 0; } diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake index 21d8599..e781d61 100644 --- 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 - # 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") diff --git a/kernel/doc/bbtkWebSite/install.html b/kernel/doc/bbtkWebSite/install.html index f3a11a7..76aea29 100644 --- a/kernel/doc/bbtkWebSite/install.html +++ b/kernel/doc/bbtkWebSite/install.html @@ -157,6 +157,23 @@ then type 'g', to generate.
   Enjoy !

+

Uninstall
+

+    You can run bbtk-uninstall.sh +as root.
+    WARNING :
+       This is a brute force **UNSAFE** +uninstaller which removes all files and folders starting with 'bb' in :
+        INSTALL-PREFIX/bin
+        INSTALL-PREFIX/lib
+        INSTALL-PREFIX/include
+        INSTALL-PREFIX/share/bbtk
+    However it lists the files found and prompts you +before proceeding...
+
+

Windows

diff --git a/packages/toolsbbtk/bbs/appli/MakePackageDoc.bbs b/packages/toolsbbtk/bbs/appli/MakePackageDoc.bbs deleted file mode 100644 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 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 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 -- 2.46.2