added <linkerscript> and corrected some mistakes to the best of my understanding can't figure out (based on current definition) how to define <module> as allowing only a single <linkerscript>, but allowing it anywhere within the sub-elements of <module> Modified: trunk/reactos/tools/rbuild/project.dtd _____
Modified: trunk/reactos/tools/rbuild/project.dtd --- trunk/reactos/tools/rbuild/project.dtd 2005-10-24 19:38:58 UTC (rev 18758) +++ trunk/reactos/tools/rbuild/project.dtd 2005-10-24 20:00:48 UTC (rev 18759) @@ -15,13 +15,13 @@
<!-- rbuild project DTD -->
-<!ELEMENT bootstrap ANY> +<!ELEMENT bootstrap EMPTY> <!ATTLIST bootstrap base %Text; #IMPLIED nameoncd %Text; #IMPLIED
-<!ELEMENT cdfile ANY> +<!ELEMENT cdfile (#PCDATA)> <!ATTLIST cdfile base %Text; #IMPLIED nameoncd %Text; #IMPLIED @@ -45,7 +45,7 @@ first (true|false) "false"
-<!ELEMENT group (cdfile+|directory+|file+|property+)+> +<!ELEMENT group (cdfile*|directory*|file*|property*)+>
<!ELEMENT if (compilerflag*|define*|directory*|file*|if*|group*|property*)+> <!ATTLIST if @@ -63,11 +63,16 @@ definition %Text; #REQUIRED
-<!ELEMENT library ANY> +<!ELEMENT library (#PCDATA)>
-<!ELEMENT linkerflag ANY> +<!ELEMENT linkerflag (#PCDATA)>
-<!ELEMENT module (bootstrap*|importlibrary*|define*|include*|library*|directory*|file*|li nkerflag*)*> +<!ELEMENT linkerscript (#PCDATA)> +<!ATTLIST linkerscript + base %Text; #IMPLIED +> + +<!ELEMENT module (bootstrap*|importlibrary*|define*|include*|library*|directory*|file*|li nkerflag*|linkerscript?)*> <!ATTLIST module if %Text; #IMPLIED ifnot %Text; #IMPLIED