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>

svn path=/trunk/; revision=18759
This commit is contained in:
Royce Mitchell III 2005-10-24 20:00:48 +00:00
parent b995bcf1bd
commit 450d4c43e7

View file

@ -15,13 +15,13 @@
<!-- rbuild project DTD --> <!-- rbuild project DTD -->
<!ELEMENT bootstrap ANY> <!ELEMENT bootstrap EMPTY>
<!ATTLIST bootstrap <!ATTLIST bootstrap
base %Text; #IMPLIED base %Text; #IMPLIED
nameoncd %Text; #IMPLIED nameoncd %Text; #IMPLIED
> >
<!ELEMENT cdfile ANY> <!ELEMENT cdfile (#PCDATA)>
<!ATTLIST cdfile <!ATTLIST cdfile
base %Text; #IMPLIED base %Text; #IMPLIED
nameoncd %Text; #IMPLIED nameoncd %Text; #IMPLIED
@ -45,7 +45,7 @@
first (true|false) "false" 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*)+> <!ELEMENT if (compilerflag*|define*|directory*|file*|if*|group*|property*)+>
<!ATTLIST if <!ATTLIST if
@ -63,11 +63,16 @@
definition %Text; #REQUIRED definition %Text; #REQUIRED
> >
<!ELEMENT library ANY> <!ELEMENT library (#PCDATA)>
<!ELEMENT linkerflag ANY> <!ELEMENT linkerflag (#PCDATA)>
<!ELEMENT module (bootstrap*|importlibrary*|define*|include*|library*|directory*|file*|linkerflag*)*> <!ELEMENT linkerscript (#PCDATA)>
<!ATTLIST linkerscript
base %Text; #IMPLIED
>
<!ELEMENT module (bootstrap*|importlibrary*|define*|include*|library*|directory*|file*|linkerflag*|linkerscript?)*>
<!ATTLIST module <!ATTLIST module
if %Text; #IMPLIED if %Text; #IMPLIED
ifnot %Text; #IMPLIED ifnot %Text; #IMPLIED