Author: hyperion
Date: Thu Jan 22 05:55:12 2009
New Revision: 39010
URL:
http://svn.reactos.org/svn/reactos?rev=39010&view=rev
Log:
modified tools/rbuild/module.cpp
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
Modified:
trunk/reactos/tools/rbuild/module.cpp
trunk/reactos/tools/rbuild/project.cpp
trunk/reactos/tools/rbuild/project.dtd
trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re…
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Thu Jan 22 05:55:12 2009
@@ -452,6 +452,8 @@
}
if ( att != NULL )
allowWarnings = att->value == "true";
+ else if ( project.allowWarningsSet )
+ allowWarnings = project.allowWarnings;
else
allowWarnings = false;
Modified: trunk/reactos/tools/rbuild/project.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r…
==============================================================================
--- trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/project.cpp [iso-8859-1] Thu Jan 22 05:55:12 2009
@@ -298,6 +298,11 @@
assert(att);
makefile = Environment::GetAutomakeFile ( att->value );
+ att = node->GetAttribute ( "allowwarnings", false );
+ allowWarningsSet = att != NULL;
+ if ( att != NULL )
+ allowWarnings = att->value == "true";
+
size_t i;
for ( i = 0; i < node->subElements.size (); i++ )
{
Modified: trunk/reactos/tools/rbuild/project.dtd
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r…
==============================================================================
--- trunk/reactos/tools/rbuild/project.dtd [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/project.dtd [iso-8859-1] Thu Jan 22 05:55:12 2009
@@ -137,6 +137,7 @@
<!ATTLIST project
name (ReactOS|Project) #REQUIRED
makefile %Text; #REQUIRED
+ allowwarnings (true|false) "false"
xmlns:xi %Text; #FIXED "http://www.w3.org/2001/XInclude"
Modified: trunk/reactos/tools/rbuild/rbuild.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Thu Jan 22 05:55:12 2009
@@ -237,6 +237,8 @@
std::map<std::string, Module*> modules;
IfableData non_if_data;
IfableData host_non_if_data;
+ bool allowWarnings;
+ bool allowWarningsSet;
Project ( const Configuration& configuration,
const std::string& filename,