cvs commit: ALFS/DTD ALFS-3.1.dtd ALFS-CVS.dtd

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Fri Mar 5 10:44:14 PST 2004


kpfleming    04/03/05 11:44:14

  Modified:    DTD      ALFS-3.1.dtd ALFS-CVS.dtd
  Log:
  add XInclude support
  add <packagegroup> to CVS DTD
  
  Revision  Changes    Path
  1.8       +10 -4     ALFS/DTD/ALFS-3.1.dtd
  
  Index: ALFS-3.1.dtd
  ===================================================================
  RCS file: /home/cvsroot/ALFS/DTD/ALFS-3.1.dtd,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ALFS-3.1.dtd	23 Feb 2004 03:25:48 -0000	1.7
  +++ ALFS-3.1.dtd	5 Mar 2004 18:44:14 -0000	1.8
  @@ -4,7 +4,7 @@
          Version : 3.1
          Author:   V. Dzuba
          Updates:  Kevin P. Fleming
  -       Date:     October 27, 2003
  +       Date:     March 5, 2004
   
          The current version of the DTD is available at:
                http://www.linuxfromscratch.org/alfs/downloads/stable
  @@ -23,10 +23,12 @@
   
   <!ENTITY % ops "configure | copy | download | execute | link | make | mkdir | move | ownership | package | patch | permissions | remove | search_replace | stage | textdump | unpack">
   
  -<!ELEMENT alfs           ((%ops;)*)>
  +<!ELEMENT alfs           ((%ops; | include)+)>
   <!ATTLIST alfs
             base           CDATA #IMPLIED
  -          version        CDATA #FIXED "3.1">
  +          version        CDATA #FIXED "3.1"
  +	  xml:base	 CDATA #IMPLIED
  +	  xmlns:xi	 CDATA #IMPLIED>
   
   <!ELEMENT archive        (#PCDATA)>
   
  @@ -68,6 +70,10 @@
   
   <!ELEMENT item           (#PCDATA)>
   
  +<!ELEMENT include        EMPTY>
  +<!ATTLIST include
  +          href           CDATA #REQUIRED>
  +
   <!ELEMENT link           (option?, target+, name)>
   <!ATTLIST link
             base           CDATA #IMPLIED
  @@ -110,7 +116,7 @@
   
   <!ELEMENT param          (#PCDATA)>
   
  -<!ELEMENT patch          ((param | prefix)*)>
  +<!ELEMENT patch          ((param | prefix)+)>
   <!ATTLIST patch
             base           CDATA #IMPLIED>
   
  
  
  
  1.10      +18 -11    ALFS/DTD/ALFS-CVS.dtd
  
  Index: ALFS-CVS.dtd
  ===================================================================
  RCS file: /home/cvsroot/ALFS/DTD/ALFS-CVS.dtd,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ALFS-CVS.dtd	4 Mar 2004 22:01:12 -0000	1.9
  +++ ALFS-CVS.dtd	5 Mar 2004 18:44:14 -0000	1.10
  @@ -4,7 +4,7 @@
          Version : CVS
          Author:   V. Dzuba
          Updates:  Kevin P. Fleming
  -       Date:     February 5, 2004
  +       Date:     March 5, 2004
   
          The current version of the DTD is available at:
                http://www.linuxfromscratch.org/alfs/downloads/stable
  @@ -21,15 +21,17 @@
   <!ENTITY apos   "'"> 
   <!ENTITY quot   """> 
   
  -<!ENTITY % ops "configure | copy | download | execute | if | link | make | mkdir | move | ownership | package | patch | permissions | remove | search_replace | stage | textdump | unpack">
  +<!ENTITY % ops "configure | copy | download | execute | if | link | make | mkdir | move | ownership | patch | permissions | remove | search_replace | stage | textdump | unpack">
   <!ENTITY % tests "test | package-built | package-version | and | or | not">
   
  -<!ELEMENT alfs           ((%ops;)*)>
  +<!ELEMENT alfs           ((%ops; | include | package | packagegroup)+)>
   <!ATTLIST alfs
             base           CDATA #IMPLIED
  -          version        CDATA #FIXED "3.2">
  +          version        CDATA #FIXED "3.2"
  +	  xml:base	 CDATA #IMPLIED
  +	  xmlns:xi	 CDATA #IMPLIED>
   
  -<!ELEMENT and            ((%tests;)*)>
  +<!ELEMENT and            ((%tests;)+)>
   
   <!ELEMENT archive        (#PCDATA)>
   
  @@ -58,7 +60,7 @@
   <!ATTLIST download
             base           CDATA #IMPLIED>
   
  -<!ELEMENT else           (stageinfo?, (alfs | %ops;)*)>
  +<!ELEMENT else           (stageinfo?, (%ops;)*)>
   
   <!ELEMENT execute        (((param | prefix)*) | content)>
   <!ATTLIST execute
  @@ -75,6 +77,10 @@
   
   <!ELEMENT item           (#PCDATA)>
   
  +<!ELEMENT include        EMPTY>
  +<!ATTLIST include
  +          href           CDATA #REQUIRED>
  +
   <!ELEMENT link           (option?, target+, name)>
   <!ATTLIST link
             base           CDATA #IMPLIED
  @@ -102,7 +108,7 @@
   
   <!ELEMENT option         (#PCDATA)>
   
  -<!ELEMENT or             ((%tests;)*)>
  +<!ELEMENT or             ((%tests;)+)>
   
   <!ELEMENT ownership      (option?, name+)>
   <!ATTLIST ownership
  @@ -117,6 +123,8 @@
   
   <!ELEMENT packageinfo    (description?, requires*, utilizes*)>
   
  +<!ELEMENT packagegroup   (package+)>
  +
   <!ELEMENT para           (#PCDATA)>
   
   <!ELEMENT param          (#PCDATA)>
  @@ -140,7 +148,6 @@
   <!ATTLIST remove
             base           CDATA #IMPLIED>
   
  -
   <!ELEMENT replace        (#PCDATA)>
   
   <!ELEMENT requires       (name, version*)>
  @@ -153,7 +160,7 @@
   
   <!ELEMENT shell          (#PCDATA)>
   
  -<!ELEMENT stage          (stageinfo?, (alfs | %ops;)*)>
  +<!ELEMENT stage          (stageinfo?, (%ops;)+)>
   <!ATTLIST stage
             name           CDATA #IMPLIED>
             
  @@ -170,7 +177,7 @@
             base           CDATA #IMPLIED
   	  mode           (append | overwrite) "overwrite">
   
  -<!ELEMENT then           (stageinfo?, (alfs | %ops;)*)>
  +<!ELEMENT then           (stageinfo?, (%ops;)*)>
   
   <!ELEMENT unpack         (digest?, reference*, archive)>
   <!ATTLIST unpack
  @@ -189,4 +196,4 @@
   
   <!ELEMENT version        (#PCDATA)>
   <!ATTLIST version
  -          condition      (eq|ne|gt|ge|lt|le) #REQUIRED>
  +          condition      (eq | ne | gt | ge | lt | le) #REQUIRED>
  
  
  



More information about the alfs-log mailing list