From 01454e3b435c3c8ac4327ecddda74e7d740463f6 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 9 Oct 2008 14:38:47 +0000 Subject: [PATCH] DEps --- .../BBTKConfigurePackage_doc_bbdoc.cmake | 10 +++++ kernel/doc/bbtkWebSite/CMakeLists.txt | 39 +++++++++++++++++++ kernel/src/bbtkWxGUIScriptingInterface.cxx | 8 ++-- packages/CMakeLists.txt | 1 + 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake index e8ccc37..bd367cc 100644 --- a/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake +++ b/kernel/cmake/BBTKConfigurePackage_doc_bbdoc.cmake @@ -13,3 +13,13 @@ #BBTK_CREATE_PACKAGE_BBDOC(${BBTK_PACKAGE_NAME}) BBTK_DOC_INSTALL_IMAGES(bbdoc/${BBTK_PACKAGE_NAME}) + + + IF(NOT WIN32) + # runs bbRegeneratePackageDoc and bbRegenerateBoxesLists + # as a post install step + # does not work on windaube + IF(NOT BBTK_CORE_PACKAGE) + INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BBTK_BIN_PATH}/bbRegeneratePackageDoc ${BBTK_PACKAGE_NAME} && ${BBTK_BIN_PATH}/bbRegenerateBoxesLists )") + ENDIF(NOT BBTK_CORE_PACKAGE) + ENDIF(NOT WIN32) diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt index 4d5aaed..0691198 100644 --- a/kernel/doc/bbtkWebSite/CMakeLists.txt +++ b/kernel/doc/bbtkWebSite/CMakeLists.txt @@ -16,3 +16,42 @@ FOREACH(page ${HTML_PAGES}) DESTINATION ${BBTK_DOC_INSTALL_PATH}/bbtkWebSite ) 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} + ) + +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} + ) + +ENDIF (WIN32) + +ADD_CUSTOM_TARGET(bbdoc ALL + DEPENDS ${INDEX_OUTPUT} + ) + diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index e0b39e2..4bde5cb 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $ Language: C++ - Date: $Date: 2008/10/08 14:46:42 $ - Version: $Revision: 1.24 $ + Date: $Date: 2008/10/09 14:38:57 $ + Version: $Revision: 1.25 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -494,8 +494,8 @@ namespace bbtk std::string command; command = ConfigurationFile::GetInstance().Get_bin_path(); command += ConfigurationFile::GetInstance().Get_file_separator(); - command += "bbRegeneratePackageDoc * && "; - command = ConfigurationFile::GetInstance().Get_bin_path(); + command += "bbRegeneratePackageDoc -a && "; + command += ConfigurationFile::GetInstance().Get_bin_path(); command += ConfigurationFile::GetInstance().Get_file_separator(); command += "bbRegenerateBoxesLists"; bbtkMessage("debug",1,"Executing system command '"<