Fix weird bug in Project::ResolveProperties(), which was modifying the string given...

svn path=/trunk/; revision=29104

diff --git a/reactos/tools/rbuild/project.cpp b/reactos/tools/rbuild/project.cpp
index 039b4f2..759a1cd 100644 (file)
--- a/reactos/tools/rbuild/project.cpp
+++ b/reactos/tools/rbuild/project.cpp
@@ -196,7 +196,7 @@ Project::LookupProperty ( const string& name ) const
 }
 
 string
-Project::ResolveNextProperty ( string& s ) const
+Project::ResolveNextProperty ( const string& s ) const
 {
        size_t i = s.find ( "${" );
        if ( i == string::npos )
@@ -215,7 +215,7 @@ Project::ResolveNextProperty ( string& s ) const
                        string propertyName = s.substr ( i + 2, propertyNameLength );
                        const Property* property = LookupProperty ( propertyName );
                        if ( property != NULL )
-                               return s.replace ( i, propertyNameLength + 3, property->value );
+                               return string ( s ).replace ( i, propertyNameLength + 3, property->value );
                }
        }
        return s;

diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index 49290cc..222bee8 100644 (file)
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -251,7 +251,7 @@ public:
        const std::string& GetProjectFilename () const;
        std::string ResolveProperties ( const std::string& s ) const;
 private:
-       std::string ResolveNextProperty ( std::string& s ) const;
+       std::string ResolveNextProperty ( const std::string& s ) const;
        const Property* LookupProperty ( const std::string& name ) const;
        void SetConfigurationOption ( char* s,
                                      std::string name,