X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkConfigurationFile.cxx;h=8e2d78ce31d6b5b30c145a4e3cd497b9813d5b39;hb=30b4292974380b80ab23dedc97aa2585ed0cc8f7;hp=d558b5c087bc24db436d38a4fce6818e249bccf0;hpb=886f5176d504772148701cf104015f586c3dd240;p=bbtk.git diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index d558b5c..8e2d78c 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/21 15:26:44 $ - Version: $Revision: 1.22 $ + Date: $Date: 2009/12/08 14:10:36 $ + Version: $Revision: 1.32 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -43,18 +43,7 @@ # include #endif -#if defined(MACOSX) // assume this is OSX -# include -# include // _NSGetExecutablePath : must add -framework CoreFoundation to link line -# include -# ifndef PATH_MAX -# define PATH_MAX MAXPATHLEN -# endif -#endif // MACOSX - -#ifndef PATH_MAX // If not defined yet : do it -# define PATH_MAX 2048 -#endif + namespace bbtk @@ -68,52 +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 + "/../../../.."; + mInstall_path = mBin_path + "/../../../.."; #else - mInstall_path = mBin_path + "/.."; + mInstall_path = mBin_path + "/.."; #endif - // The relative path to the doc folder (=BBTK_DOC_REL_PATH) - mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH); +*/ +#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); // 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); @@ -171,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 @@ -207,8 +221,80 @@ 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
" + << "Developer's Guide
" + << "Package Developer's Guide
" + << "bbtk library doxygen doc
" + << "

Boxes

" + << "" + << "Alphabetical list
" + << "" + << "List by package
" + << "" + << "List by category
" + << "" + << "List of adaptors
" + << "" + << ""; + } // if + + mTemp_path = Utilities::MakeUserSettingsFullFileName("tmp"); + Utilities::CreateDirectoryIfNeeded(mTemp_path); + } + //========================================================================= //========================================================================= void ConfigurationFile::CreateConfigXML( char *rootDirectory ) @@ -216,13 +302,12 @@ namespace bbtk 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); } @@ -230,193 +315,6 @@ namespace bbtk - //========================================================================= - // From http://www.fltk.org/newsgroups.php?gfltk.general+v:22083 - // - int get_app_path (char *pname, size_t pathsize) - { -#ifdef LINUX - /* Oddly, the readlink(2) man page says no NULL is appended. */ - /* So you have to do it yourself, based on the return value: */ - pathsize --; /* Preserve a space to add the trailing NULL */ - long result = readlink("/proc/self/exe", pname, pathsize); - if (result > 0) - { - pname[result] = 0; /* add the #@!%ing NULL */ - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL (falls - through) */ - } -#endif /* LINUX */ - -#ifdef WIN32 - long result = GetModuleFileName(NULL, pname, pathsize); - if (result > 0) - { - /* fix up the dir slashes... */ - int len = strlen(pname); - int idx; - for (idx = 0; idx < len; idx++) - { - if (pname[idx] == '\\') pname[idx] = '/'; - } - - for (idx = len-1; idx >=0 ; idx--) - { - if (pname[idx] == '/') - { - pname[idx+1] = '\0'; - idx = -1; - } - } - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL (falls - through) */ - } -#endif /* WIN32 */ - -#ifdef SOLARIS - char *p = getexecname(); - if (p) - { - /* According to the Sun manpages, getexecname will - "normally" return an */ - /* absolute path - BUT might not... AND that IF it is not, - pre-pending */ - /* getcwd() will "usually" be the correct thing... Urgh! - */ - - /* check pathname is absolute (begins with a / ???) */ - if (p[0] == '/') /* assume this means we have an - absolute path */ - { - strncpy(pname, p, pathsize); - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - } - else /* if not, prepend getcwd() then check if file - exists */ - { - getcwd(pname, pathsize); - long result = strlen(pname); - strncat(pname, "/", (pathsize - result)); - result ++; - strncat(pname, p, (pathsize - result)); - - if ((access(pname, 0) == 0)) - return 0; /* file exists, return OK */ - /*else name doesn't seem to exist, return FAIL - (falls through) */ - } - } -#endif /* SOLARIS */ - -#ifdef MACOSX /* assume this is OSX */ - /* - from http://www.hmug.org/man/3/NSModule.html - - extern int _NSGetExecutablePath(char *buf, unsigned long - *bufsize); - - _NSGetExecutablePath copies the path of the executable - into the buffer and returns 0 if the path was successfully - copied in the provided buffer. If the buffer is not large - enough, -1 is returned and the expected buffer size is - copied in *bufsize. Note that _NSGetExecutablePath will - return "a path" to the executable not a "real path" to the - executable. That is the path may be a symbolic link and - not the real file. And with deep directories the total - bufsize needed could be more than MAXPATHLEN. - */ - int status = -1; - char *given_path = (char*)malloc(MAXPATHLEN * 2); - if (!given_path) return status; - - uint32_t npathsize = MAXPATHLEN * 2; - long result = _NSGetExecutablePath(given_path, &npathsize); - if (result == 0) - { /* OK, we got something - now try and resolve the real path... - */ - if (realpath(given_path, pname) != NULL) - { - if ((access(pname, 0) == 0)) - status = 0; /* file exists, return OK */ - } - } - free (given_path); - return status; -#endif /* MACOSX */ - - return -1; /* Path Lookup Failed */ - } - - - - //========================================================================= - std::string ConfigurationFile::GetExecutablePath() - { - char name[PATH_MAX]; - int err = get_app_path(name, PATH_MAX); - if (err) - { - bbtkError("Could not determine current executable path ?"); - } - - // remove the exe name - char *slash; - slash = strrchr(name, VALID_FILE_SEPARATOR_CHAR); - if (slash) - { - *slash = 0; - } -printf("EED ConfigurationFile::GetExecutablePath %s\n",name); - return name; - } - -/* - /// \todo : Think to delete it! - char *buf = (char *)malloc(512); - if (!buf) - { - bbtkError("Could not allocate 512 bytes !"); - } - char *slash; - -#if defined(WIN32) - GetModuleFileName(NULL, buf, 511); - slash = strrchr(buf, '\\'); - if (slash) - { - *slash = 0; - } -#endif - - -#if defined(__GNUC__) - int res; - res = readlink("/proc/self/exe", buf, 512); - if (res == -1) - { - free(buf); - - } - buf[res] = 0; - slash = strrchr(buf, '/'); - if (slash) - { - *slash = 0; - } -#endif - std::string ret(buf); - free(buf); - return ret; - } - //========================================================================= -*/ //========================================================================= void ConfigurationFile::InstallPath () @@ -455,10 +353,6 @@ printf("EED ConfigurationFile::GetExecutablePath %s\n",name); 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); @@ -468,23 +362,12 @@ printf("EED ConfigurationFile::GetExecutablePath %s\n",name); 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); @@ -524,11 +407,6 @@ printf("EED ConfigurationFile::GetExecutablePath %s\n",name); 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; @@ -537,7 +415,7 @@ printf("EED ConfigurationFile::GetExecutablePath %s\n",name); 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 ! @@ -573,7 +451,7 @@ printf("EED ConfigurationFile::GetExecutablePath %s\n",name); 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<<"]"<