[Nix-commits] SVN commit: nix - r25293 - in disnix/disnix/trunk: data tests/manifest

[Sander van der Burg]

Author: sandervanderburg
Date: Mon Dec 27 15:48:58 2010
New Revision: 25293
URL: https://svn.nixos.org/websvn/nix/?rev=25293&sc=1

Log:
Implemented support for lists defined in the infrastructure model

Modified:
   disnix/disnix/trunk/data/generatemanifest.xsl
   disnix/disnix/trunk/data/infrastructure.xsl
   disnix/disnix/trunk/tests/manifest/infrastructure-single.nix
   disnix/disnix/trunk/tests/manifest/infrastructure.nix

Modified: disnix/disnix/trunk/data/generatemanifest.xsl
==============================================================================
--- disnix/disnix/trunk/data/generatemanifest.xsl       Mon Dec 27 12:15:09 
2010        (r25292)
+++ disnix/disnix/trunk/data/generatemanifest.xsl       Mon Dec 27 15:48:58 
2010        (r25293)
@@ -20,7 +20,12 @@
                  <service><xsl:value-of 
select="at...@name='service']/string/@value" /></service>
                  <target>
                    <xsl:for-each select="at...@name='target']/attrs/attr">
-                     <xsl:element name="{...@name}"><xsl:value-of 
select="*/@value" /></xsl:element>
+                     <xsl:element name="{...@name}">
+                       <xsl:value-of select="*/@value" />
+                       <xsl:for-each select="list/*">
+                         <xsl:value-of select="@value" 
/><xsl:text>&#x20;</xsl:text>
+                       </xsl:for-each>
+                     </xsl:element>
                    </xsl:for-each>
                  </target>
                </dependency>
@@ -29,7 +34,12 @@
            <service><xsl:value-of select="at...@name='service']/string/@value" 
/></service>
            <target>
              <xsl:for-each select="at...@name='target']/attrs/attr">
-               <xsl:element name="{...@name}"><xsl:value-of select="*/@value" 
/></xsl:element>
+               <xsl:element name="{...@name}">
+                 <xsl:value-of select="*/@value" />
+                 <xsl:for-each select="list/*">
+                   <xsl:value-of select="@value" /><xsl:text>&#x20;</xsl:text>
+                 </xsl:for-each>
+               </xsl:element>
              </xsl:for-each>
            </target>
            <targetProperty><xsl:value-of 
select="at...@name='targetProperty']/string/@value" /></targetProperty>

Modified: disnix/disnix/trunk/data/infrastructure.xsl
==============================================================================
--- disnix/disnix/trunk/data/infrastructure.xsl Mon Dec 27 12:15:09 2010        
(r25292)
+++ disnix/disnix/trunk/data/infrastructure.xsl Mon Dec 27 15:48:58 2010        
(r25293)
@@ -6,7 +6,12 @@
       <xsl:for-each select="attr">
         <target name="{...@name}">
          <xsl:for-each select="attrs/attr">
-           <xsl:element name="{...@name}"><xsl:value-of select="*/@value" 
/></xsl:element>
+           <xsl:element name="{...@name}">
+             <xsl:value-of select="*/@value" />
+             <xsl:for-each select="list/*">
+               <xsl:value-of select="@value" /><xsl:text>&#x20;</xsl:text>
+             </xsl:for-each>
+           </xsl:element>  
          </xsl:for-each>
        </target>
       </xsl:for-each>

Modified: disnix/disnix/trunk/tests/manifest/infrastructure-single.nix
==============================================================================
--- disnix/disnix/trunk/tests/manifest/infrastructure-single.nix        Mon Dec 
27 12:15:09 2010        (r25292)
+++ disnix/disnix/trunk/tests/manifest/infrastructure-single.nix        Mon Dec 
27 15:48:58 2010        (r25293)
@@ -1,5 +1,6 @@
 {
   testtarget1 = {
     hostname = "testtarget1";
+    supportedTypes = [ "echo" "process" "wrapper" ];
   };  
 }

Modified: disnix/disnix/trunk/tests/manifest/infrastructure.nix
==============================================================================
--- disnix/disnix/trunk/tests/manifest/infrastructure.nix       Mon Dec 27 
12:15:09 2010        (r25292)
+++ disnix/disnix/trunk/tests/manifest/infrastructure.nix       Mon Dec 27 
15:48:58 2010        (r25293)
@@ -1,9 +1,11 @@
 {
   testtarget1 = {
     hostname = "testtarget1";
+    supportedTypes = [ "echo" "process" "wrapper" ];
   };
   
   testtarget2 = {
     hostname = "testtarget2";
+    supportedTypes = [ "echo" "process" "wrapper" ];
   };
 }
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits