From 0897431b13703ae395668c853d9932982bad55bf Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Mon, 28 Jan 2008 15:28:14 +0000
Subject: [PATCH] *** empty log message ***

---
 kernel/cmake/BBTKConfigurePackage_doc.cmake |  2 +-
 kernel/cmake/BBTKCreatePackageBBdoc.cmake   |  9 ++++++---
 kernel/doc/bbtkWebSite/menu.html            |  4 ++--
 kernel/src/bbtkInterpreter.cxx              | 18 +++++++++++++++---
 packages/wx/bbs/appli/testSlider.bbs        |  2 +-
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/kernel/cmake/BBTKConfigurePackage_doc.cmake b/kernel/cmake/BBTKConfigurePackage_doc.cmake
index f6ff5ae..356faab 100644
--- a/kernel/cmake/BBTKConfigurePackage_doc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc.cmake
@@ -33,7 +33,7 @@ ENDIF(NOT BBTK_CORE_PACKAGE)
 #----------------------------------------------------------------------------
 IF(BUILD_bbtk_DOC_DOXYGEN) 
   SET(BBTK_PACKAGE_DOXYGEN_DOC_INSTALL_PATH
-    packages/${BBTK_PACKAGE_NAME}/doxygen
+    packages/doxygen/${BBTK_PACKAGE_NAME}
     )
   SUBDIRS(doxygen)
 ENDIF(BUILD_bbtk_DOC_DOXYGEN) 
diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index cd79e02..8c43287 100644
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -1,9 +1,11 @@
 MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
 
+  FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/packages/bbdoc/${PACKAGE_NAME})
+
   # Create file make_doc_${PACKAGE_NAME}.bbs
   SET(OUTPUT_PATH ${BBTK_BBS_INSTALL_PATH})
   SET(OUTPUT_FILE ${PROJECT_BINARY_DIR}/${OUTPUT_PATH}/make_doc_${PACKAGE_NAME}.bbs)
-  SET(DOC_OUTPUT ${BBTK_DOC_INSTALL_PATH}/packages/bbdoc/${PACKAGE_NAME}/index.html)
+  SET(DOC_OUTPUT ${PROJECT_BINARY_DIR}/${BBTK_DOC_INSTALL_PATH}/packages/bbdoc/${PACKAGE_NAME}/index.html)
   FILE(WRITE 
     "${OUTPUT_FILE}" 
     "#-----------------------------------------\n"
@@ -15,14 +17,15 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
     "include ${PACKAGE_NAME}\n"
     "include ${PACKAGE_NAME}-appli\n"
     "#-----------------------------------------\n"
-    "graph workspace 0 0 ${DOC_OUTPUT} ${BBTK_DOCUMENT_SCRIPTS_OUTPUT_PATH}/header.html \"Package ${PACKAGE_NAME} documentation\"\n"
+    "graph workspace 0 0 ${DOC_OUTPUT} \"none\" \"Package ${PACKAGE_NAME} documentation\"\n"
+#${BBTK_DOCUMENT_SCRIPTS_OUTPUT_PATH}/header.html 
     )
 
   ADD_CUSTOM_COMMAND(
     OUTPUT ${DOC_OUTPUT}
     COMMAND 
     #    tth 
-    ${BBTK_BBI} ${OUTPUT_FILE}
+    cd ${BBTK_BIN_PATH} && ${BBTK_BBI} ${OUTPUT_FILE}
  #    ARGS
  #   ${OUTPUT_FILE}
   #  DEPENDS ${PACKAGE_NAME}
diff --git a/kernel/doc/bbtkWebSite/menu.html b/kernel/doc/bbtkWebSite/menu.html
index 39d9925..d4b6981 100644
--- a/kernel/doc/bbtkWebSite/menu.html
+++ b/kernel/doc/bbtkWebSite/menu.html
@@ -62,8 +62,8 @@ Reference (pdf)<br>
 - <font size="2"><a href="../packages/vtk/doxygen/index.html"
  target="information">doxygen</a></font><br>
 <small><b> wx : </b></small><font size="2"><a
- href="../packages/wx/bbdoc/index.html" target="information">bbdoc</a></font>
-- <font size="2"><a href="../packages/wx/doxygen/html/index.html"
+ href="../packages/bbdoc/wx/index.html" target="information">bbdoc</a></font>
+- <font size="2"><a href="../packages/doxygen/wx/html/index.html"
  target="information">doxygen</a></font><br>
 <small><b> wxvtk : </b></small><font size="2"><a
  href="../packages/wxvtk/bbdoc/index.html" target="information">bbdoc</a></font>
diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index ca1bd89..775ae98 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/01/28 15:08:53 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/01/28 15:28:15 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -738,12 +738,24 @@ verbose = true;
     std::string libname;  // full path library name
     std::string pkgname;  // e.g. <scriptname>.bbs
      
+    // Add the void path to handle absolute paths
+    script_paths.push_back("");
+    // Add the "." path to handle paths relative to current directory
+    script_paths.push_back(".");
+
     pkgname = Utilities::ExtractScriptName(name);
     if (use_configuration_file)
     {
       if (verbose)
          std::cout << "look for : [" << name << "] (use_configuration_file == TRUE)"  << std::endl;
-      script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
+      std::vector<std::string> paths = 
+	ConfigurationFile::GetInstance().Get_bbs_paths();
+      std::vector<std::string>::iterator i;
+      for (i=paths.begin();i!=paths.end();++i)
+	{
+	  script_paths.push_back(*i); 
+	}
+  
     }
 
     bool fullnameGiven = false; 
diff --git a/packages/wx/bbs/appli/testSlider.bbs b/packages/wx/bbs/appli/testSlider.bbs
index f10844a..713e049 100644
--- a/packages/wx/bbs/appli/testSlider.bbs
+++ b/packages/wx/bbs/appli/testSlider.bbs
@@ -1,6 +1,6 @@
 description "Simple test of wx::Slider widget"
 author "laurent.guigues@creatis.insa-lyon.fr"
-category "test"
+#category "test"
 
 load wx
 new Slider slider
-- 
2.45.1