ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rbuild compilation, by adding Path::RelativeFromDirectory method

Browse Source 
svn path=/trunk/; revision=17580
This commit is contained in:
Hervé Poussineau
2005-08-28 09:50:00 +00:00
parent 2142e2dfaf
commit b5fbf00480
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/tools/rbuild/XML.cpp
+12 -6
View File
@@ -172,21 +172,27 @@ Path::RelativeFromWorkingDirectory ()
string
Path::RelativeFromWorkingDirectory ( const string& path )
{
vector<string> vwork, vpath, vout;
Path::Split ( vwork, working_directory, true );
return Path::RelativeFromDirectory ( path, working_directory );
}
string
Path::RelativeFromDirectory ( const string& path, const string& base_directory )
{
vector<string> vbase, vpath, vout;
Path::Split ( vbase, base_directory, true );
Path::Split ( vpath, path, true );
#ifdef WIN32
// this squirreliness is b/c win32 has drive letters and *nix doesn't...
// not possible to do relative across different drive letters
if ( vwork[0] != vpath[0] )
if ( vbase[0] != vpath[0] )
return path;
#endif
size_t i = 0;
while ( i < vwork.size() && i < vpath.size() && vwork[i] == vpath[i] )
while ( i < vbase.size() && i < vpath.size() && vbase[i] == vpath[i] )
++i;
if ( i < vwork.size() )
if ( i < vbase.size() )
{
// path goes above our working directory, we will need some ..'s
// path goes above our base directory, we will need some ..'s
for ( size_t j = 0; j < i; j++ )
vout.push_back ( ".." );
}
reactos/tools/rbuild/XML.h
+1
View File
@@ -44,6 +44,7 @@ public:
std::string RelativeFromWorkingDirectory ();
static std::string RelativeFromWorkingDirectory ( const std::string& path );
static std::string RelativeFromDirectory ( const std::string& path, const std::string& base_directory);
static void Split ( std::vector<std::string>& out,
const std::string& path,