*** empty log message ***

diff --git a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
index 665668b22e1f4311e503ba3d3c3046669e44adb5..fb51a9d7de4a051c78b17c12363977bf5c2cf7c3 100644 (file)
--- a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake
@@ -1,10 +1,11 @@
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/header.html.in
-  ${CMAKE_CURRENT_BINARY_DIR}/header.html
+  ${BBTK_BBDOC_BUILD_PATH}/${BBTK_PACKAGE_NAME}/header.html
+  @ONLY IMMEDIATE
   )
 INSTALL( 
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/header.html
-  DESTINATION ${BBTK_BBDOC_INSTALL_PATH}/${PACKAGE_NAME}
+  FILES ${BBTK_BBDOC_BUILD_PATH}/${BBTK_PACKAGE_NAME}/header.html
+  DESTINATION ${BBTK_BBDOC_INSTALL_PATH}/${BBTK_PACKAGE_NAME}
   )   
 
 

diff --git a/packages/std/src/bbstdConfiguration.cxx b/packages/std/src/bbstdConfiguration.cxx
index ec4fcc9a1cadfa3b41bc60e1da22cedfb7c72643..e5d8844e189551eab4c5f2849ad1845172fa0f6d 100644 (file)
--- a/packages/std/src/bbstdConfiguration.cxx
+++ b/packages/std/src/bbstdConfiguration.cxx
@@ -15,6 +15,7 @@ namespace bbstd
        void Configuration::DoProcess()
        {
       bbSetOutputDataPath( bbtk::ConfigurationFile::GetInstance().Get_data_path() );
+      bbSetOutputDocPath( bbtk::ConfigurationFile::GetInstance().Get_doc_path() );
       bbSetOutputFileSeparator( bbtk::ConfigurationFile::GetInstance().Get_file_separator() );
 
 #if defined(__GNUC__)

diff --git a/packages/std/src/bbstdConfiguration.h b/packages/std/src/bbstdConfiguration.h
index 241b370c7563ef61bab1a3bfc5d96842111ede51..71408b6214567a24624c4fd7266185d4547bdd10 100644 (file)
--- a/packages/std/src/bbstdConfiguration.h
+++ b/packages/std/src/bbstdConfiguration.h
@@ -11,6 +11,7 @@ namespace bbstd
   {
     BBTK_USER_BLACK_BOX_INTERFACE(Configuration,bbtk::AtomicBlackBox);
       BBTK_DECLARE_OUTPUT(DataPath,std::string);
+      BBTK_DECLARE_OUTPUT(DocPath,std::string);
       BBTK_DECLARE_OUTPUT(FileSeparator,std::string);
       BBTK_DECLARE_OUTPUT(SystemType,int);
     BBTK_PROCESS(DoProcess);
@@ -26,7 +27,8 @@ namespace bbstd
   BBTK_AUTHOR("jpr@creatis.insa-lyon.fr");
   BBTK_CATEGORY("misc");
   BBTK_DESCRIPTION("Gets configuration informations");
-  BBTK_OUTPUT(Configuration,DataPath,"Sample Data Path",std::string);
+  BBTK_OUTPUT(Configuration,DataPath,"Data Path",std::string);
+  BBTK_OUTPUT(Configuration,DocPath,"Documentation Path",std::string);
   BBTK_OUTPUT(Configuration,FileSeparator,"/ or \\",std::string);  
   BBTK_OUTPUT(Configuration,SystemType,"0=Linux 1=Windows",int);  
   BBTK_END_DESCRIBE_BLACK_BOX(Configuration);

diff --git a/packages/std/src/bbstdRelay.cxx b/packages/std/src/bbstdRelay.cxx
new file mode 100644 (file)
index 0000000..5708563
--- /dev/null
+++ b/packages/std/src/bbstdRelay.cxx
@@ -0,0 +1,21 @@
+
+#include "bbstdRelay.h"
+#include "bbstdPackage.h"
+//#include "bbtkSystem.h"
+//#include <string>
+
+namespace bbstd
+{
+  
+  //====================================================================
+  BBTK_USER_BLACK_BOX_TEMPLATE_IMPLEMENTATION(Relay,
+                                              bbtk::AtomicBlackBox);
+  //====================================================================
+ 
+  //====================================================================
+  // Standard relays 
+  using namespace std;
+  BBTK_ADD_TEMPLATE_BLACK_BOX_TO_PACKAGE(std,Relay,string);
+  //====================================================================
+} 
+// namespace bbstd