added: boost build command line script

[0.1.x] refactored: DbgPythonPath class
[0.1.x] added: FileExists function

[0.0.x] refactored: DbgPythonPath class 
[0.0.x] added: FileExists function

git-svn-id: https://pykd.svn.codeplex.com/svn@72409 9b283d60-5439-405e-af05-b73fd8c4d996

pykd/dbgext.cpp

@@ -896,11 +896,10 @@ py( PDEBUG_CLIENT4 client, PCSTR args )
         delete[]  pythonArgs;       
 
        // íàéòè ïóòü ê ôàéëó
-        std::string     scriptName;
+        std::string     fullScriptName;
-        std::string     filePath;
         DbgPythonPath   dbgPythonPath;        
         
-        if ( !dbgPythonPath.findPath( argsList[0], scriptName, filePath ) )
+        if ( !dbgPythonPath.getFullFileName( argsList[0], fullScriptName ) )
         {
             dbgClient->eprintln( L"script file not found" );            
         }
@@ -909,7 +908,7 @@ py( PDEBUG_CLIENT4 client, PCSTR args )
       
             python::object       result;
     
-            result =  python::exec_file( scriptName.c_str(), global, global );
+            result =  python::exec_file( fullScriptName.c_str(), global, global );
         }                
         catch( boost::python::error_already_set const & )
         {

pykd/dbgpath.cpp

@@ -1,147 +1,71 @@
 #include "stdafx.h"
 
 #include "dbgpath.h"
+#include "utils.h"
 
 #include <boost/tokenizer.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 
-
-
 DbgPythonPath::DbgPythonPath()
 {
-    DWORD   enviromentSize = 0;
+    boost::python::object sys = boost::python::import("sys");
 
-    enviromentSize = GetEnvironmentVariableA( "PYTHONPATH", NULL, enviromentSize );
+    boost::python::list pathList(sys.attr("path"));
-
-    std::vector<char> enviromentBuffer(enviromentSize);
-
-	if (!enviromentBuffer.empty())
-	{
-		GetEnvironmentVariableA( "PYTHONPATH", &enviromentBuffer[0], enviromentSize );
-
-		typedef  boost::escaped_list_separator<char>    char_separator_t;
-		typedef  boost::tokenizer< char_separator_t >   char_tokenizer_t;  
-	    
-		std::string     pytonPath( &enviromentBuffer[0] );
-	  
-		char_tokenizer_t            token( pytonPath, char_separator_t( "", "; \t", "\"" ) );
-
-		for ( char_tokenizer_t::iterator   it = token.begin(); it != token.end(); ++it )
-		{
-			if ( *it != "" )
-				m_pathList.push_back( *it );
-		}
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-std::string 
-DbgPythonPath::getStr() const
-{
-    std::string     str;
-    std::vector<std::string>::const_iterator      it = m_pathList.begin();
-    
-    for ( ; it != m_pathList.end(); ++it )
-    {
-        str += *it;
-        str += ";";
-    }
-    
-    return str;
-}
- 
-///////////////////////////////////////////////////////////////////////////////
- 
-bool
-DbgPythonPath::findPath( 
-    const std::string  &fileName,
-    std::string  &fullFileName,
-    std::string  &filePath ) const
-{
-    std::vector< std::string >      extPathList;
-
-    boost::python::object       sys = boost::python::import( "sys");
-
-    boost::python::list       pathList( sys.attr("path") );
 
     boost::python::ssize_t n = boost::python::len(pathList);
-    for(boost::python::ssize_t i=0;i<n;i++) 
-         extPathList.push_back(  boost::python::extract<std::string>( pathList[i] ) );
 
-    bool    pyExt = fileName.rfind( ".py" ) ==  fileName.length() - 3; 
+    for (boost::python::ssize_t i = 0; i < n ; i++) 
+        m_extactedPathList.push_back(boost::python::extract<std::string>(pathList[i]));
+}
 
-    // 1. Èùåì â ðàáî÷åé äèðåêòîðèè
+///////////////////////////////////////////////////////////////////////////////
-    DWORD   bufSize =
+ 
-        SearchPathA(
+bool DbgPythonPath::getFullFileName(const std::string &fileName, std::string &fullFileName) const
+{
+    bool fileHasPyExt = fileName.rfind(".py") == fileName.length() - 3;
+    fullFileName = fileName;
+
+    if (!fileHasPyExt)
+        fullFileName += ".py";
+    
+    if (FileExists(fullFileName.c_str()))
+        return true;
+
+    std::vector<std::string>::const_iterator it = m_extactedPathList.begin();
+    for ( ; it != m_extactedPathList.end(); ++it)
+    {
+        DWORD bufSize = SearchPathA(
+            (*it).c_str(), 
+            fullFileName.c_str(), 
             NULL, 
-            fileName.c_str(),
-            pyExt ? NULL : ".py",
             0, 
             NULL, 
-            NULL );  
+            NULL);          
                 
-    if ( bufSize > 0 )    
+        if (bufSize > 0)
-    {
-        bufSize += 1;
-		std::vector<char> fullFileNameCStr(bufSize);
-        char    *partFileNameCStr = NULL;
-
-        SearchPathA(
-            NULL,
-            fileName.c_str(),
-            pyExt ? NULL : ".py",
-            bufSize,
-            &fullFileNameCStr[0],
-           &partFileNameCStr );          
-
-        fullFileName = std::string( &fullFileNameCStr[0] );
-        if ( !fullFileName.empty() )
-        {
-            filePath = std::string( &fullFileNameCStr[0], partFileNameCStr );
-            return true;        
-        }            
-    }                
-            
-    // 2. Èùåì âî âñåõ äèðåêòîðèÿõ, óêàçàííûõ â m_pathList
-    
-    std::vector<std::string>::const_iterator      it = extPathList.begin();
-    
-    for ( ; it != extPathList.end(); ++it )
-    {
-        DWORD   bufSize =
-            SearchPathA(
-                (*it).c_str(),
-                fileName.c_str(),
-                 pyExt ? NULL : ".py",
-                0,
-                NULL,
-                NULL );          
-                
-        if ( bufSize > 0 )
         {
             bufSize += 1;
             std::vector<char> fullFileNameCStr(bufSize);
-            char    *partFileNameCStr = NULL;
+            char *partFileNameCStr = NULL;
             
             bufSize = SearchPathA(
                 (*it).c_str(),
-                fileName.c_str(),
+                fullFileName.c_str(),
-                pyExt ? NULL : ".py",
+                NULL,
                 bufSize,
                 &fullFileNameCStr[0],
-                &partFileNameCStr );          
+                &partFileNameCStr);
             
-            fullFileName = std::string( &fullFileNameCStr[0] );                
+            if (bufSize > 0)
-            if ( !fullFileName.empty() )
             {
-                filePath = std::string( &fullFileNameCStr[0], partFileNameCStr );
+                fullFileName = std::string(&fullFileNameCStr[0]);
                 return true;
             }
         }                  
     }
 
+    fullFileName = "";
     return false;
 }
     

pykd/dbgpath.h

@@ -8,24 +8,12 @@
 class DbgPythonPath
 {
 public:
-
     DbgPythonPath();
 
-    std::string 
+    bool getFullFileName(const std::string &fileName, std::string &fullFileName) const;
-    getStr() const;
-    
-    bool
-    findPath( 
-        const std::string  &fileName,
-        std::string  &fullFileName,
-        std::string  &filePath ) const;
-    
 
 private:
-
+    std::vector<std::string> m_extactedPathList;
-    std::vector< std::string >      m_pathList;    
-
 };
 
-
 ///////////////////////////////////////////////////////////////////////////////

pykd/utils.h

@@ -99,3 +99,9 @@ python::list toPyList(const std::list< TElem > &stdList)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+inline
+bool FileExists(LPCSTR lpFileName)
+{
+    return ::GetFileAttributesA(lpFileName) != DWORD(-1);
+}
+////////////////////////////////////////////////////////////////////////////////