mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
interface: change absolutePath() so that ".dir" is considered as an absolute path
fixes #1534
This commit is contained in:
parent
9128e73b03
commit
41fe412389
@ -593,11 +593,11 @@ bool CompilerStack::checkLibraryNameClashes()
|
|||||||
|
|
||||||
string CompilerStack::absolutePath(string const& _path, string const& _reference) const
|
string CompilerStack::absolutePath(string const& _path, string const& _reference) const
|
||||||
{
|
{
|
||||||
// Anything that does not start with `.` is an absolute path.
|
|
||||||
if (_path.empty() || _path.front() != '.')
|
|
||||||
return _path;
|
|
||||||
using path = boost::filesystem::path;
|
using path = boost::filesystem::path;
|
||||||
path p(_path);
|
path p(_path);
|
||||||
|
// Anything that does not start with `.` is an absolute path.
|
||||||
|
if (p.begin() == p.end() || (*p.begin() != "." && *p.begin() != ".."))
|
||||||
|
return _path;
|
||||||
path result(_reference);
|
path result(_reference);
|
||||||
result.remove_filename();
|
result.remove_filename();
|
||||||
for (path::iterator it = p.begin(); it != p.end(); ++it)
|
for (path::iterator it = p.begin(); it != p.end(); ++it)
|
||||||
|
Loading…
Reference in New Issue
Block a user