(file) Return to ProviderManager.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2

Diff for /pegasus/src/Pegasus/ProviderManager2/ProviderManager.cpp between version 1.26.6.1 and 1.26.6.2

version 1.26.6.1, 2007/09/26 16:05:13 version 1.26.6.2, 2007/09/26 17:58:35
Line 47 
Line 47 
  
 String ProviderManager::_resolvePhysicalName(String physicalName) String ProviderManager::_resolvePhysicalName(String physicalName)
 { {
   #if defined(PEGASUS_OS_VXWORKS)
       // VxWorks uses static linking so we just return libraries of the
       // form "lib<physicalName>.a".
       return String("lib") + physicalName + String(".a");
   #endif
   
 #if defined(PEGASUS_OS_VMS) #if defined(PEGASUS_OS_VMS)
     String fileName =     String fileName =
         FileSystem::buildLibraryFileName(physicalName) + String(".exe");         FileSystem::buildLibraryFileName(physicalName) + String(".exe");
Line 54 
Line 60 
     String fileName = FileSystem::buildLibraryFileName(physicalName);     String fileName = FileSystem::buildLibraryFileName(physicalName);
 #endif #endif
  
 #if defined(PEGASUS_OS_VXWORKS)  
   
     const char* env = getenv("PEGASUS_PROVIDER_DIR");  
     String path;  
   
     if (env)  
     {  
         path = String(env) + String("/") + fileName;  
     }  
     else  
     {  
         path = FileSystem::getAbsoluteFileName(  
             ConfigManager::getInstance()->getCurrentValue("providerDir"),  
             fileName);  
     }  
   
 /*  
 ATTN: remove!  
 */  
 #if 0  
     std::cout << physicalName << "[" << path << "]" << std::endl;  
 #endif  
   
     return path;  
   
 #else /* !defined(PEGASUS_OS_VXWORKS) */  
   
     fileName = FileSystem::getAbsoluteFileName(     fileName = FileSystem::getAbsoluteFileName(
         ConfigManager::getHomedPath(         ConfigManager::getHomedPath(
             ConfigManager::getInstance()->getCurrentValue("providerDir")),             ConfigManager::getInstance()->getCurrentValue("providerDir")),
         fileName);         fileName);
  
 #endif /* !defined(PEGASUS_OS_VXWORKS) */  
   
     return fileName;     return fileName;
 } }
  


Legend:
Removed from v.1.26.6.1  
changed lines
  Added in v.1.26.6.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2