davidlt
/
fedora-comps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comps.dtd, comps.rng: add environment and optionlist

This commit is contained in:
Jens Petersen 2014-02-17 10:45:31 +09:00
parent b4dc095e92
commit b23ae47a1f
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
comps.dtd
View File

@ -1,11 +1,14 @@
<?xml encoding="UTF-8"?> <?xml encoding="UTF-8"?>
<!ELEMENT comps (group+,category+)> <!ELEMENT comps (group+,environment+,category+,langpacks?)>
<!ATTLIST comps xmlns CDATA #FIXED ''> <!ATTLIST comps xmlns CDATA #FIXED ''>
<!ELEMENT group (id,name,description,default,uservisible,langonly?, packagelist)> <!ELEMENT group (id,name,description,default,uservisible,langonly?, packagelist)>
<!ATTLIST group xmlns CDATA #FIXED ''> <!ATTLIST group xmlns CDATA #FIXED ''>
<!ELEMENT environment (id,name,description,display_order?,grouplist,optionlist)>
<!ATTLIST environment xmlns CDATA #FIXED ''>
<!ELEMENT category (id,name,description,display_order?,grouplist)> <!ELEMENT category (id,name,description,display_order?,grouplist)>
<!ATTLIST category xmlns CDATA #FIXED ''> <!ATTLIST category xmlns CDATA #FIXED ''>
@ -41,3 +44,6 @@
<!ELEMENT description (#PCDATA)> <!ELEMENT description (#PCDATA)>
<!ATTLIST description xmlns CDATA #FIXED ''> <!ATTLIST description xmlns CDATA #FIXED ''>
<!ELEMENT optionlist (groupid)+>
<!ATTLIST optionlist xmlns CDATA #FIXED ''>

26
comps.rng
View File

@ -20,6 +20,9 @@
<oneOrMore> <oneOrMore>
<ref name="group"/> <ref name="group"/>
</oneOrMore> </oneOrMore>
<zeroOrMore>
<ref name="environment"/>
</zeroOrMore>
<zeroOrMore> <zeroOrMore>
<ref name="category"/> <ref name="category"/>
</zeroOrMore> </zeroOrMore>
@ -120,6 +123,22 @@
<ref name="packagename"/> <ref name="packagename"/>
</element> </element>
</define> </define>
<define name="environment">
<element name="environment">
<interleave>
<ref name="id"/>
<optional>
<element name="display_order">
<ref name="positiveInteger"/>
</element>
</optional>
<ref name="grouplist"/>
<optional>
<ref name="optionlist"/>
</optional>
</interleave>
</element>
</define>
<define name="category"> <define name="category">
<element name="category"> <element name="category">
<interleave> <interleave>
@ -140,6 +159,13 @@
</oneOrMore> </oneOrMore>
</element> </element>
</define> </define>
<define name="optionlist">
<element name="optionlist">
<oneOrMore>
<ref name="groupid"/>
</oneOrMore>
</element>
</define>
<define name="groupid"> <define name="groupid">
<element name="groupid"> <element name="groupid">
<ref name="string"/> <ref name="string"/>