From: guigues <guigues>
Date: Wed, 15 Oct 2008 07:56:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.8.0~21
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=60666a9908c25344c96805d6b160cc723917fd3f;p=bbtk.git

*** empty log message ***
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a29f057..fbb741f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
  #   endif(COMMAND cmake_policy)
 
 #-----------------------------------------------------------------------------
-PROJECT(bbtk) 
+PROJECT(BBTK) 
 #-----------------------------------------------------------------------------
 
 
diff --git a/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.sh.in b/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.sh.in
index d34d158..f3c0b39 100755
--- a/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.sh.in
+++ b/kernel/appli/bbPostInstallPackage/bbPostInstallPackage.sh.in
@@ -15,8 +15,8 @@ PACK=$1
 
 cd ${BINPATH}
 export LD_LIBRARY_PATH="../lib:${LD_LIBRARY_PATH}"
-./bbRegeneratePackageDoc ${PACK}
-./bbRegenerateBoxesLists
+./bbRegeneratePackageDoc ${PACK} -q
+./bbRegenerateBoxesLists -q
 
 echo "Done !" 
 
diff --git a/kernel/appli/bbRegenerateBoxesLists/bbRegenerateBoxesLists.cpp b/kernel/appli/bbRegenerateBoxesLists/bbRegenerateBoxesLists.cpp
index 6104957..4b82252 100644
--- a/kernel/appli/bbRegenerateBoxesLists/bbRegenerateBoxesLists.cpp
+++ b/kernel/appli/bbRegenerateBoxesLists/bbRegenerateBoxesLists.cpp
@@ -5,6 +5,10 @@
 //==========================================================================
 int main(int argc, char **argv)
 {
+  if (argc>1)
+    {
+      bbtk::MessageManager::SetMessageLevel("max",0);
+    }
 
   try
     {
diff --git a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
index b5394d6..bcbae90 100644
--- a/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
+++ b/kernel/appli/bbRegeneratePackageDoc/bbRegeneratePackageDoc.cpp
@@ -19,7 +19,7 @@ void RegenerateDoc ( bbtk::Package::Pointer p, std::string& doc_path )
 	pack_index += bbtk::ConfigurationFile::GetInstance().Get_file_separator();
 	pack_index += "index.html";
 
-	std::cout << "* Generating doc for '"<<pack_name<<"' in "
+	std::cout << "* Generating doc for package '"<<pack_name<<"' in "
 			  << pack_index << std::endl;
 			
 	p->SetDocURL(pack_index);
@@ -32,24 +32,18 @@ void RegenerateDoc ( bbtk::Package::Pointer p, std::string& doc_path )
 int main(int argc, char **argv)
 {
   std::string pack("-a");
-  if (argc==1)
+  if (argc==2) 
     {
-      /*
-      // TO DO : make a Wx app
-      wxString name = wxGetTextFromUser(_T("Enter package name (* for all)"),
-      _T("Regenerate package doc"),
-      _T(""));
-      if (name.IsEmpty()) return 0;
-      pack = bbtk::wx2std(name);
-      */
+      pack = std::string(argv[1]);
     }
-  else if (argc==2) 
+  else if (argc==3)
     {
       pack = std::string(argv[1]);
+      bbtk::MessageManager::SetMessageLevel("max",0);
     }
   else 
     {
-      std::cout << "usage : bbRegeneratePackageDoc [<package name>|-a]" << std::endl;
+      std::cout << "usage : bbRegeneratePackageDoc [<package name>|-a] [-quiet]" << std::endl;
       return 0;
     }
   
diff --git a/kernel/cmake/BBTKDefineOptions.cmake b/kernel/cmake/BBTKDefineOptions.cmake
index a0035ce..25b0efa 100644
--- a/kernel/cmake/BBTKDefineOptions.cmake
+++ b/kernel/cmake/BBTKDefineOptions.cmake
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 # messages compilation options 
 OPTION ( BBTK_COMPILE_MESSAGES         "Compile bbtk messages ?"         ON)
-OPTION ( BBTK_COMPILE_DEBUG_MESSAGES   "Compile bbtk debug messages ?"   OFF)
+OPTION ( BBTK_COMPILE_DEBUG_MESSAGES   "Compile bbtk debug messages ?"   ON)
 OPTION ( BBTK_COMPILE_WARNING_MESSAGES "Compile bbtk warning messages ?" ON)
 OPTION ( BBTK_COMPILE_ERROR_MESSAGES   "Compile bbtk error messages ?"   ON)
 #-----------------------------------------------------------------------------
@@ -17,7 +17,7 @@ IF(BUILD_BBTK_DOC)
   OPTION(BUILD_BBTK_DOC_PACKAGE 
     "Build bbtk packages documentation (bbi+dot)." 	 ON)
   OPTION(BUILD_BBTK_DOC_DOXYGEN 
-    "Build doxygen documentation (doxygen)." 		 OFF)
+    "Build doxygen documentation (doxygen)." 		 ON)
   OPTION(BUILD_BBTK_DOC_GUIDES_PDF 
     "Build bbtk Guides', PDF format (latex)." 	 ON)
   OPTION(BUILD_BBTK_DOC_GUIDES_HTML 
diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index 0691198..c14da9f 100644
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -21,37 +21,39 @@ ENDFOREACH(page)
 SET(INDEX_OUTPUT index-alpha.html)
 
 IF (WIN32)
-
+  
   SET(USE_DOT TRUE)
   MAKE_DLL_PATH()
-
-   ADD_CUSTOM_COMMAND(
-     OUTPUT ${INDEX_OUTPUT}
-         COMMAND 
-     set ${DLL_PATH} cd ${BBTK_BIN_PATH} && ./bbRegeneratePackageDoc -a &&  ./bbRegenerateBoxesLists
-
-    DEPENDS ${BBTK_PACKAGES_DEPS}
-          )
-
+  
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${INDEX_OUTPUT}
+    COMMAND 
+    set ${DLL_PATH} cd ${BBTK_BIN_PATH} && ./bbRegeneratePackageDoc -a -q &&  ./bbRegenerateBoxesLists -q 
+    
+    DEPENDS ${BBTK_PACKAGES_DEPS} bbRegeneratePackageDoc bbRegenerateBoxesLists
+    )
+  
 ELSE (WIN32)
-
-     MESSAGE(STATUS "PACKAGE_DEPS=${BBTK_PACKAGES_DEPS}")
-
-   SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
-            #   MESSAGE(LD_LIBRARY_PATH=${LD_LIBRARY_PATH})
-
-   ADD_CUSTOM_COMMAND(
-           OUTPUT ${INDEX_OUTPUT}
-            COMMAND 
-
-  cd ${BBTK_BIN_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ./bbRegeneratePackageDoc -a &&  ./bbRegenerateBoxesLists
-
-    DEPENDS ${BBTK_PACKAGES_DEPS}
-        )
-
+  
+  #     MESSAGE(STATUS "PACKAGE_DEPS=${BBTK_PACKAGES_DEPS}")
+  
+  SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
+  #   MESSAGE(LD_LIBRARY_PATH=${LD_LIBRARY_PATH})
+  
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${INDEX_OUTPUT}
+    COMMAND 
+    
+    cd ${BBTK_BIN_PATH} && export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ./bbRegeneratePackageDoc -a -q &&  ./bbRegenerateBoxesLists -q
+    
+    DEPENDS ${BBTK_PACKAGES_DEPS} bbRegeneratePackageDoc bbRegenerateBoxesLists
+    )
+  
 ENDIF (WIN32)
 
-ADD_CUSTOM_TARGET(bbdoc ALL
-         DEPENDS ${INDEX_OUTPUT}
-             )
-
+ADD_CUSTOM_TARGET(
+  bbdoc ALL
+  DEPENDS ${INDEX_OUTPUT}
+  )
+	   
+