X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConfigurationFile.cxx;h=c163a5b6a9907cad8cc9b58ec30403648be0ceed;hb=a280c10c9ba7730cd9105a91bf1a40e72503a6e3;hp=0b9f54b2bd8f28c6557c1c980a73b8a335017e4a;hpb=4234999264604da013c2574feef3816c75b3034e;p=bbtk.git diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index 0b9f54b..c163a5b 100644 --- a/kernel/src/bbtkConfigurationFile.cxx +++ b/kernel/src/bbtkConfigurationFile.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkConfigurationFile.cxx,v $ Language: C++ - Date: $Date: 2008/11/03 15:53:31 $ - Version: $Revision: 1.20 $ + Date: $Date: 2009/05/28 14:22:10 $ + Version: $Revision: 1.31 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -39,11 +39,13 @@ #include "bbtkUtilities.h" #if defined(WIN32) -#include // for getcwd +# include // for getcwd +# include #endif + namespace bbtk { @@ -55,48 +57,77 @@ namespace bbtk mFile_separator = VALID_FILE_SEPARATOR; // ==> Set system paths - mBin_path = GetExecutablePath(); -//EED mInstall_path = mBin_path + mFile_separator + ".."; + mBin_path = Utilities::GetExecutablePath(); + + + + +/* EED 23 Mars 2009 +#ifdef MACOSX + mInstall_path = mBin_path + "/../../../.."; +#else mInstall_path = mBin_path + "/.."; +#endif +*/ +#ifdef MACOSX + + std::string macPath("Contents/MacOS"); + int sbp = mBin_path.length(); + int smp = macPath.length(); + if (mBin_path.compare( sbp-smp, smp, macPath )==0 ) + { + mBin_path = mBin_path + "/../../.."; + } + + +#endif + mInstall_path = mBin_path + "/.."; + + + // The relative path to the doc folder (=BBTK_DOC_REL_PATH) - mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(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) -//EED mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path; - mDoc_path = mInstall_path + "/" + mDoc_rel_path; + // mDoc_path = mInstall_path + "/" + mDoc_rel_path; + // Have to create bbtk user's dirs if needed + + // LG 27/01/09 : doc is now user dependent + // and located in user's .bbtk dir /doc + // All dirs under .bbtk user's dir are set and created by: + InitializeDotBbtkStructure(); + // 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) -//EED mBbs_path = mInstall_path + mFile_separator + mBbs_rel_path; mBbs_path = mInstall_path + "/" + 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 + mFile_separator + 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 -//EED mData_path = mInstall_path + mFile_separator + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH); + mData_path = mInstall_path + "/" + BBTK_STRINGIFY_SYMBOL(BBTK_DATA_REL_PATH); - - Utilities::replace( mBin_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - Utilities::replace( mInstall_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - Utilities::replace( mDoc_rel_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - Utilities::replace( mDoc_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - Utilities::replace( mBbs_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - Utilities::replace( mData_path , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - - bbtkMessage("Config",1," ==> bin : '"< prefix : '"< doc : '"< bbs : '"< data : '"< bin : '"< prefix : '"< doc : '"< bbs : '"< data : '"< First we look for bbtk_config.xml in "." char buf[2048]; const char *currentDir = getcwd(buf, 2048); @@ -154,14 +185,14 @@ namespace bbtk // LG : throw an exception } -// std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml"; + // std::string configXmlFullPathName = currentDir + mFile_separator + "bbtk_config.xml"; std::string configXmlFullPathName = currentDir ; - configXmlFullPathName += "/bbtk_config.xml"; - Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - + configXmlFullPathName += "/bbtk_config.xml"; + Utilities::replace( configXmlFullPathName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); + if ( Utilities::FileExists( configXmlFullPathName )) { - bbtkMessage("Config",1, "ConfigurationFile : [" << configXmlFullPathName << + bbtkMessage("config",1, "ConfigurationFile : [" << configXmlFullPathName << "] found in current directory" << std::endl); //Read(configXmlFullPathName.c_str()); // traiter le fichier local @@ -190,62 +221,95 @@ namespace bbtk } //========================================================================= + //========================================================================= + void ConfigurationFile::InitializeDotBbtkStructure() + { + mDot_bbtk_path = Utilities::GetUserSettingsDir(); + mDot_bbtk_is_new = false; + if (!Utilities::FileExists(mDot_bbtk_path)) mDot_bbtk_is_new = true; + Utilities::CreateDirectoryIfNeeded(mDot_bbtk_path); + + mDoc_path = Utilities::MakeUserSettingsFullFileName("doc"); + Utilities::CreateDirectoryIfNeeded(mDoc_path); + std::string bbdoc_path = + Utilities::MakeUserSettingsFullFileName("doc/bbdoc"); + Utilities::CreateDirectoryIfNeeded(bbdoc_path); + + // Create help_contents.html if does not exist + std::string filename = Utilities::MakeUserSettingsFullFileName("doc/help_contents.html"); + if (!Utilities::FileExists(filename)) + { + bbtkDebugMessage("config",1, + "* Creating [" << filename << "]" << std::endl); + // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path) + std::string doc_path = mInstall_path + "/" + + BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH) + "/"; + Utilities::MakeValidFileName(doc_path); + std::ofstream f; + f.open(filename.c_str(), std::ios::out ); + f << "" + << "Help Contents - bbtk " + << GetVersion() << "" + << "

Help Contents

" + << "Demos
" + << "Examples" + << "

Guides

" + << "User's Guide
" + << "Package Developer's Guide
" + << "bbtk library doxygen doc
" + << "

Boxes

" + << "" + << "Alphabetical list
" + << "" + << "List by package
" + << "" + << "List by category
" + << "" + << "List of adaptors
" + << "" + << ""; + } + mTemp_path = Utilities::MakeUserSettingsFullFileName("tmp"); + Utilities::CreateDirectoryIfNeeded(mTemp_path); + + } + //========================================================================= + //========================================================================= void ConfigurationFile::CreateConfigXML( char *rootDirectory ) { FILE *fp; char configXml[250]; sprintf (configXml , "%s/bbtk_config.xml", rootDirectory); - bbtkDebugMessage("Config",1, "in CreateConfigXML[" << configXml << "]" << std::endl); + bbtkDebugMessage("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, "\n"); fclose(fp); } //========================================================================= - - //========================================================================= - std::string ConfigurationFile::GetExecutablePath() - { - /// \todo : Think to delete it! - char *buf = (char *)malloc(512); - char *slash; - -#if defined(WIN32) - GetModuleFileName(NULL, buf, 511); - slash = strrchr(buf, '\\'); - if (slash) - { - *slash = 0; - } -#elif defined(__GNUC__) - int res; - res = readlink("/proc/self/exe", buf, 512); - if (res == -1) - return ""; - buf[res] = 0; - slash = strrchr(buf, '/'); - if (slash) - { - *slash = 0; - } -#else - return ""; -#endif - std::string ret(buf); - free(buf); - return ret; - } - //========================================================================= - + + //========================================================================= void ConfigurationFile::InstallPath () @@ -284,10 +348,6 @@ namespace bbtk char configPath[200]; sprintf(configPath, "%s/bbtk_config.xml",rootDirectory); - // makeDir - char makeDir[250]; - sprintf( makeDir, "mkdir \"%s\" ", rootDirectory); - // configXmlTmp char configXmlTmp[250]; sprintf(configXmlTmp, "%s/bbtk_config.xml.tmp", bbtk_path); @@ -297,23 +357,12 @@ namespace bbtk if (!Utilities::FileExists(configXmlTmp)) // bbtk_config.xml.tmp not found (not installed) { - if (!Utilities::FileExists(rootDirectory)) // .bbtk not found - { - system(makeDir); // create .bbtk - } - // if "bbtk_path/bbtk_config.xml.tmp" doesn't exist, hard-create a minimum version in .bbtk CreateConfigXML( rootDirectory );// create .bbtk } else { sprintf(copyFile,"cp %s %s/bbtk_config.xml ",configXmlTmp,rootDirectory ); - if (!Utilities::FileExists(rootDirectory)) - { - //std::cout << "makeDir[" << makeDir << "]" << std::endl; - system(makeDir); - } - if (!Utilities::FileExists(configPath)) { system(copyFile); @@ -353,11 +402,6 @@ namespace bbtk if (!Utilities::FileExists(configXmlTmp)) // bbtk_config.xml.tmp not found { - if (!Utilities::FileExists(rootDirectory)) // .bbtk not found - { - system(makeDir); // create .bbtk - } - // if "bbtk_path/bbtk_config.xml.tmp" doesn't exist, hard-create a minimum version in .bbtk CreateConfigXML( rootDirectory );// create .bbtk return; @@ -366,7 +410,7 @@ namespace bbtk sprintf(copyFile,"copy %s\\bbtk_config.xml.tmp \"%s\"\\bbtk_config.xml ",bbtk_path,rootDirectory ); int attribs = GetFileAttributes (rootDirectory); - bbtkMessage("Config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl); + bbtkMessage("config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl); if ( attribs != 0xFFFFFFFF) { if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check ! @@ -402,7 +446,7 @@ namespace bbtk void ConfigurationFile::Read(const std::string& filename) { - bbtkDebugMessage("Config",1,"ConfigurationFile::Read(" <bbs_paths = Get_bbs_paths(); const std::vectorpackage_paths = Get_package_paths(); - bbtkMessage("Help",level, "=============" << std::endl); - bbtkMessage("Help",level, "Configuration" << std::endl); - bbtkMessage("Help",level, "=============" << std::endl); - bbtkMessage("Help",level, "bbtk_config.xml : [" << config_xml_full_path << "]" << std::endl); - bbtkMessage("Help",level, "Documentation Path : [" << url << "]" << std::endl); - bbtkMessage("Help",level, "Data Path : [" << data_path << "]" << std::endl); - bbtkMessage("Help",level, "Temp Directory : [" << default_temp_dir << "]" << std::endl); - bbtkMessage("Help",level, "File Separator : [" << file_separator << "]" << std::endl); + bbtkMessage("help",level, "=============" << std::endl); + bbtkMessage("help",level, "Configuration" << std::endl); + bbtkMessage("help",level, "=============" << std::endl); + bbtkMessage("help",level, "bbtk_config.xml : [" << config_xml_full_path << "]" << std::endl); + bbtkMessage("help",level, "Documentation Path : [" << url << "]" << std::endl); + bbtkMessage("help",level, "Data Path : [" << data_path << "]" << std::endl); + bbtkMessage("help",level, "Temp Directory : [" << default_temp_dir << "]" << std::endl); + bbtkMessage("help",level, "File Separator : [" << file_separator << "]" << std::endl); std::vector::const_iterator i; - bbtkMessage("Help",level, "BBS Paths " << std::endl); + bbtkMessage("help",level, "BBS Paths " << std::endl); for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i ) { - bbtkMessage("Help",level,"--- ["<<*i<<"]"<