From: guigues <guigues>
Date: Wed, 22 Oct 2008 09:16:06 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.9.0~3
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=85bae054ff07681220211b68b63d2d270542f548;p=bbtk.git

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

diff --git a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
index 2c7aadb..22502b1 100644
--- a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
+++ b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
@@ -1,7 +1,10 @@
 
 #include <bbtkConfigurationFile.h>
 #include <bbtkUtilities.h>
+#include <stdlib.h>
 using namespace bbtk;
+
+
 //==========================================================================
 int main(int argc, char **argv)
 {
diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index fa73ded..d5e4dd8 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -54,7 +54,6 @@ IF(WIN32)
   SET(BBTK_BBC ${BBTK_BIN_PATH}/bbc.exe)
   SET(BBTK_BBI ${BBTK_BIN_PATH}/bbi.exe)
   SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy.exe)
-  SET(BBTK_BBDOC ${BBTK_BIN_PATH}/bbdoc.exe)
 ELSE(WIN32)
   SET(BBTK_LIB_PATH lib)
   SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH})
@@ -62,10 +61,16 @@ ELSE(WIN32)
   SET(BBTK_BBS2CPP ${BBTK_BIN_PATH}/bbs2cpp)
   SET(BBTK_BBC ${BBTK_BIN_PATH}/bbc)
   SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy)
-  SET(BBTK_BBDOC ${BBTK_BIN_PATH}/bbdoc)
 ENDIF(WIN32)  
 SET(BBTK_PACKAGE_LIB_PATH ${BBTK_LIB_PATH})
 
+MESSAGE(STATUS "* BBTK_BIN_PATH         =${BBTK_BIN_PATH}")
+MESSAGE(STATUS "* BBTK_LIB_PATH         =${BBTK_LIB_PATH}")
+MESSAGE(STATUS "* BBTK_PACKAGE_LIB_PATH =${BBTK_PACKAGE_LIB_PATH}")
+MESSAGE(STATUS "* BBTK_BBI              =${BBTK_BBI}")
+MESSAGE(STATUS "* BBTK_BBS2CPP          =${BBTK_BBS2CPP}")
+MESSAGE(STATUS "* BBTK_BBC              =${BBTK_BBC}")
+MESSAGE(STATUS "* BBTK_BBFY             =${BBTK_BBFY}")
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
@@ -84,4 +89,10 @@ ELSE(WIN32)
   SET(BBTK_BBS_REL_PATH share/bbtk/bbs)
   SET(BBTK_DATA_REL_PATH share/bbtk/data)
 ENDIF(WIN32)   
+
+MESSAGE(STATUS "* BBTK_SHARE_REL_PATH   =${BBTK_SHARE_REL_PATH}")
+MESSAGE(STATUS "* BBTK_DOC_REL_PATH     =${BBTK_DOC_REL_PATH}")
+MESSAGE(STATUS "* BBTK_BBS_REL_PATH     =${BBTK_BBS_REL_PATH}")
+MESSAGE(STATUS "* BBTK_DATA_REL_PATH    =${BBTK_DATA_REL_PATH}")
+
 #-----------------------------------------------------------------------------
diff --git a/kernel/cmake/BBTKMacros.cmake b/kernel/cmake/BBTKMacros.cmake
index 3c2cf0e..904285c 100644
--- a/kernel/cmake/BBTKMacros.cmake
+++ b/kernel/cmake/BBTKMacros.cmake
@@ -39,6 +39,7 @@ ENDMACRO(ADD_DEF_WITH_VAL)
 # FROM SOURCE TREE TO DOC BUILD TREE
 # AND INSTALL THEM IN BBTK DOC TREE
 MACRO(BBTK_DOC_INSTALL_IMAGES DOC_RELATIVE_INSTALL_PATH)
+  MESSAGE(STATUS "* Copying png,jpg,tif images in ${BBTK_DOC_BUILD_PATH}/${DOC_RELATIVE_INSTALL_PATH}")
   FILE(GLOB PNG_IMAGES "*.png")
   FILE(GLOB JPG_IMAGES "*.jpg")
   FILE(GLOB TIF_IMAGES "*.tif")
diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake
index 97b484d..0f72f13 100644
--- a/kernel/cmake/BBTKSetDeducedPaths.cmake
+++ b/kernel/cmake/BBTKSetDeducedPaths.cmake
@@ -3,18 +3,35 @@ SET(BBTK_BBDOC_REL_PATH ${BBTK_DOC_REL_PATH}/bbdoc)
 # Doxygen docs relative path
 SET(BBTK_DOXYGEN_REL_PATH ${BBTK_DOC_REL_PATH}/doxygen)
 
-# Now compute BUILD TREE and INSTALL TREE **ABSOLUTE PATHS**
+MESSAGE(STATUS "* BBTK_BBDOC_REL_PATH   =${BBTK_BBDOC_REL_PATH}")
+MESSAGE(STATUS "* BBTK_DOXYGEN_REL_PATH =${BBTK_DOXYGEN_REL_PATH}")
+
+# Now compute BUILD TREE **ABSOLUTE PATHS**
 SET(BBTK_DOC_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOC_REL_PATH})
 SET(BBTK_BBDOC_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBDOC_REL_PATH})
 SET(BBTK_DOXYGEN_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOXYGEN_REL_PATH})
 SET(BBTK_BBS_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH})
 SET(BBTK_DATA_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DATA_REL_PATH})
 
-SET(BBTK_DOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH})
-SET(BBTK_BBDOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH})
-SET(BBTK_DOXYGEN_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH})
-SET(BBTK_BBS_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH})
-SET(BBTK_DATA_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DATA_REL_PATH})
+#SET(BBTK_DOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH})
+#SET(BBTK_BBDOC_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH})
+#SET(BBTK_DOXYGEN_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH})
+#SET(BBTK_BBS_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH})
+#SET(BBTK_DATA_INSTALL_PATH ${BBTK_INSTALL_PREFIX}/${BBTK_DATA_REL_PATH})
+
+# LG 22/10/08 : REMOVED THE **ABSOLUTE INSTALL PATH**
+# was buggy when packaging
+# consequences : 
+#  1) generated packages are NOT relocatables 
+#  2) they must be installed at the same prefix than bbtk
+SET(BBTK_DOC_INSTALL_PATH     ${BBTK_DOC_REL_PATH})
+SET(BBTK_BBDOC_INSTALL_PATH   ${BBTK_BBDOC_REL_PATH})
+SET(BBTK_DOXYGEN_INSTALL_PATH ${BBTK_DOXYGEN_REL_PATH})
+SET(BBTK_BBS_INSTALL_PATH     ${BBTK_BBS_REL_PATH})
+SET(BBTK_DATA_INSTALL_PATH    ${BBTK_DATA_REL_PATH})
+
+
+
 
 # Create build directories if necessary
 MKDIR(${BBTK_DOC_BUILD_PATH})
@@ -29,6 +46,8 @@ SET (EXECUTABLE_OUTPUT_PATH
 SET (LIBRARY_OUTPUT_PATH    
   ${PROJECT_BINARY_DIR}/${LIBRARY_OUTPUT_REL_PATH})
 #-----------------------------------------------------------------------------
+MESSAGE(STATUS "* EXECUTABLE_OUTPUT_PATH=${EXECUTABLE_OUTPUT_PATH}")
+MESSAGE(STATUS "* LIBRARY_OUTPUT_PATH   =${LIBRARY_OUTPUT_PATH}")
 
 #-----------------------------------------------------------------------------
 # Today CMakeCreateFindPackage is copied in BBTK_CMAKE_DIR
diff --git a/kernel/doc/bbtkWebSite/install.html b/kernel/doc/bbtkWebSite/install.html
index de37997..f3a11a7 100644
--- a/kernel/doc/bbtkWebSite/install.html
+++ b/kernel/doc/bbtkWebSite/install.html
@@ -3,14 +3,11 @@
 <head>
   <meta content="text/html; charset=ISO-8859-1"
  http-equiv="content-type">
-  <title>Install</title>
+  <title>BBTK @BBTK_VERSION@ Install</title>
 </head>
 <body>
-<div style="text-align: center; font-weight: bold;"><big><big><big><small></small></big></big></big>
-<div style="text-align: left;">
-<div style="text-align: center;"><big><big style="font-weight: normal;"><big><big>BBTK
-build instructions
-</big></big></big></big><br>
+<div style="text-align: center;"><big>BBTK @BBTK_VERSION@
+(@BBTK_VERSION_DATE@) build instructions</big><br>
 <div style="text-align: left;">
 <ol id="mozToc">
 <!--mozToc h1 1 h2 2 h3 3 h4 4 h5 5 h6 6-->
@@ -44,13 +41,20 @@ build instructions
     </span></li>
   <ul>
     <li><span style="font-weight: normal;">L<sub>a</sub>T<sub>e</sub>X
-to generate the pdf doc</span><br>
+to generate the pdf guides</span><br>
       <span style="font-weight: normal;"></span></li>
-    <li><span style="font-weight: normal;">tth to generate the html doc</span></li>
+    <li><span style="font-weight: normal;">tth to generate the html
+guides<br>
+      </span></li>
     <li><span style="font-weight: normal;">itk to compile packages itk,
 itkvtk</span></li>
     <li><span style="font-weight: normal;">vtk to compile package vtk,
 wxvtk</span></li>
+    <li><span style="font-weight: normal;">doxygen to build the sources
+documentation</span></li>
+    <li><span style="font-weight: normal;">graphviz/dot to generate the
+packages doc with pipeline graphs<br>
+      </span></li>
     <ul>
     </ul>
   </ul>
@@ -60,6 +64,7 @@ wxvtk</span></li>
  style="font-weight: normal;">Known working configurations</span></small></small></big></big></big></h2>
 <big><big><big><small><small><span style="font-weight: normal;">&nbsp;<small>
 - gcc: <br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 4.3.0 (Fedora Core 9)<br>
 </small></span></small></small></big></big></big><big><big><small><small><span
  style="font-weight: normal;"></span></small></small></big></big><big><big><small><small><span
  style="font-weight: normal;">&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
@@ -145,8 +150,8 @@ IMPORTANT NOTE </span>:</span><br>
 </span><span style="font-weight: normal;"><span
  style="font-style: italic;"></span><span style="font-style: italic;">&nbsp;&nbsp;&nbsp;
 Type 'c' <span style="color: rgb(204, 102, 0);">many
-times</span> (untill no area is flagged with a '*' -Linux- nor
-highlighted in red -Windows- then type 'g', to generate.</span><br>
+times</span> until no area is flagged with a '*' and three times more
+then type 'g', to generate.</span><br>
 &nbsp;&nbsp;&nbsp; &gt; make<br>
 &nbsp;&nbsp;&nbsp; &gt; sudo make install<br>
 &nbsp;&nbsp; Enjoy !<br>
@@ -304,7 +309,6 @@ needs to build the BBTK documentation.</li>
   </ul>
 </ul>
 Enjoy !<br>
-</div>
 <div style="text-align: left;">
 <hr style="width: 100%; height: 2px;"></div>
 <div style="text-align: left;">
@@ -843,6 +847,5 @@ set to ON when wxWidgets library is needed with the choices made</td>
   </tbody>
 </table>
 </div>
-</div>
 </body>
 </html>
diff --git a/kernel/src/bbtkUtilities.h b/kernel/src/bbtkUtilities.h
index de72ad8..34d17eb 100644
--- a/kernel/src/bbtkUtilities.h
+++ b/kernel/src/bbtkUtilities.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUtilities.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:14 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2008/10/22 09:16:16 $
+  Version:   $Revision: 1.18 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -63,6 +63,10 @@
 #include <cctype>    // std::toupper
 //#include "bbtkMessageManager.h"
 
+#if defined(__GNUC__) // gcc 4.3
+#include <stdlib.h>
+#endif
+
 namespace bbtk
 {
   /// Holds various usefull methods