Changeset 6040 for sandbox_light/src/libraries/core/PathConfig.cc

Timestamp:

Nov 5, 2009, 10:15:05 PM (15 years ago)

Author:

rgrieder

Message:

Also synchronised sandbox_light with current trunk.

Location:

sandbox_light

Files:

• . (modified) (1 prop)
• src/libraries/core/PathConfig.cc (copied) (copied from sandbox/src/libraries/core/PathConfig.cc) (6 diffs)

sandbox_light/src/libraries/core/PathConfig.cc

@@ -75 +75 @@
         : rootPath_(*(new bf::path()))
         , executablePath_(*(new bf::path()))
-        , modulePath_(*(new bf::path()))
         , dataPath_(*(new bf::path()))
         , configPath_(*(new bf::path()))
@@ -136 +135 @@
             COUT(1) << "Running from the build tree." << std::endl;
             PathConfig::bDevRun_ = true;
-            modulePath_ = specialConfig::moduleDevDirectory;
         }
         else
@@ -151 +149 @@
                 ThrowException(General, "Could not derive a root directory. Might the binary installation directory contain '..' when taken relative to the installation prefix path?");
 
-            // Module path is fixed as well
-            modulePath_ = rootPath_ / specialConfig::defaultModulePath;
-
 #else
 
             // There is no root path, so don't set it at all
-            // Module path is fixed as well
-            modulePath_ = specialConfig::moduleInstallDirectory;
 
 #endif
@@ -168 +161 @@
         delete &rootPath_;
         delete &executablePath_;
-        delete &modulePath_;
         delete &dataPath_;
         delete &configPath_;
@@ -242 +234 @@
     }
 
-    std::vector<std::string> PathConfig::getModulePaths()
-    {
-        std::vector<std::string> modulePaths;
-
-        // We search for helper files with the following extension
-        std::string moduleextension = specialConfig::moduleExtension;
-        size_t moduleextensionlength = moduleextension.size();
-
-        // Add that path to the PATH variable in case a module depends on another one
-        std::string pathVariable = getenv("PATH");
-        putenv(const_cast<char*>(("PATH=" + pathVariable + ";" + modulePath_.string()).c_str()));
-
-        // Make sure the path exists, otherwise don't load modules
-        if (!boost::filesystem::exists(modulePath_))
-            return modulePaths;
-
-        boost::filesystem::directory_iterator file(modulePath_);
-        boost::filesystem::directory_iterator end;
-
-        // Iterate through all files
-        while (file != end)
-        {
-            std::string filename = file->BOOST_LEAF_FUNCTION();
-
-            // Check if the file ends with the exension in question
-            if (filename.size() > moduleextensionlength)
-            {
-                if (filename.substr(filename.size() - moduleextensionlength) == moduleextension)
-                {
-                    // We've found a helper file
-                    std::string library = filename.substr(0, filename.size() - moduleextensionlength);
-                    modulePaths.push_back((modulePath_ / library).file_string());
-                }
-            }
-            ++file;
-        }
-
-        return modulePaths;
-    }
-
     /*static*/ std::string PathConfig::getRootPathString()
     {
@@ -306 +258 @@
         return getInstance().logPath_.string() + '/';
     }
-
-    /*static*/ std::string PathConfig::getModulePathString()
-    {
-        return getInstance().modulePath_.string() + '/';
-    }
 }