attribute 'first' of <file> must be 'true' or 'false'

remove an obsolete comment

svn path=/branches/xmlbuildsystem/; revision=13191

diff --git a/reactos/ntoskrnl/ntoskrnl.xml b/reactos/ntoskrnl/ntoskrnl.xml
index 01ad2d0..ad52e3b 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.xml
+++ b/reactos/ntoskrnl/ntoskrnl.xml
@@ -29,7 +29,7 @@
        <directory name="ke">\r
                <if property="ARCH" value="i386">\r
                        <directory name="i386">\r
-                               <file first="1">multiboot.S</file>\r
+                               <file first="true">multiboot.S</file>\r
                                <file>bios.c</file>\r
                                <file>brkpoint.c</file>\r
                                <file>bthread.S</file>\r

diff --git a/reactos/tools/rbuild/XML.cpp b/reactos/tools/rbuild/XML.cpp
index 0ffedd0..e95ecff 100644 (file)
--- a/reactos/tools/rbuild/XML.cpp
+++ b/reactos/tools/rbuild/XML.cpp
@@ -628,7 +628,6 @@ XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& p
 XMLElement*\r
 XMLLoadInclude ( XMLElement* e, const Path& path, XMLIncludes& includes )\r
 {\r
-       // TODO FIXME\r
        XMLAttribute* att;\r
        att = e->GetAttribute("href",true);\r
        assert(att);\r

diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index e30dbc2..301180c 100644 (file)
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -111,9 +111,18 @@ Module::ProcessXMLSubElement ( const XMLElement& e,
        string subpath ( path );\r
        if ( e.name == "file" && e.value.size () > 0 )\r
        {\r
+               bool first = false;\r
                const XMLAttribute* att = e.GetAttribute ( "first", false );\r
-               File* pFile = new File ( FixSeparator ( path + CSEP + e.value ),\r
-                                        att && atoi(att->value.c_str()) != 0 );\r
+               if ( att )\r
+               {\r
+                       if ( !stricmp ( att->value.c_str(), "true" ) )\r
+                               first = true;\r
+                       else if ( stricmp ( att->value.c_str(), "false" ) )\r
+                               throw InvalidBuildFileException (\r
+                                       e.location,\r
+                                       "attribute 'first' of <file> element can only be 'true' or 'false'" );\r
+               }\r
+               File* pFile = new File ( FixSeparator ( path + CSEP + e.value ), first );\r
                if ( pIf )\r
                        pIf->files.push_back ( pFile );\r
                else\r