logic: enviroment variable handling

* expanding env vars for existsens check
* expand source paths in filemanager

src/lib/settings/ProjectSettings.cpp

@@ -242,6 +242,7 @@ void ProjectSettings::makePathsAbsolute(std::vector<FilePath>& paths) const
 	FilePath basePath = getFilePath().parentDirectory();
 	for (size_t i = 0; i < paths.size(); i++)
 	{
+		paths[i] = paths[i].expandEnvironmentVariables();
 		if (!paths[i].isAbsolute())
 		{
 			paths[i] = basePath.concat(paths[i]).canonical();

src/lib/utility/file/FileManager.cpp

@@ -26,8 +26,14 @@ void FileManager::setPaths(
 	std::vector<std::string> sourceExtensions,
 	std::vector<std::string> includeExtensions
 ){
-	m_sourcePaths = sourcePaths;
-	m_headerPaths = headerPaths;
+	for ( FilePath path : sourcePaths )
+	{
+		m_sourcePaths.push_back(path.expandEnvironmentVariables());
+	}
+	for ( FilePath path : headerPaths )
+	{
+		m_headerPaths.push_back(path.expandEnvironmentVariables());
+	}
 	m_sourceExtensions = sourceExtensions;
 	m_includeExtensions = includeExtensions;
 }

src/lib/utility/file/FilePath.cpp

@@ -1,5 +1,8 @@
 #include "utility/file/FilePath.h"
 
+#include <regex>
+#include "utility/logging/logging.h"
+
 FilePath::FilePath()
 	: m_exists(false)
 {
@@ -98,6 +101,29 @@ FilePath FilePath::canonical() const
 	return result;
 }
 
+FilePath FilePath::expandEnvironmentVariables() const
+{
+	return FilePath(expandEnvironmentVariables(str()));
+}
+
+std::string FilePath::expandEnvironmentVariables(const std::string& path) const
+{
+	std::string text = path;
+
+	static std::regex env( "\\$\\{([^}]+)\\}|%([0-9A-Za-z\\/]*)%" );
+	std::smatch match;
+	while ( std::regex_search( text, match, env ) ) {
+		const char * s = getenv( match[1].str().c_str() );
+		if (s == nullptr)
+		{
+			LOG_ERROR(match[1].str() + " is no a environment variable");
+			return path;
+		}
+		text.replace( match[0].first, match[0].second, s);
+	}
+	return text;
+}
+
 FilePath FilePath::relativeTo(const FilePath& other) const
 {
 	boost::filesystem::path a = m_path;
@@ -202,7 +228,8 @@ bool FilePath::operator<(const FilePath& other) const
 
 void FilePath::init()
 {
-	if (boost::filesystem::exists(m_path))
+	boost::filesystem::path p(expandEnvironmentVariables(m_path.generic_string()));
+	if (boost::filesystem::exists(p))
 	{
 		m_exists = true;
 	}

src/lib/utility/file/FilePath.h

@@ -26,6 +26,8 @@ public:
 	FilePath canonical() const;
 	FilePath relativeTo(const FilePath& other) const;
 	FilePath concat(const FilePath& other) const;
+	FilePath expandEnvironmentVariables() const;
+	std::string expandEnvironmentVariables(const std::string & path) const;
 
 	std::string str() const;
 	std::string fileName() const;