*** empty log message ***

diff --git a/kernel/cmake/bbtk_config_build.xml.in b/kernel/cmake/bbtk_config_build.xml.in
index 38bdd44b6a43f1584286d11dce267c8edcabcb9a..4efe399418ae65e71b87465593beb93285f84411 100644 (file)
--- a/kernel/cmake/bbtk_config_build.xml.in
+++ b/kernel/cmake/bbtk_config_build.xml.in
@@ -3,17 +3,17 @@
   <description> Sets the search directories in the build tree </description>
 
   <url> </url>
-#@BBTK_DOC_BUILD_PATH@ </url> 
+#@BBTK_DOC_BUILD_PATH@ 
 
   <bbs_path> </bbs_path>
-#@BBTK_BBS_BUILD_PATH@ </bbs_path>
+#@BBTK_BBS_BUILD_PATH@ 
   <package_path> @EXECUTABLE_OUTPUT_PATH@ </package_path> 
 # For windows
   <package_path> @EXECUTABLE_OUTPUT_PATH@\Debug </package_path> 
   <package_path> @EXECUTABLE_OUTPUT_PATH@\Release </package_path> 
 #
   <data_path> </data_path>
-#@BBTK_DATA_ROOT@ </data_path>
+#@BBTK_DATA_ROOT@ 
 
   <default_temp_dir>  @PROJECT_BINARY_DIR@ </default_temp_dir>
    

diff --git a/kernel/install/CMakeLists.txt b/kernel/install/CMakeLists.txt
new file mode 100644 (file)
index 0000000..829127c
--- /dev/null
+++ b/kernel/install/CMakeLists.txt
@@ -0,0 +1,7 @@
+IF(UNIX)
+  SUBDIRS(gnome)
+ENDIF(UNIX)
+
+INSTALL( PROGRAMS bbtk-uninstall.sh
+  DESTINATION bin
+)

diff --git a/kernel/install/bbtk-uninstall.sh b/kernel/install/bbtk-uninstall.sh
new file mode 100644 (file)
index 0000000..8a05ef5
--- /dev/null
+++ b/kernel/install/bbtk-uninstall.sh
@@ -0,0 +1,31 @@
+echo "****** WARNING : THIS IS A BRUTE FORCE **UNSAFE** UNINSTALLER ******"
+echo "****** WILL REMOVES ALL FILES AND FOLDERS STARTING WITH bb    ******"
+
+TMP=$(which bbtk-uninstall.sh|rev)
+TMP2=$(echo ${TMP#*/}|rev)
+PREFIX=${TMP2}/..
+
+echo "****** IN : ${PREFIX}/bin/"
+echo "            ${PREFIX}/lib/"
+echo "            ${PREFIX}/include/"
+echo "            ${PREFIX}/share/bbtk"
+echo "*********************************************************************"
+echo "* Files/folders found :"
+
+OPT="-d --color -1"
+
+ls ${OPT} ${PREFIX}/bin/bb*
+ls ${OPT} ${PREFIX}/lib/bb*
+ls ${OPT} ${PREFIX}/lib/libbb*
+ls ${OPT} ${PREFIX}/include/bb*
+ls ${OPT} ${PREFIX}/share/bbtk
+
+echo "* DO YOU WANT TO DELETE THEM (Y|n) ?"
+read -n 1 ANS
+if [ "${ANS}" = "Y" ]; then
+rm -Rf ${PREFIX}/bin/bb*
+rm -Rf ${PREFIX}/lib/bb*
+rm -Rf ${PREFIX}/lib/libbb*
+rm -Rf ${PREFIX}/include/bb*
+rm -Rf ${PREFIX}/share/bbtk
+fi

diff --git a/kernel/install/gnome/CMakeLists.txt b/kernel/install/gnome/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9fd8232
--- /dev/null
+++ b/kernel/install/gnome/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+SET(bbtk_install_gnome_DATA_REL_PATH ../${BBTK_DATA_REL_PATH}/install-gnome)
+
+CONFIGURE_FILE(
+  bbtk-install-gnome.sh.in
+  ${CMAKE_CURRENT_BINARY_DIR}/bbtk-install-gnome
+  @ONLY IMMEDIATE
+)
+
+INSTALL(
+  FILES bbi.desktop.in bbi-icon.png bbi-icon2.png bbs.xml
+  DESTINATION ${BBTK_DATA_INSTALL_PATH}/install-gnome
+)
+INSTALL(
+  PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bbtk-install-gnome
+  DESTINATION bin
+)

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx
index 0e94df3a02e217b380aa24ccada0b1d038932995..1dd5780150951a1384e8d10c127799930cb4423c 100644 (file)
--- a/kernel/src/bbtkConfigurationFile.cxx
+++ b/kernel/src/bbtkConfigurationFile.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConfigurationFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/14 09:41:41 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/02/14 09:57:18 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -62,7 +62,7 @@ namespace bbtk
     // Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH
     // But can be overriden by value read from bbtk_config.xml
     mData_path = mInstall_path + mFile_separator + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH);
-    MessageManager::SetMessageLevel("Config",1);
+
     bbtkMessage("Config",1," ==> bin    : '"<<mBin_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> prefix : '"<<mInstall_path<<"'"<<std::endl);
     bbtkMessage("Config",1," ==> doc    : '"<<mDoc_path<<"'"<<std::endl);
@@ -363,7 +363,7 @@ namespace bbtk
   void ConfigurationFile::Read(const std::string& filename)
   {
     
-    //std::cout << "=======================in  ConfigurationFile::Read filename [" <<filename << "]" << std::endl;
+    bbtkDebugMessage("Config",1,"ConfigurationFile::Read(" <<filename << ")" << std::endl);
     
     mConfig_xml_full_path = filename;
     XMLResults* res = new XMLResults;
@@ -371,17 +371,15 @@ namespace bbtk
     
     if ( res->error != eXMLErrorNone ) 
       {
-       std::ostringstream str;
-       str << XMLNode::getError(res->error);
-       str << " [line " << res->nLine << ", col "<<res->nColumn<<"] ";
-       str << " file "<<filename; 
+       std::string mess = GetErrorMessage(res,filename);
        delete res;
-       bbtkError(str.str());
-       //      throw ConfigurationException(str.str());
+       bbtkDebugMessage("Config",1,mess<< std::endl);
+       bbtkError(mess);
       }
     delete res;
     
-    
+    bbtkDebugMessage("Config",1,"OK" << std::endl);
+  
     int i,j;
     
     // Description

diff --git a/kernel/src/bbtkXML.h b/kernel/src/bbtkXML.h
index ed46960debdd2f447e5bb38a0a9a6bd1f0164fb9..a44508d23ba013120a7e607c071538db68570a20 100644 (file)
--- a/kernel/src/bbtkXML.h
+++ b/kernel/src/bbtkXML.h
@@ -2,7 +2,7 @@
 #define __bbtkXML_h_INCLUDED__
 
 #include "xmlParser.h"
-
+#include <sstream>
 
 namespace bbtk
 {
@@ -25,6 +25,17 @@ namespace bbtk
       }
   }
   //====================================================================
+
+
+  std::string GetErrorMessage(XMLResults* res, const std::string& filename)
+  {
+    std::ostringstream str;
+    str << XMLNode::getError(res->error);
+    str << " [line " << res->nLine << ", col "<<res->nColumn<<"] ";
+    str << " file "<<filename; 
+    return str.str();
+  }
+
 };
 
 #endif