From 3689d0c5e95d32e7d27d7321ab8afe7ce5264436 Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 13 Feb 2008 14:08:24 +0000 Subject: [PATCH] *** empty log message *** --- kernel/CMakeLists.txt | 4 ++ kernel/appli/CMakeLists.txt | 2 +- kernel/appli/bbCreatePackage/CMakeLists.txt | 34 ++++++----- .../bbCreatePackage/bbCreatePackage.sh.in | 45 +++++++++------ .../bbCreatePackage/void-bbtk-package.tgz | Bin 0 -> 12993 bytes kernel/cmake/BBTKAddDefinitions.cmake | 9 +-- kernel/cmake/BBTKSetBasePaths.cmake | 4 ++ kernel/cmake/BBTKSetDeducedPaths.cmake | 4 +- kernel/cmake/bbtk_config_build.xml.in | 9 ++- ...install-gnome.sh => bbtk-install-gnome.sh} | 0 kernel/src/bbtkConfigurationFile.cxx | 53 ++++++++++++++---- kernel/src/bbtkConfigurationFile.h | 39 +++++++++++-- 12 files changed, 146 insertions(+), 57 deletions(-) create mode 100644 kernel/appli/bbCreatePackage/void-bbtk-package.tgz rename kernel/install/gnome/{install-gnome.sh => bbtk-install-gnome.sh} (100%) diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 47be68f..8f7eb32 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -22,3 +22,7 @@ SUBDIRS(cmake) #----------------------------------------------------------------------------- +#----------------------------------------------------------------------------- +# System-specific installation tools +SUBDIRS(install) +#----------------------------------------------------------------------------- diff --git a/kernel/appli/CMakeLists.txt b/kernel/appli/CMakeLists.txt index bbbb300..d25d04f 100644 --- a/kernel/appli/CMakeLists.txt +++ b/kernel/appli/CMakeLists.txt @@ -9,5 +9,5 @@ SUBDIRS(bbfy) # Utility that creates the file architecture for a new user package -#SUBDIRS(bbCreatePackage) +SUBDIRS(bbCreatePackage) diff --git a/kernel/appli/bbCreatePackage/CMakeLists.txt b/kernel/appli/bbCreatePackage/CMakeLists.txt index c005114..fb6c6ba 100644 --- a/kernel/appli/bbCreatePackage/CMakeLists.txt +++ b/kernel/appli/bbCreatePackage/CMakeLists.txt @@ -2,11 +2,10 @@ # used to creates the file architecture for a new user package # go to data which install the input data to the script -SUBDIRS(data) +#SUBDIRS(data) # Sets the data install path -SET(bbCreatePackage_DATA_PATH - ${CMAKE_INSTALL_PREFIX}/bin/Data_bbCreatePackage) +SET(bbCreatePackage_DATA_REL_PATH ../${BBTK_DATA_REL_PATH}/bbCreatePackage) IF(WIN32) CONFIGURE_FILE( @@ -25,22 +24,27 @@ IF(UNIX) ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage @ONLY IMMEDIATE ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bbs - ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage.bbs - @ONLY IMMEDIATE - ) INSTALL( - FILES ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) + # PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) INSTALL( - FILES ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage.bbs - DESTINATION bin - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) + FILES void-bbtk-package.tgz + DESTINATION ${BBTK_DATA_REL_PATH}/bbCreatePackage + ) + +# CONFIGURE_FILE( +# ${CMAKE_CURRENT_SOURCE_DIR}/bbCreatePackage.bbs +# ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage.bbs +# @ONLY IMMEDIATE +# ) +# INSTALL( +# FILES ${CMAKE_CURRENT_BINARY_DIR}/bbCreatePackage.bbs +# DESTINATION bin +# PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +# ) ENDIF(UNIX) diff --git a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in index 8a25868..8556533 100755 --- a/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in +++ b/kernel/appli/bbCreatePackage/bbCreatePackage.sh.in @@ -1,32 +1,43 @@ #!/bin/bash # creates the file architecture for a new user package -if [ $# -ne 1 ] +if [ $# -lt 2 ] then - echo "usage : bbCreatePackage " + echo "usage : bbCreatePackage [author] [description]" exit fi -INPUT=@bbCreatePackage_DATA_PATH@ +# bbCreatePackage path +TMP=$(which bbCreatePackage|rev) +BBCP=$(echo ${TMP#*/}|rev) +INPUT=${BBCP}/@bbCreatePackage_DATA_REL_PATH@/void-bbtk-package.tgz OUTPUT=$1 +PACK=$2 +AUTHOR=$3 +DESCRIPTION=$4 -echo "----- Creating new black box package '$1' in repository '$OUTPUT' -----" - -if [ -e $OUTPUT ] +if [ -d $OUTPUT/${PACK} ] then - echo "ERROR : Directory '$OUTPUT' already exists !" + echo "ERROR : Directory '$OUTPUT/${PACK}' already exists !" exit fi +echo "**ls Creating new black box package '$PACK' in folder '$OUTPUT'" + +if [ ! -d $OUTPUT ] + then + echo "ERROR : Directory '$OUTPUT' does not exist !" + exit +fi -echo "-> Creating directory '$OUTPUT'" -mkdir $OUTPUT -echo "-> Creating file '$OUTPUT/CMakeLists.txt'" -cp ${INPUT}/PackageCMakeLists.txt ${OUTPUT}/CMakeLists.txt -echo "-> Creating directory '$OUTPUT/cmake'" -mkdir ${OUTPUT}/cmake -echo "-> Copying files in '$OUTPUT/cmake'" -cp ${INPUT}/cmake/*.cmake ${OUTPUT}/cmake/ -cp ${INPUT}/cmake/*.in ${OUTPUT}/cmake/ +echo "-> Uncompressing package files" +cd $OUTPUT +tar zxvf ${INPUT} +mv void ${PACK}/ +cd ${PACK} +sed s,WITHOUT_NAME,${PACK}, CMakeLists.txt > CMakeLists2.txt +sed s,WITHOUT_AUTHOR,"${AUTHOR}", CMakeLists2.txt > CMakeLists3.txt +sed s,WITHOUT_DESCRIPTION,"${DESCRIPTION}", CMakeLists3.txt > CMakeLists.txt +rm -f CMakeLists2.txt CMakeLists3.txt echo "Done !" -echo "Edit the file '$OUTPUT/CMakeLists.txt' to customize your package" +echo "Edit the file '$OUTPUT/${PACK}/CMakeLists.txt' to customize your package" diff --git a/kernel/appli/bbCreatePackage/void-bbtk-package.tgz b/kernel/appli/bbCreatePackage/void-bbtk-package.tgz new file mode 100644 index 0000000000000000000000000000000000000000..7f0091f9cddafc08a5d6e2942c0406328ea12e3d GIT binary patch literal 12993 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 literal 0 HcmV?d00001 diff --git a/kernel/cmake/BBTKAddDefinitions.cmake b/kernel/cmake/BBTKAddDefinitions.cmake index e537dda..9831d47 100644 --- a/kernel/cmake/BBTKAddDefinitions.cmake +++ b/kernel/cmake/BBTKAddDefinitions.cmake @@ -1,8 +1,9 @@ # Set C preprocessor definitions -ADD_DEF_WITH_VAL(BBTK_SHARE_REL_PATH ${BBTK_SHARE_REL_PATH}) -ADD_DEF_WITH_VAL(BBTK_DOC_REL_PATH ${BBTK_DOC_REL_PATH}) -ADD_DEF_WITH_VAL(BBTK_BBS_REL_PATH ${BBTK_BBS_REL_PATH}) - +ADD_DEF_WITH_VAL(BBTK_SHARE_REL_PATH "\"${BBTK_SHARE_REL_PATH}\"") +ADD_DEF_WITH_VAL(BBTK_DOC_REL_PATH "\"${BBTK_DOC_REL_PATH}\"") +ADD_DEF_WITH_VAL(BBTK_BBS_REL_PATH "\"${BBTK_BBS_REL_PATH}\"") +#ADD_DEF_WITH_VAL(BBTK_RSC_REL_PATH "\"${BBTK_RSC_REL_PATH}\"") +ADD_DEF_WITH_VAL(BBTK_DATA_REL_PATH "\"${BBTK_DATA_REL_PATH}\"") #----------------------------------------------------------------------------- # messages compilation options IF (BBTK_COMPILE_MESSAGES) diff --git a/kernel/cmake/BBTKSetBasePaths.cmake b/kernel/cmake/BBTKSetBasePaths.cmake index c0d27b4..65d0a34 100644 --- a/kernel/cmake/BBTKSetBasePaths.cmake +++ b/kernel/cmake/BBTKSetBasePaths.cmake @@ -46,9 +46,13 @@ IF(WIN32) SET(BBTK_SHARE_REL_PATH) SET(BBTK_DOC_REL_PATH doc) SET(BBTK_BBS_REL_PATH bbs) + # SET(BBTK_RSC_REL_PATH rsc) + SET(BBTK_DATA_REL_PATH data) ELSE(WIN32) SET(BBTK_SHARE_REL_PATH share/bbtk) SET(BBTK_DOC_REL_PATH share/bbtk/doc) SET(BBTK_BBS_REL_PATH share/bbtk/bbs) + # SET(BBTK_RSC_REL_PATH share/bbtk/rsc) + SET(BBTK_DATA_REL_PATH share/bbtk/data) ENDIF(WIN32) #----------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKSetDeducedPaths.cmake b/kernel/cmake/BBTKSetDeducedPaths.cmake index 56d5e08..ca2ceae 100644 --- a/kernel/cmake/BBTKSetDeducedPaths.cmake +++ b/kernel/cmake/BBTKSetDeducedPaths.cmake @@ -8,18 +8,20 @@ SET(BBTK_DOC_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOC_REL_PATH}) SET(BBTK_BBDOC_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBDOC_REL_PATH}) SET(BBTK_DOXYGEN_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DOXYGEN_REL_PATH}) SET(BBTK_BBS_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_BBS_REL_PATH}) +SET(BBTK_DATA_BUILD_PATH ${PROJECT_BINARY_DIR}/${BBTK_DATA_REL_PATH}) SET(BBTK_DOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOC_REL_PATH}) SET(BBTK_BBDOC_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBDOC_REL_PATH}) SET(BBTK_DOXYGEN_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DOXYGEN_REL_PATH}) SET(BBTK_BBS_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_BBS_REL_PATH}) +SET(BBTK_DATA_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${BBTK_DATA_REL_PATH}) # Create build directories if necessary MKDIR(${BBTK_DOC_BUILD_PATH}) MKDIR(${BBTK_BBDOC_BUILD_PATH}) MKDIR(${BBTK_DOXYGEN_BUILD_PATH}) -MKDIR(${BBTK_DOXYGEN_BUILD_PATH}) MKDIR(${BBTK_BBS_BUILD_PATH}) +MKDIR(${BBTK_DATA_BUILD_PATH}) #----------------------------------------------------------------------------- SET (EXECUTABLE_OUTPUT_PATH diff --git a/kernel/cmake/bbtk_config_build.xml.in b/kernel/cmake/bbtk_config_build.xml.in index 8a148b7..38bdd44 100644 --- a/kernel/cmake/bbtk_config_build.xml.in +++ b/kernel/cmake/bbtk_config_build.xml.in @@ -2,15 +2,18 @@ Sets the search directories in the build tree - @BBTK_DOC_BUILD_PATH@ + +#@BBTK_DOC_BUILD_PATH@ - @BBTK_BBS_BUILD_PATH@ + +#@BBTK_BBS_BUILD_PATH@ @EXECUTABLE_OUTPUT_PATH@ # For windows @EXECUTABLE_OUTPUT_PATH@\Debug @EXECUTABLE_OUTPUT_PATH@\Release # - @BBTK_DATA_ROOT@ + +#@BBTK_DATA_ROOT@ @PROJECT_BINARY_DIR@ diff --git a/kernel/install/gnome/install-gnome.sh b/kernel/install/gnome/bbtk-install-gnome.sh similarity index 100% rename from kernel/install/gnome/install-gnome.sh rename to kernel/install/gnome/bbtk-install-gnome.sh diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index 167579f..e398286 100644 --- 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/06 10:53:02 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/13 14:08:25 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -42,16 +42,43 @@ ConfigurationFile::ConfigurationFile() std::string slash("/"); #endif -// ==> First we look for bbtk_config.xml in "." - + // ==> Set system paths + mBin_path = execPath; + mInstall_path = mBin_path + slash + ".."; + // The relative path to the doc folder (=BBTK_DOC_REL_PATH) + mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH); + // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path) + mDoc_path = mInstall_path + slash + mDoc_rel_path; + // The relative path to the doc folder (=BBTK_BBS_REL_PATH) + mBbs_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_BBS_REL_PATH); + // The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path) + mBbs_path = mInstall_path + slash + mBbs_rel_path; + // The relative path to the rsc folder (=BBTK_RSC_REL_PATH) + // mRsc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_RSC_REL_PATH); + // The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path) + // mRsc_path = mInstall_path + slash + mRsc_rel_path; + // The path to the bbtk data folder + // Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH + // But can be overriden by value read from bbtk_config.xml + mData_path = mInstall_path + slash + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH); + // MessageManager::SetMessageLevel("Config",1); + bbtkMessage("Config",1," ==> bin : '"< prefix : '"< doc : '"< bbs : '"< rsc : '"< data : '"< First we look for bbtk_config.xml in "." char buf[2048]; const char *currentDir = getcwd(buf, 2048); if( !currentDir ) { std::cerr << "Path was too long to fit on 2048 bytes ?!?" << std::endl; - /// \todo : what else? + // \todo : what else? // How abort a constructor and warn the caller function? + // LG : throw an exception } std::string configXmlFullPathName = currentDir + slash + "bbtk_config.xml"; @@ -123,15 +150,15 @@ void ConfigurationFile::CreateConfigXML( char *rootDirectory ) bbtkMessage("Config",1, "in CreateConfigXML[" << configXml << "]" << std::endl); fp = fopen (configXml, "w"); fprintf(fp, "\n"); - fprintf(fp, "\n"); + // fprintf(fp, "\n"); fprintf(fp, "\n"); fprintf(fp, " \n"); - fprintf(fp, " http://www.creatis.insa-lyon.fr/software/bbtk \n"); - fprintf(fp, " \n"); + // fprintf(fp, " http://www.creatis.insa-lyon.fr/software/bbtk \n"); + // fprintf(fp, " \n"); fprintf(fp, " \n"); // fprintf(fp, " \n"); fprintf(fp, " \n"); - fprintf(fp, " %s \n", BBTK_DATA_PATH); + fprintf(fp, " \n");//, BBTK_DATA_PATH); /// \todo find a decent default value ! ///fprintf(fp, " %s \n", " "); // when $ will be found, default_temp_dir value will be replaced @@ -376,13 +403,15 @@ void ConfigurationFile::Read(const std::string& filename) GetTextOrClear(BB.getChildNode((XMLCSTR)"data_path"),mData_path); // install_path - if( BB.nChildNode((XMLCSTR)"install_path") ) - GetTextOrClear(BB.getChildNode((XMLCSTR)"install_path"),mInstall_path); + // if( BB.nChildNode((XMLCSTR)"install_path") ) + // GetTextOrClear(BB.getChildNode((XMLCSTR)"install_path"),mInstall_path); // always add "." (current working directory) at the begining - // bbs_paths mBbs_paths.push_back("."); + // add system bbs path + mBbs_paths.push_back(mBbs_path); + for (i=0,j=0; i& Get_bbs_paths() const { return mBbs_paths;} inline const std::vector& Get_package_paths() const @@ -105,12 +113,35 @@ public: std::string mDescription; /// Where is the file bbtk_config.xml std::string mConfig_xml_full_path; - /// Where the doc is - std::string mUrl; + + /// Set automatically : + /// The path to the executable (usually bbi) + std::string mBin_path; + /// The path to the install prefix (=mBinPath+"/..") std::string mInstall_path; + /// The relative path to the doc folder (=BBTK_DOC_REL_PATH) + std::string mDoc_rel_path; + /// The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path) + std::string mDoc_path; + /// The relative path to the doc folder (=BBTK_BBS_REL_PATH) + std::string mBbs_rel_path; + /// The path to the bbs folder (=mInstall_path+"/"+mBbs_rel_path) + std::string mBbs_path; + /// The relative path to the rsc folder (=BBTK_RSC_REL_PATH) + std::string mRsc_rel_path; + /// The path to the rsc folder (=mInstall_path+"/"+mRsc_rel_path) + std::string mRsc_path; + /// The path to the bbtk data folder + /// Initialized to mInstall_path+"/"+BBTK_DATA_REL_PATH + /// But can be overriden by value read from bbtk_config.xml std::string mData_path; + /// / or \, depending on the OS std::string mFile_separator; + + /// Read from bbtk_config.xml file + /// Where the doc is + std::string mUrl; /// Scripts std::vector mBbs_paths; /// Package dlls -- 2.45.1