Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 19:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

modified tools/rbuild/module.cpp

Browse source 
modified   tools/rbuild/project.cpp
modified   tools/rbuild/project.dtd
modified   tools/rbuild/rbuild.h
   New per-project property allowwarnings overrides allowwarnings property of all modules in the project

svn path=/trunk/; revision=39010
This commit is contained in:
KJK::Hyperion 2009-01-22 11:55:12 +00:00
parent 06794682ef
commit ccb753842f
4 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -452,6 +452,8 @@ Module::Module ( const Project& project,
} }
if ( att != NULL ) if ( att != NULL )
allowWarnings = att->value == "true"; allowWarnings = att->value == "true";
else if ( project.allowWarningsSet )
allowWarnings = project.allowWarnings;
else else
allowWarnings = false; allowWarnings = false;

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

@ -298,6 +298,11 @@ Project::ProcessXML ( const string& path )
assert(att); assert(att);
makefile = Environment::GetAutomakeFile ( att->value ); makefile = Environment::GetAutomakeFile ( att->value );
att = node->GetAttribute ( "allowwarnings", false );
allowWarningsSet = att != NULL;
if ( att != NULL )
allowWarnings = att->value == "true";
size_t i; size_t i;
for ( i = 0; i < node->subElements.size (); i++ ) for ( i = 0; i < node->subElements.size (); i++ )
{ {

1
reactos/tools/rbuild/project.dtd
View file

@ -137,6 +137,7 @@
<!ATTLIST project <!ATTLIST project
name (ReactOS|Project) #REQUIRED name (ReactOS|Project) #REQUIRED
makefile %Text; #REQUIRED makefile %Text; #REQUIRED
allowwarnings (true|false) "false"
xmlns:xi %Text; #FIXED "http://www.w3.org/2001/XInclude" xmlns:xi %Text; #FIXED "http://www.w3.org/2001/XInclude"
> >

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

@ -237,6 +237,8 @@ public:
std::map<std::string, Module*> modules; std::map<std::string, Module*> modules;
IfableData non_if_data; IfableData non_if_data;
IfableData host_non_if_data; IfableData host_non_if_data;
bool allowWarnings;
bool allowWarningsSet;
Project ( const Configuration& configuration, Project ( const Configuration& configuration,
const std::string& filename, const std::string& filename,