Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 08:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix 38352, XMLLoadFile seems to need a separate instance of Path, so revert that optimisation and leave it only to NormalizeFilename.

Browse source 
svn path=/trunk/; revision=38353
This commit is contained in:
Aleksey Bragin 2008-12-26 13:25:55 +00:00
parent 03a011db89
commit fd4de76baf
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/tools/rbuild/module.cpp
View file

@ -24,6 +24,8 @@
using std::string; using std::string;
using std::vector; using std::vector;
static const Path defaultPath;
string string
Right ( const string& s, size_t n ) Right ( const string& s, size_t n )
{ {
@ -161,8 +163,9 @@ NormalizeFilename ( const string& filename )
{ {
if ( filename == "" ) if ( filename == "" )
return ""; return "";
string normalizedPath = defaultPath.Fixup ( filename, true ); Path path;
string relativeNormalizedPath = defaultPath.RelativeFromWorkingDirectory ( normalizedPath ); string normalizedPath = path.Fixup ( filename, true );
string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath );
return FixSeparator ( relativeNormalizedPath ); return FixSeparator ( relativeNormalizedPath );
} }

5
reactos/tools/rbuild/project.cpp
View file

@ -25,8 +25,6 @@
using std::string; using std::string;
using std::vector; using std::vector;
const Path defaultPath;
/* static */ string /* static */ string
Environment::GetVariable ( const string& name ) Environment::GetVariable ( const string& name )
{ {
@ -261,7 +259,8 @@ Project::ExecuteInvocations ()
void void
Project::ReadXml () Project::ReadXml ()
{ {
head = XMLLoadFile ( xmlfile, defaultPath, xmlbuildfiles ); Path path;
head = XMLLoadFile ( xmlfile, path, xmlbuildfiles );
node = NULL; node = NULL;
for ( size_t i = 0; i < head->subElements.size (); i++ ) for ( size_t i = 0; i < head->subElements.size (); i++ )
{ {