[llvm-commits] [zorg] r125880 - in /zorg/trunk/llvmlab/llvmlab/ui: ci/views.py templates/dashboard.html

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 18 10:41:41 2011
New Revision: 125880

URL: http://llvm.org/viewvc/llvm-project?rev=125880&view=rev
Log:
llvmlab: Continue sketching published builds part of hard-coded instance of the
Config object (with dashboard support).

Modified:
    zorg/trunk/llvmlab/llvmlab/ui/ci/views.py
    zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html

Modified: zorg/trunk/llvmlab/llvmlab/ui/ci/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/ci/views.py?rev=125880&r1=125879&r2=125880&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/ci/views.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/ci/views.py Fri Feb 18 10:41:41 2011
@@ -22,7 +22,22 @@
     config.Phase("Tree Health", 3, []),
     config.Phase("Validation", 4, [])]
 builders = []
-published_builds = []
+published_builds = [
+    config.PublishedBuild("LLVM", "Linux", "i386", "llvm-linux-i386.tgz"),
+    config.PublishedBuild("LLVM", "Mac OS X (SnowLeopard)", "x86_64",
+                          "llvm-darwin10-x86_64.tgz"),
+
+    config.PublishedBuild("Clang", "Linux", "i386", "clang-linux-i386.tgz"),
+    config.PublishedBuild("Clang", "Linux", "x86_64", "clang-linux-x86_64.tgz"),
+    config.PublishedBuild("Clang", "Mac OS X (SnowLeopard)", "x86_64",
+                          "clang-darwin10-x86_64.tgz"),
+    config.PublishedBuild("Clang", "Windows", "i386", "clang-windows-i386.tgz"),
+
+    config.PublishedBuild("llvm-gcc-4.2", "Linux", "i386",
+                          "llvm-gcc-4.2-linux-i386.tgz"),
+    config.PublishedBuild("llvm-gcc-4.2", "Linux", "x86_64",
+                          "llvm-gcc-4.2-linux-x86_64.tgz"),
+    ]
 g_config = config.Config(phases, builders, published_builds)
 
 @ci.route('/')

Modified: zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html?rev=125880&r1=125879&r2=125880&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/templates/dashboard.html Fri Feb 18 10:41:41 2011
@@ -104,44 +104,16 @@
       <th width="80%" align="left">Archive</th>
     </tr>
   </thead>
+  
+  {% for build in ci_config.published_builds %}
   <tr>
-    <td rowspan="2">LLVM</td>
-    <td>Linux</td>
-    <td>i386</td>
-    <td>llvm-linux-i386.tgz</td>
-  </tr>
-  <tr>
-    <td>Mac OS X (SnowLeopard)</td>
-    <td>x86_64</td>
-    <td>llvm-darwin10-x86_64.tgz</td>
-  </tr>
-  <tr>
-    <td rowspan="3">Clang</td>
-    <td>Linux</td>
-    <td>i386</td>
-    <td>clang-linux-i386.tgz</td>
-  </tr>
-  <tr>
-    <td>Mac OS X (SnowLeopard)</td>
-    <td>x86_64</td>
-    <td>clang-darwin10-x86_64.tgz</td>
-  </tr>
-  <tr>
-    <td>Windows</td>
-    <td>i386</td>
-    <td>clang-windows-i386.tgz</td>
-  </tr>
-  <tr>
-    <td rowspan="2">llvm-gcc 4.2</td>
-    <td>Linux</td>
-    <td>i386</td>
-    <td>llvm-gcc-4.2-linux-i386.tgz</td>
-  </tr>
-  <tr>
-    <td>Linux</td>
-    <td>x86_64</td>
-    <td>llvm-gcc-4.2-linux-x86_64.tgz</td>
+    <td>{{ build.product }}</td>
+    <td>{{ build.os }}</td>
+    <td>{{ build.arch }}</td>
+    <td><a href="/archives/{{ build.archive_name }}">{{
+        build.archive_name }}</a></td>
   </tr>
+  {% endfor %}
 </table>
 
 <h1>Example Phase Popups</h1>