From d8041d1ef54a73acc2306557435f6b04edf60daf Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Tue, 6 May 2008 13:45:11 +0000 Subject: [PATCH] Compil sous Windows --- kernel/cmake/BBTKFindLibraries.cmake | 3 +- kernel/src/CMakeLists.txt | 2 +- kernel/src/bbtkBlackBox.cxx | 7 +- kernel/src/bbtkBlackBox.h | 6 +- kernel/src/bbtkBlackBoxDescriptor.cxx | 9 +- kernel/src/bbtkInterpreter.h | 9 +- kernel/src/bbtkObject.h | 23 +- kernel/src/bbtkPackage.cxx | 10 +- kernel/src/bbtkUtilities.cxx | 477 ++++++++++++++++++++++++++ kernel/src/bbtkUtilities.h | 456 ++---------------------- kernel/src/bbtkVirtualExec.h | 6 +- kernel/src/bbtkWxBlackBox.cxx | 9 +- kernel/src/bbtkWxGUIConsole.cxx | 6 +- 13 files changed, 557 insertions(+), 466 deletions(-) diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake index f39f1eb..38fbf99 100644 --- a/kernel/cmake/BBTKFindLibraries.cmake +++ b/kernel/cmake/BBTKFindLibraries.cmake @@ -174,7 +174,8 @@ IF(USE_BOOST) INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/kernel/src/ThirdParty/${BBTK_SHIPPED_BOOST}) - + # TO DO : CLEANLY BLOCK auto_link.hpp INCLUSION + #ADD_DEF(BOOST_SIGNALS_NO_LIB) SET(BBTK_BOOST_LIBRARIES bbtk_boost_signals ) diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index 078fffd..e3b5e43 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -100,7 +100,7 @@ IF(BBTK_USE_BOOST) SET(BBTK_LINK_LIBRARIES ${BBTK_LINK_LIBRARIES} ${BBTK_BOOST_LIBRARIES} - ) + ) ENDIF(BBTK_USE_BOOST) #----------------------------------------------------------------------------- diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx index edca10c..51a9ab7 100644 --- a/kernel/src/bbtkBlackBox.cxx +++ b/kernel/src/bbtkBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.cxx,v $ Language: C++ -Date: $Date: 2008/04/24 10:11:27 $ -Version: $Revision: 1.16 $ +Date: $Date: 2008/05/06 13:45:12 $ +Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -103,6 +103,9 @@ namespace bbtk } //========================================================================= + //========================================================================= + BlackBox::BlackBox(const BlackBox&) + {} //========================================================================= BlackBox::BlackBox(BlackBox& from, const std::string &name) diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h index 48509a1..eb6f46c 100644 --- a/kernel/src/bbtkBlackBox.h +++ b/kernel/src/bbtkBlackBox.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.h,v $ Language: C++ - Date: $Date: 2008/04/22 14:30:25 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -377,7 +377,7 @@ bool reaction = true); /// Black box deleter /// 1) Calls the user overloadable bbDelete method /// 2) Releases the box descriptor - struct Deleter : public Object::Deleter + struct BBTK_EXPORT Deleter : public Object::Deleter { Deleter(); void Delete(Object* p); diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx index e015608..e4318a7 100644 --- a/kernel/src/bbtkBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkBlackBoxDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:15 $ - Version: $Revision: 1.16 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -51,6 +51,11 @@ namespace bbtk } //========================================================================= + //========================================================================= + /// Default ctor + BlackBoxDescriptor::BlackBoxDescriptor(const BlackBoxDescriptor&) + { + } //========================================================================= /// Dtor BlackBoxDescriptor::~BlackBoxDescriptor() diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index 8440873..2e7ba4d 100644 --- a/kernel/src/bbtkInterpreter.h +++ b/kernel/src/bbtkInterpreter.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.h,v $ $ Language: C++ - Date: $Date: 2008/04/25 08:05:23 $ - Version: $Revision: 1.29 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.30 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -86,7 +86,7 @@ namespace bbtk //======================================================================= class BBTK_EXPORT Interpreter : public Object { - BBTK_OBJECT_INTERFACE(Interpreter); + BBTK_OBJECT_INTERFACE_NO_CONDES(Interpreter); typedef Object Superclass; public: static Pointer New(const std::string& cpp_file = ""); @@ -319,6 +319,9 @@ namespace bbtk bool mThrow; + protected: + ~Interpreter(); + }; // EO class Interpreter diff --git a/kernel/src/bbtkObject.h b/kernel/src/bbtkObject.h index 27ed132..ac9a5b9 100644 --- a/kernel/src/bbtkObject.h +++ b/kernel/src/bbtkObject.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkObject.h,v $ Language: C++ - Date: $Date: 2008/04/24 11:49:59 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -24,6 +24,7 @@ #ifndef __bbtkObject_h__ #define __bbtkObject_h__ +#include #include #include #include @@ -32,7 +33,7 @@ namespace bbtk { // The top class of bbtk class hierarchy - class Object + class BBTK_EXPORT Object { public: typedef boost::shared_ptr Pointer; @@ -58,7 +59,7 @@ namespace bbtk static long GetObjectsCount() { return mgObjectList.size(); } /// Default objects deleter : removes object from list on deletion - struct Deleter + struct BBTK_EXPORT Deleter { Deleter() : mPointer() {} virtual void operator() (Object* p); @@ -159,6 +160,15 @@ protected: \ CLASS(const CLASS&); \ ~CLASS(); +#define BBTK_OBJECT_INTERFACE_NO_CONDES(CLASS) \ + BBTK_OBJECT_MINIMAL_INTERFACE_WITH_SELF(CLASS); \ +public: \ + std::string GetObjectName() const; \ + std::string GetObjectInfo() const ; \ + size_t GetObjectSize() const ; \ + size_t GetObjectInternalSize() const ; \ + size_t GetObjectRecursiveSize() const ; + #define BBTK_ABSTRACT_OBJECT_INTERFACE(CLASS) \ public : typedef CLASS Self; \ BBTK_OBJECT_MINIMAL_INTERFACE; \ @@ -170,15 +180,16 @@ protected: \ //======================================================================= // A struct with one static instance // just to print object list info after main - struct StaticInitTime + class BBTK_EXPORT StaticInitTime { + public: StaticInitTime(); ~StaticInitTime(); static bool PrintObjectListInfo; private: - static Object mObject; + static bbtk::Object mObject; }; diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx index 2936889..31f5a13 100644 --- a/kernel/src/bbtkPackage.cxx +++ b/kernel/src/bbtkPackage.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkPackage.cxx,v $ Language: C++ - Date: $Date: 2008/04/25 13:37:49 $ - Version: $Revision: 1.16 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -432,7 +432,7 @@ namespace bbtk getvername += BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_BBTK_VERSION_FUNCTION_NAME); DLGetPackageBBTKVersionFunction getbbtkversion - = (DLGetPackageBBTKVersionFunction)(GetProcAdress(handler, + = (DLGetPackageBBTKVersionFunction)(GetProcAddress(handler, getvername.c_str())); if (!getbbtkversion) { @@ -461,7 +461,7 @@ namespace bbtk // Loads the Package get function std::string getpackname(package_name); getpackname += BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_FUNCTION_NAME); - getpack = (DLGetPackageFunction)(GetProcAdress(handler, getpackname.c_str())); + getpack = (DLGetPackageFunction)(GetProcAddress(handler, getpackname.c_str())); if (!getpack) { FreeLibrary(handler); @@ -475,7 +475,7 @@ namespace bbtk // Loads the Package delete function std::string delpackname(package_name); delpackname += BBTK_STRINGIFY_SYMBOL(BBTK_DEL_PACKAGE_FUNCTION_NAME); - delpack = (DLDeletePackageFunction)(GetProcAdress(handler, delpackname.c_str())); + delpack = (DLDeletePackageFunction)(GetProcAddress(handler, delpackname.c_str())); if (!delpack) { FreeLibrary(handler); diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx index 968853f..ff96d76 100644 --- a/kernel/src/bbtkUtilities.cxx +++ b/kernel/src/bbtkUtilities.cxx @@ -5,6 +5,483 @@ namespace bbtk { + + // ====================================================================== + // See : http://www.techbytes.ca/techbyte103.html for more O.S. + bool Utilities::FileExists(std::string strFilename) + { + struct stat stFileInfo; + bool blnReturn; + int intStat; + + // Attempt to get the file attributes + intStat = stat(strFilename.c_str(),&stFileInfo); + if(intStat == 0) + { + // We were able to get the file attributes + // so the file obviously exists. + blnReturn = true; + } + else + { + // We were not able to get the file attributes. + // This may mean that we don't have permission to + // access the folder which contains this file. If you + // need to do that level of checking, lookup the + // return values of stat which will give you + // more details on why stat failed. + blnReturn = false; + } + + return(blnReturn); + } + + + // ===================================================================== + + std::string Utilities::ExtractPackageName(const std::string &name, + std::string& path) + { + std::string pkgname; + path = ""; + + std::string::size_type slash_position = name.find_last_of("/\\"); + if (slash_position != std::string::npos) + { + pkgname = name.substr(slash_position+1,std::string::npos); + path = name.substr(0,slash_position); + // std::cout << "F:P='"<.so + + // remove {libbb} if any + if (memcmp ( pkgname.c_str(), "libbb", 5) == 0) { + pkgname = pkgname.substr(5, pkgname.length()); + } + /* + /// \ \todo what would happen if (stupid) user names his package 'libbb' ?!? + /// \ --> Should be forbidden! + */ +#elif defined(_WIN32) + + // WIN 32 mechanism + // shared lib name = .dll + + // EED Problem loading package call bbtkTools + // // remove {bb} if any + if (memcmp (pkgname.c_str(), "bb", 2) == 0) { + pkgname = pkgname.substr(2, pkgname.length()); + } + + /* + /// \ \todo what would happen if (stupid) user names his package 'bb' ?!? + /// \ --> Should be forbidden! + */ +#else + bbtkError("neither __GNUC__ nor _WIN32 ?!? How did you compile ?"); +#endif + return pkgname; + } + + //===================================================================== + std::string Utilities::ExtractScriptName(const std::string &name, + std::string& path) + { + std::string pkgname; + + std::string::size_type slash_position = name.find_last_of("/\\"); + if (slash_position != std::string::npos) { + pkgname =name.substr(slash_position+1,std::string::npos); + path = name.substr(0,slash_position); + } else { + pkgname = name; + } + // remove {.bbs } if any + std::string::size_type dot_position = pkgname.find_last_of('.'); + if (dot_position != std::string::npos){ + pkgname = pkgname.substr(0,dot_position); + } + return pkgname; + } + + // ======================================================================== + + std::string Utilities::ExpandLibName(const std::string &name, bool verbose) + { + // ----- Think of expanding path name ( ./ ../ ../../ ) + + char buf[2048]; // for getcwd + char * currentDir = getcwd(buf, 2048); + std::string cwd(currentDir); + std::string libname(name); + std::string fileSeparator; + fileSeparator = ConfigurationFile::GetInstance().Get_file_separator(); + // tooHigh : true is user supplies a library pathname with too many "../" + bool tooHigh = false; + + //std::cout << "------------------cwd [" << cwd << "] name [" << name << "]" << std::endl; + + if ( name[0] == '/' || name[1] == ':' ) // Linux or Windows absolute name + { + return(libname); + } + else if ( name =="." ) + { + libname = cwd + fileSeparator; + return(libname); + } + else if (name[0] == '.' && (name[1] == '/' || name[1] == '\\') ) + { + libname = cwd + fileSeparator + name.substr(2, name.length()); + return(libname); + } + else if ( name[0] == '.' && name[1] == '.' /* && (name[2] == '/' || name[2] == '\\') */ ) + { + if ( IsAtRoot(cwd) ) // hope it gets / (for Linux), C: D: (for Windows) + { + // if we are already at / or c: --> hopeless + if (verbose) + std::cout << " File path [" << name << "] doesn't exist" << std::endl; + tooHigh = true; + } + else + { + // iterate on ../ and go up from the current working dir! + std::string a(name); + bool alreadyProcessRoot = false; + + //if (a[a.size()-1] != fileSeparator[0]) + // a.append(fileSeparator); +//std::cout << "------------------a [" << a << "]" << std::endl; + + for(;;) // wild loop ! + { + std::string::size_type slash_position = cwd.find_last_of(fileSeparator); + if (slash_position != std::string::npos) { + if (slash_position == 0) + slash_position = 1; + cwd = cwd.substr(0,slash_position/*+1*/); +//std::cout << "------------------cwd [" << cwd << "]" << std::endl; + // if (a == "..") { + // a = ""; + // break; + // } + // else + a = a.substr(3, /*name.length()*/ a.length()); // remove ../ +//std::cout << "------------------a [" << a << "]" << std::endl; + if (a == "" || alreadyProcessRoot) + { + if (verbose) + std::cout << " File path : [" << name << "] doesn't exist" << std::endl; + tooHigh = true; + break; + } + // std::string b = cwd + a; + libname = cwd; + char c = cwd[cwd.size()-1]; + if (c != '/' && c != '\\' ) + libname += fileSeparator; + libname += a; + + if ( a[0] != '.' ) // if . (probabely ../), loop again + break; + + if (IsAtRoot(cwd)) + alreadyProcessRoot = true; + } + } // end iterating on ../ + } +//std::cout << "------------------out of loop]" << std::endl; + if (tooHigh) + libname=""; + return (libname); + + } // ----- End of expanding path name ( ./ ../ ../../ ) + + std::cout <<"* ERROR in ExpandLibName : should never get here!" << std::endl; + // To avoid warning + return(""); // Will never get here! + } + +// =================================================================================== + + std::string Utilities::MakeLibnameFromPath(std::string path, std::string pkgname) + { + std::string libname = path; + char c = path[path.size()-1]; +#if defined(__GNUC__) + if (c != '/') + libname += "/libbb"; + else + libname += "libbb"; + libname += pkgname; + libname += ".so"; + +#elif defined(_WIN32) + if (c != '\\') + libname = path+"\\bb"; + libname += pkgname; + libname += ".dll"; +#endif + return libname; + } + +// =================================================================================== + + std::string Utilities::MakePkgnameFromPath(std::string path, std::string pkgname, bool addExt) + { + std::string libname = path; + char c = path[path.size()-1]; + if (c != '/' && c != '\\') + { + libname += ConfigurationFile::GetInstance().Get_file_separator (); + } + libname += pkgname; + if (addExt) + { + int l = libname.size(); + if (l>4) + { + if (libname.substr(l-4, 4) != ".bbs") + { + libname = libname + ".bbs"; + } + } + } + return libname; + } + + //======================================================================== + + bool Utilities::IsAtRoot(std::string cwd) + { + if ( cwd == "/" // hope it gets / (for Linux) + || (cwd.size() <= 3 && cwd[1] == ':') ) // hope it gets C: D: (for Windows) + return (true); + else + return(false); + } + + // ====================================================================== + + bool Utilities::IsDirectory(std::string const &dirName) + { + struct stat fs; + + if ( stat(dirName.c_str(), &fs) == 0 ) + { +#if _WIN32 + return ((fs.st_mode & _S_IFDIR) != 0); +#else + return S_ISDIR(fs.st_mode); +#endif + } + else + { + return false; + } + } + + // =================================================================================== + + void Utilities::SplitAroundFirstDot( const std::string& in, + std::string& left, + std::string& right) + { + std::string delimiter = "."; + std::string::size_type pos = in.find_first_of(delimiter); + if (std::string::npos != pos) + { + left = in.substr(0,pos); + right = in.substr(pos+1,in.size()); + + } + else + { + // bbtkError(in<<" : expected 'a.b' format but no dot found"); + left =""; + right = ""; + } + } + //======================================================================= + void Utilities::SplitString ( const std::string& str, + const std::string& delimiters, + std::vector& tokens) + { + // Skip delimiters at beginning. + std::string::size_type lastPos = str.find_first_not_of(delimiters, 0); + // Find first delimiter. + std::string::size_type pos = str.find_first_of(delimiters, lastPos); + + while (std::string::npos != pos || std::string::npos != lastPos) + { + // Found a token, add it to the vector. + tokens.push_back(str.substr(lastPos, pos - lastPos)); + // Skip delimiters. Note the "not_of" + lastPos = str.find_first_not_of(delimiters, pos); + // Find next delimiter + pos = str.find_first_of(delimiters, lastPos); + } + + } + //======================================================================= + + + // =================================================================================== + + std::string Utilities::get_file_name(const std::string& s) + { + std::string::size_type slash_position = s.find_last_of("/\\"); + if (slash_position != std::string::npos) + { + return s.substr(slash_position+1,std::string::npos); + } + else + { + return s; + } + } + + // =================================================================================== + /** + * \brief Explore a directory with possibility of recursion + * return number of files read + * @param dirpath directory to explore + * @param recursive whether we want recursion or not + */ + int Utilities::Explore(std::string const &dirpath, bool recursive, std::vector &Filenames) + { + int numberOfFiles = 0; + std::string fileName; + + std::string dirName = dirpath; + +#ifdef _MSC_VER + WIN32_FIND_DATA fileData; + HANDLE hFile = FindFirstFile((dirName+"\\*").c_str(), &fileData); + + for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b; + b = FindNextFile(hFile, &fileData)) + { + fileName = fileData.cFileName; + if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) + { + // Need to check for . and .. to avoid infinite loop + if ( fileName != "." && fileName != ".." && recursive ) + { + numberOfFiles += Explore(dirName+ "\\"+fileName,recursive,Filenames); + } + } + else + { + Filenames.push_back(dirName+"\\"+fileName); + numberOfFiles++; + } + } + DWORD dwError = GetLastError(); + if (hFile != INVALID_HANDLE_VALUE) + FindClose(hFile); + if (dwError != ERROR_NO_MORE_FILES) + { + LPVOID lpMsgBuf; + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER| + FORMAT_MESSAGE_FROM_SYSTEM| + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL,GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + (LPTSTR) &lpMsgBuf,0,NULL); + + // ErrorMacro("FindNextFile error. Error is " << (char *)lpMsgBuf + // <<" for the directory : "<d_name; +//std::cout <<"in Explor filename[" << fileName << "]" << std::endl; + if( stat(fileName.c_str(), &buf) != 0 ) + { + //ErrorMacro( strerror(errno) ); + } + if ( S_ISREG(buf.st_mode) ) //is it a regular file? + { + Filenames.push_back( fileName ); + numberOfFiles++; + } + else if ( S_ISDIR(buf.st_mode) ) //directory? + { + if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files + { + numberOfFiles += Explore( fileName, recursive, Filenames); + } + } + else + { + //ErrorMacro( "Unexpected error" ); + return -1; + } + } + if( closedir(dir) != 0 ) + { + // ErrorMacro( strerror(errno) ); + } +#endif + + return numberOfFiles; + +} + + + //======================================================================= + // Replaces substrings "\\n" by a real carriage return "\n" + void Utilities::SubsBackslashN ( std::string& s ) + { + std::string ss("\\n"); + std::string::size_type pos = 0; + pos = s.find(ss,0); + char* cr = "\n"; + while ( pos != std::string::npos ) + { + s.replace(pos,2,cr,1); + pos = s.find(ss, pos-1); + } + } + //======================================================================= + + + bool Utilities::loosematch(std::string stdLine,std::string stdOptions) { bool result=false; diff --git a/kernel/src/bbtkUtilities.h b/kernel/src/bbtkUtilities.h index 087f220..910f4da 100644 --- a/kernel/src/bbtkUtilities.h +++ b/kernel/src/bbtkUtilities.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUtilities.h,v $ Language: C++ - Date: $Date: 2008/03/26 08:27:19 $ - Version: $Revision: 1.14 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.15 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -58,352 +58,50 @@ namespace bbtk // ====================================================================== // See : http://www.techbytes.ca/techbyte103.html for more O.S. - static inline bool FileExists(std::string strFilename) - { - struct stat stFileInfo; - bool blnReturn; - int intStat; - - // Attempt to get the file attributes - intStat = stat(strFilename.c_str(),&stFileInfo); - if(intStat == 0) - { - // We were able to get the file attributes - // so the file obviously exists. - blnReturn = true; - } - else - { - // We were not able to get the file attributes. - // This may mean that we don't have permission to - // access the folder which contains this file. If you - // need to do that level of checking, lookup the - // return values of stat which will give you - // more details on why stat failed. - blnReturn = false; - } - - return(blnReturn); - } - + static bool FileExists(std::string strFilename); // ===================================================================== static std::string ExtractPackageName(const std::string &name, - std::string& path) - { - std::string pkgname; - path = ""; - - std::string::size_type slash_position = name.find_last_of("/\\"); - if (slash_position != std::string::npos) - { - pkgname = name.substr(slash_position+1,std::string::npos); - path = name.substr(0,slash_position); - // std::cout << "F:P='"<.so - - // remove {libbb} if any - if (memcmp ( pkgname.c_str(), "libbb", 5) == 0) { - pkgname = pkgname.substr(5, pkgname.length()); - } - /* - /// \ \todo what would happen if (stupid) user names his package 'libbb' ?!? - /// \ --> Should be forbidden! - */ -#elif defined(_WIN32) - - // WIN 32 mechanism - // shared lib name = .dll - - // EED Problem loading package call bbtkTools - // // remove {bb} if any - if (memcmp (pkgname.c_str(), "bb", 2) == 0) { - pkgname = pkgname.substr(2, pkgname.length()); - } - - /* - /// \ \todo what would happen if (stupid) user names his package 'bb' ?!? - /// \ --> Should be forbidden! - */ -#else - bbtkError("neither __GNUC__ nor _WIN32 ?!? How did you compile ?"); -#endif - return pkgname; - } - + std::string& path); + //===================================================================== static std::string ExtractScriptName(const std::string &name, - std::string& path) - { - std::string pkgname; - - std::string::size_type slash_position = name.find_last_of("/\\"); - if (slash_position != std::string::npos) { - pkgname =name.substr(slash_position+1,std::string::npos); - path = name.substr(0,slash_position); - } else { - pkgname = name; - } - // remove {.bbs } if any - std::string::size_type dot_position = pkgname.find_last_of('.'); - if (dot_position != std::string::npos){ - pkgname = pkgname.substr(0,dot_position); - } - return pkgname; - } - + std::string& path); + // ======================================================================== - static std::string ExpandLibName(const std::string &name, bool verbose) - { - // ----- Think of expanding path name ( ./ ../ ../../ ) - - char buf[2048]; // for getcwd - char * currentDir = getcwd(buf, 2048); - std::string cwd(currentDir); - std::string libname(name); - std::string fileSeparator; - fileSeparator = ConfigurationFile::GetInstance().Get_file_separator(); - // tooHigh : true is user supplies a library pathname with too many "../" - bool tooHigh = false; - - //std::cout << "------------------cwd [" << cwd << "] name [" << name << "]" << std::endl; - - if ( name[0] == '/' || name[1] == ':' ) // Linux or Windows absolute name - { - return(libname); - } - else if ( name =="." ) - { - libname = cwd + fileSeparator; - return(libname); - } - else if (name[0] == '.' && (name[1] == '/' || name[1] == '\\') ) - { - libname = cwd + fileSeparator + name.substr(2, name.length()); - return(libname); - } - else if ( name[0] == '.' && name[1] == '.' /* && (name[2] == '/' || name[2] == '\\') */ ) - { - if ( IsAtRoot(cwd) ) // hope it gets / (for Linux), C: D: (for Windows) - { - // if we are already at / or c: --> hopeless - if (verbose) - std::cout << " File path [" << name << "] doesn't exist" << std::endl; - tooHigh = true; - } - else - { - // iterate on ../ and go up from the current working dir! - std::string a(name); - bool alreadyProcessRoot = false; - - //if (a[a.size()-1] != fileSeparator[0]) - // a.append(fileSeparator); -//std::cout << "------------------a [" << a << "]" << std::endl; - - for(;;) // wild loop ! - { - std::string::size_type slash_position = cwd.find_last_of(fileSeparator); - if (slash_position != std::string::npos) { - if (slash_position == 0) - slash_position = 1; - cwd = cwd.substr(0,slash_position/*+1*/); -//std::cout << "------------------cwd [" << cwd << "]" << std::endl; - // if (a == "..") { - // a = ""; - // break; - // } - // else - a = a.substr(3, /*name.length()*/ a.length()); // remove ../ -//std::cout << "------------------a [" << a << "]" << std::endl; - if (a == "" || alreadyProcessRoot) - { - if (verbose) - std::cout << " File path : [" << name << "] doesn't exist" << std::endl; - tooHigh = true; - break; - } - // std::string b = cwd + a; - libname = cwd; - char c = cwd[cwd.size()-1]; - if (c != '/' && c != '\\' ) - libname += fileSeparator; - libname += a; - - if ( a[0] != '.' ) // if . (probabely ../), loop again - break; - - if (IsAtRoot(cwd)) - alreadyProcessRoot = true; - } - } // end iterating on ../ - } -//std::cout << "------------------out of loop]" << std::endl; - if (tooHigh) - libname=""; - return (libname); - - } // ----- End of expanding path name ( ./ ../ ../../ ) - - std::cout <<"* ERROR in ExpandLibName : should never get here!" << std::endl; - // To avoid warning - return(""); // Will never get here! - } - + static std::string ExpandLibName(const std::string &name, bool verbose); + // =================================================================================== - static std::string MakeLibnameFromPath(std::string path, std::string pkgname) - { - std::string libname = path; - char c = path[path.size()-1]; -#if defined(__GNUC__) - if (c != '/') - libname += "/libbb"; - else - libname += "libbb"; - libname += pkgname; - libname += ".so"; - -#elif defined(_WIN32) - if (c != '\\') - libname = path+"\\bb"; - libname += pkgname; - libname += ".dll"; -#endif - return libname; - } - + static std::string MakeLibnameFromPath(std::string path, std::string pkgname); + // =================================================================================== - static inline std::string MakePkgnameFromPath(std::string path, std::string pkgname, bool addExt) - { - std::string libname = path; - char c = path[path.size()-1]; - if (c != '/' && c != '\\') - { - libname += ConfigurationFile::GetInstance().Get_file_separator (); - } - libname += pkgname; - if (addExt) - { - int l = libname.size(); - if (l>4) - { - if (libname.substr(l-4, 4) != ".bbs") - { - libname = libname + ".bbs"; - } - } - } - return libname; - } - + static std::string MakePkgnameFromPath(std::string path, std::string pkgname, bool addExt); //======================================================================== - static inline bool IsAtRoot(std::string cwd) - { - if ( cwd == "/" // hope it gets / (for Linux) - || (cwd.size() <= 3 && cwd[1] == ':') ) // hope it gets C: D: (for Windows) - return (true); - else - return(false); - } - + static bool IsAtRoot(std::string cwd); // ====================================================================== - static bool IsDirectory(std::string const &dirName) - { - struct stat fs; - - if ( stat(dirName.c_str(), &fs) == 0 ) - { -#if _WIN32 - return ((fs.st_mode & _S_IFDIR) != 0); -#else - return S_ISDIR(fs.st_mode); -#endif - } - else - { - return false; - } - } - + static bool IsDirectory(std::string const &dirName); // =================================================================================== - static inline void SplitAroundFirstDot( const std::string& in, + static void SplitAroundFirstDot( const std::string& in, std::string& left, - std::string& right) - { - std::string delimiter = "."; - std::string::size_type pos = in.find_first_of(delimiter); - if (std::string::npos != pos) - { - left = in.substr(0,pos); - right = in.substr(pos+1,in.size()); - - } - else - { - // bbtkError(in<<" : expected 'a.b' format but no dot found"); - left =""; - right = ""; - } - } + std::string& right); //======================================================================= - static inline void SplitString ( const std::string& str, + static void SplitString ( const std::string& str, const std::string& delimiters, - std::vector& tokens) - { - // Skip delimiters at beginning. - std::string::size_type lastPos = str.find_first_not_of(delimiters, 0); - // Find first delimiter. - std::string::size_type pos = str.find_first_of(delimiters, lastPos); - - while (std::string::npos != pos || std::string::npos != lastPos) - { - // Found a token, add it to the vector. - tokens.push_back(str.substr(lastPos, pos - lastPos)); - // Skip delimiters. Note the "not_of" - lastPos = str.find_first_not_of(delimiters, pos); - // Find next delimiter - pos = str.find_first_of(delimiters, lastPos); - } - - } + std::vector& tokens); //======================================================================= // =================================================================================== - static inline std::string get_file_name(const std::string& s) - { - std::string::size_type slash_position = s.find_last_of("/\\"); - if (slash_position != std::string::npos) - { - return s.substr(slash_position+1,std::string::npos); - } - else - { - return s; - } - } + static std::string get_file_name(const std::string& s) ; + // =================================================================================== /** @@ -412,122 +110,12 @@ namespace bbtk * @param dirpath directory to explore * @param recursive whether we want recursion or not */ - static int Explore(std::string const &dirpath, bool recursive, std::vector &Filenames) - { - int numberOfFiles = 0; - std::string fileName; - - std::string dirName = dirpath; - -#ifdef _MSC_VER - WIN32_FIND_DATA fileData; - HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData); - - for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b; - b = FindNextFile(hFile, &fileData)) - { - fileName = fileData.cFileName; - if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) - { - // Need to check for . and .. to avoid infinite loop - if ( fileName != "." && fileName != ".." && recursive ) - { - numberOfFiles += Explore(dirName+ "\\"+fileName,recursive,Filenames); - } - } - else - { - Filenames.push_back(dirName+fileName); - numberOfFiles++; - } - } - DWORD dwError = GetLastError(); - if (hFile != INVALID_HANDLE_VALUE) - FindClose(hFile); - if (dwError != ERROR_NO_MORE_FILES) - { - LPVOID lpMsgBuf; - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER| - FORMAT_MESSAGE_FROM_SYSTEM| - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL,GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPTSTR) &lpMsgBuf,0,NULL); - - // ErrorMacro("FindNextFile error. Error is " << (char *)lpMsgBuf - // <<" for the directory : "<d_name; -//std::cout <<"in Explor filename[" << fileName << "]" << std::endl; - if( stat(fileName.c_str(), &buf) != 0 ) - { - //ErrorMacro( strerror(errno) ); - } - if ( S_ISREG(buf.st_mode) ) //is it a regular file? - { - Filenames.push_back( fileName ); - numberOfFiles++; - } - else if ( S_ISDIR(buf.st_mode) ) //directory? - { - if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files - { - numberOfFiles += Explore( fileName, recursive, Filenames); - } - } - else - { - //ErrorMacro( "Unexpected error" ); - return -1; - } - } - if( closedir(dir) != 0 ) - { - // ErrorMacro( strerror(errno) ); - } -#endif - - return numberOfFiles; - -} + static int Explore(std::string const &dirpath, bool recursive, std::vector &Filenames); //======================================================================= // Replaces substrings "\\n" by a real carriage return "\n" - static inline void SubsBackslashN ( std::string& s ) - { - std::string ss("\\n"); - std::string::size_type pos = 0; - pos = s.find(ss,0); - char* cr = "\n"; - while ( pos != std::string::npos ) - { - s.replace(pos,2,cr,1); - pos = s.find(ss, pos-1); - } - } + static void SubsBackslashN ( std::string& s ); //======================================================================= diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h index 52ceb2c..2b57eb0 100644 --- a/kernel/src/bbtkVirtualExec.h +++ b/kernel/src/bbtkVirtualExec.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkVirtualExec.h,v $ $ Language: C++ - Date: $Date: 2008/04/24 12:56:39 $ - Version: $Revision: 1.14 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.15 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -37,7 +37,7 @@ namespace bbtk class Interpreter; BBTK_FORWARD_DECLARE_POINTER(Interpreter); - class /*BBTK_EXPORT*/ VirtualExec : public Object + class BBTK_EXPORT VirtualExec : public Object { BBTK_ABSTRACT_OBJECT_INTERFACE(VirtualExec); public: diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index a66ecc6..38474a0 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/04/24 10:11:28 $ - Version: $Revision: 1.16 $ + Date: $Date: 2008/05/06 13:45:12 $ + Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -491,13 +491,16 @@ namespace bbtk // call 'standard' BlackBox execution method if (!bbGetUpdateTransferedToParent()) { - AtomicBlackBox::bbBackwardUpdate(caller); + AtomicBlackBox::bbBackwardUpdate(caller); } bbtkDebugMessageDec("process",3, "<= WxBlackBox::bbBackwardUpdate() [" <