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

Take care of ROS_AUTOMAKE variable in rbuild

Browse source 
svn path=/trunk/; revision=26241
This commit is contained in:
Hervé Poussineau 2007-04-01 20:47:00 +00:00
parent f32c6a7cd9
commit 4b824a0114
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/tools/rbuild/backend/mingw/mingw.cpp
View file

@ -267,7 +267,8 @@ MingwBackend::CloseMakefile () const
void void
MingwBackend::GenerateHeader () const MingwBackend::GenerateHeader () const
{ {
fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT 'ReactOS.rbuild' INSTEAD\n\n" ); fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT '%s' INSTEAD\n\n",
ProjectNode.GetProjectFilename ().c_str () );
} }
string string

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

@ -80,6 +80,13 @@ Environment::GetCdOutputPath ()
"reactos" ); "reactos" );
} }
/* static */ string
Environment::GetAutomakeFile ( const std::string& defaultFile )
{
return GetEnvironmentVariablePathOrDefault ( "ROS_AUTOMAKE",
defaultFile );
}
ParseContext::ParseContext () ParseContext::ParseContext ()
: ifData (NULL), : ifData (NULL),
compilationUnit (NULL) compilationUnit (NULL)
@ -284,7 +291,7 @@ Project::ProcessXML ( const string& path )
att = node->GetAttribute ( "makefile", true ); att = node->GetAttribute ( "makefile", true );
assert(att); assert(att);
makefile = att->value; makefile = Environment::GetAutomakeFile ( att->value );
size_t i; size_t i;
for ( i = 0; i < node->subElements.size (); i++ ) for ( i = 0; i < node->subElements.size (); i++ )
@ -465,7 +472,7 @@ Project::LocateModule ( const string& name ) const
return NULL; return NULL;
} }
std::string const std::string&
Project::GetProjectFilename () const Project::GetProjectFilename () const
{ {
return xmlfile; return xmlfile;

3
reactos/tools/rbuild/rbuild.h
View file

@ -157,6 +157,7 @@ public:
static std::string GetOutputPath (); static std::string GetOutputPath ();
static std::string GetCdOutputPath (); static std::string GetCdOutputPath ();
static std::string GetInstallPath (); static std::string GetInstallPath ();
static std::string GetAutomakeFile ( const std::string& defaultFile );
static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name,
const std::string& defaultValue ); const std::string& defaultValue );
}; };
@ -224,7 +225,7 @@ public:
void ProcessXML ( const std::string& path ); void ProcessXML ( const std::string& path );
Module* LocateModule ( const std::string& name ); Module* LocateModule ( const std::string& name );
const Module* LocateModule ( const std::string& name ) const; const Module* LocateModule ( const std::string& name ) const;
std::string GetProjectFilename () const; const std::string& GetProjectFilename () const;
std::string ResolveProperties ( const std::string& s ) const; std::string ResolveProperties ( const std::string& s ) const;
private: private:
std::string ResolveNextProperty ( std::string& s ) const; std::string ResolveNextProperty ( std::string& s ) const;