From 26550d07aa8d312e33a18a19b8844ba249202336 Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 13 May 2008 09:04:54 +0000 Subject: [PATCH] *** empty log message *** --- kernel/appli/bbc/CMakeLists.txt | 24 +++++++++++++++++++++ kernel/appli/bbc/bbc.sh.in | 4 ++++ kernel/appli/bbc/main.cxx.in | 5 +++-- kernel/cmake/BBTKConfigurePackage_bbs.cmake | 2 +- kernel/src/CMakeLists.txt | 6 ++++++ kernel/src/bbtkAtomicBlackBoxDescriptor.cxx | 6 +++--- 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/kernel/appli/bbc/CMakeLists.txt b/kernel/appli/bbc/CMakeLists.txt index c2e8202..0ee3cb1 100644 --- a/kernel/appli/bbc/CMakeLists.txt +++ b/kernel/appli/bbc/CMakeLists.txt @@ -17,6 +17,30 @@ CONFIGURE_FILE( ${BBTK_DATA_BUILD_PATH}/${bbc_DATA_REL_PATH_FROM_DATA}/CMakeLists.txt.in COPYONLY ) +IF(UNIX) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/bbc.sh.in + ${BBTK_BINARY_DIR}/bin/bbc + @ONLY IMMEDIATE + ) + INSTALL( + PROGRAMS ${BBTK_BINARY_DIR}/bin/bbc + DESTINATION bin + ) +ELSE(UNIX) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/bbc.bat.in + ${CMAKE_CURRENT_BINARY_DIR}/bbc.bat + @ONLY IMMEDIATE + ) + INSTALL( + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bbc.bat + DESTINATION bin + ) +ENDIF(UNIX) + + + # Install tree SET(bbc_CMAKE_OPTION_FOR_BUILD_TREE "") diff --git a/kernel/appli/bbc/bbc.sh.in b/kernel/appli/bbc/bbc.sh.in index fdf3dc7..f0f4373 100755 --- a/kernel/appli/bbc/bbc.sh.in +++ b/kernel/appli/bbc/bbc.sh.in @@ -18,6 +18,8 @@ BINPATH=$(echo ${TMP#*/}|rev) # data path DATADIR=${BINPATH}/@bbc_DATA_REL_PATH_FROM_BIN@ +#echo ****** BBC : ${BINPATH} + # extract bbs file name IN=$1 TMP="${IN##*/}" @@ -34,6 +36,8 @@ sed s,EXEC_FUNCTION,${EXEC_FUNCTION},g ${DATADIR}/main.cxx.in > ${WORKDIR}/main. cd ${WORKDIR} ${BINPATH}/bbs2cpp ${IN} > log.txt cmake . @bbc_CMAKE_OPTION_FOR_BUILD_TREE@ > log.txt +#-DFIND_PACKAGE_VERBOSE=1 +# make > log.txt mv ${OUTPUT} ${CUR}/ cd ${CUR} diff --git a/kernel/appli/bbc/main.cxx.in b/kernel/appli/bbc/main.cxx.in index 119862a..d1d8212 100644 --- a/kernel/appli/bbc/main.cxx.in +++ b/kernel/appli/bbc/main.cxx.in @@ -107,8 +107,9 @@ bool wxBBIApp::OnInit( ) if (quiet) bbtk::MessageManager::SetMessageLevel("max",0); if (debug) bbtk::MessageManager::SetMessageLevel("all",9); - - bbtk::Wx::CreateInvisibleTopWindow(); + + // Creates the parent window of all bbtk windows + bbtk::Wx::CreateTopWindow(); try { mExecuter = bbtk::Executer::New(); diff --git a/kernel/cmake/BBTKConfigurePackage_bbs.cmake b/kernel/cmake/BBTKConfigurePackage_bbs.cmake index 88bbdfa..17c24d4 100644 --- a/kernel/cmake/BBTKConfigurePackage_bbs.cmake +++ b/kernel/cmake/BBTKConfigurePackage_bbs.cmake @@ -61,7 +61,7 @@ IF (BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP) GET_FILENAME_COMPONENT(name "${bbs}" NAME_WE) SET(OUTPUT bb${name}) ADD_CUSTOM_COMMAND( - OUTPUT ${BBTK_BIN_PATH}xxx/${OUTPUT} + OUTPUT ${BBTK_BIN_PATH}/${OUTPUT} COMMAND cd ${BBTK_BIN_PATH} && ${BBTK_BBC} ${BBTK_PACKAGE_NAME}/appli/${name} DEPENDS ${bbs} diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index e3b5e43..c5ecded 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -223,6 +223,12 @@ SET(LIBRARY_NAME BBTK) SET(${LIBRARY_NAME}_INSTALL_FOLDER bbtk) SET(${LIBRARY_NAME}_LIBRARIES bbtk) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS kernel/src kernel/src/ThirdParty) +IF(BBTK_USE_SHIPPED_BOOST) + SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS + ${${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS} + kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST} + ) +ENDIF(BBTK_USE_SHIPPED_BOOST) IF(UNIX) SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS ${EXECUTABLE_OUTPUT_REL_PATH}) diff --git a/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx b/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx index 6511313..ea1a10d 100644 --- a/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx @@ -24,7 +24,7 @@ namespace bbtk (typeid(AtomicBlackBoxDescriptor), "BoxExecute", "Any signal received by this input executes the box", - "", + "signal", new bbtk::AtomicBlackBoxTGetFunctor(&BlackBox::bbGetInputBoxExecute), new bbtk::AtomicBlackBoxTSetFunctor(&BlackBox::bbSetInputBoxExecute) ) ); // Creates the output 'BoxChange' @@ -33,8 +33,8 @@ namespace bbtk bbtk::AtomicBlackBoxOutputDescriptor (typeid(AtomicBlackBoxDescriptor), "BoxChange", - "Signal modifications of the box", - "", + "Signals modifications of the box", + "signal", new bbtk::AtomicBlackBoxTGetFunctor(&BlackBox::bbGetOutputBoxChange), new bbtk::AtomicBlackBoxTSetFunctor(&BlackBox::bbSetOutputBoxChange) ) ); // -- 2.45.1