From ffca799fe06a90859f1c9a165480f22b2dfde030 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 26 Sep 2010 21:41:57 +0000
Subject: [PATCH] cleanup and standardize
---
.../wtp.site/staticDropFiles/buildNotes.php | 9 +-
.../wtp.site/templateFiles/buildvariables.php | 2 +
.../templateFiles/compileResults.php.template | 152 +++++++++---------
.../testCompileResults.php.template | 152 +++++++++---------
4 files changed, 159 insertions(+), 156 deletions(-)
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
index 86cd222e9..d069f9494 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
@@ -28,15 +28,16 @@ $hasNotes = false;
$aDirectory = dir("buildnotes");
while ($anEntry = $aDirectory->read()) {
if ($anEntry != "." && $anEntry != "..") {
- $parts = explode("_", $anEntry);
- $baseName = $parts[1];
- $parts = explode(".", $baseName);
- $component = $parts[0];
+ $nameprefixlen=strlen("buildnotes_");
+ $baseName = substr($anEntry,$nameprefixlen);
+ $extpos=strrpos($baseName,".html");
+ $component=substr($baseName,0,$extpos);
$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
echo "<tr>";
echo "$line";
echo "</tr>";
$hasNotes = true;
+
}
}
$aDirectory.closedir();
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
index 036223283..bd2a02b87 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
@@ -9,6 +9,8 @@ include_once("miscUtil.php");
$build_distribution="@build_distribution@";
+$displayBuildNotes=false;
+
$buildBranch="@buildBranch@";
$build="@build@";
$type="@type@";
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template
index f7857717a..c854e2b19 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/compileResults.php.template
@@ -1,76 +1,76 @@
-<html>
-<head>
-
-<?php
- $parts = explode("/", getcwd());
- $parts2 = explode("-", $parts[count($parts) - 1]);
- $buildName = $parts2[1];
-
- echo "<title>Compile Logs: Code Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2%;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
- echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
- <tr>
- <td class="bold" align="center">Compile Logs</td>
- <td class="bold" align="center">Compile Errors</td>
- <td class="bold" align="center">Compiler Warnings</td>
- <td class="bold" align="center">Access Violations</td>
- <td class="bold" align="center">Access Warnings</td>
- </tr>
-
- %compilelogs%
-
-</table>
-
-</body>
-</html>
+<html>
+<head>
+
+<?php
+ $parts = explode("/", getcwd());
+ $parts2 = explode("-", $parts[count($parts) - 1]);
+ $buildName = $parts2[1];
+
+ echo "<title>Compile Logs: Code Bundles for $buildName</title>";
+?>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+<style>
+.bold, .bold TD, .bold TH, .bold TR
+{
+font-weight:bold;
+}
+.numeric, .numeric TD
+{
+text-align:right;
+padding-right:2%;
+}
+.normaltable, .normaltable TD, .normaltable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:White;
+}
+.errorltable, .errortable TD, .errortable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Red;
+font-weight:bold;
+}
+.warningtable, .warningtable TD, .warningtable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:khaki;
+}
+.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Yellow;
+}
+</style>
+</head>
+<body>
+
+<?php
+ echo "<h1>Compile Logs: Code Bundles for $buildName</h1>";
+?>
+
+
+<table id=tabledata align = "center" width="75%" border="1">
+ <tr>
+ <td class="bold" align="center">Compile Logs</td>
+ <td class="bold" align="center">Compile Errors</td>
+ <td class="bold" align="center">Compiler Warnings</td>
+ <td class="bold" align="center">Access Violations</td>
+ <td class="bold" align="center">Access Warnings</td>
+ </tr>
+
+ %compilelogs%
+
+</table>
+
+</body>
+</html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
index 42d6f6544..48c50857f 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
@@ -1,76 +1,76 @@
-<html>
-<head>
-
-<?php
- $parts = explode("/", getcwd());
- $parts2 = explode("-", $parts[count($parts) - 1]);
- $buildName = $parts2[1];
-
- echo "<title>Compile Logs: Test Bundles for $buildName</title>";
-?>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-.bold, .bold TD, .bold TH, .bold TR
-{
-font-weight:bold;
-}
-.numeric, .numeric TD
-{
-text-align:right;
-padding-right:2em;
-}
-.normaltable, .normaltable TD, .normaltable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:White;
-}
-.errorltable, .errortable TD, .errortable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Red;
-font-weight:Bold;
-}
-.warningtable, .warningtable TD, .warningtable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:khaki;
-}
-.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
-{
-font-family:Bitstream Vera Sans Mono, monospace;
-font-size:0.9em;
-color:Black;
-background-color:Yellow;
-}
-</style>
-</head>
-<body>
-
-<?php
- echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
-?>
-
-
-<table id=tabledata align = "center" width="75%" border="1">
- <tr>
- <td class="bold" align="center">Compile Logs</td>
- <td class="bold" align="center">Compile Errors</td>
- <td class="bold" align="center">Compiler Warnings</td>
- <td class="bold" align="center">Access Violations</td>
- <td class="bold" align="center">Access Warnings</td>
- </tr>
-
- %compilelogs%
-
-</table>
-
-</body>
-</html>
+<html>
+<head>
+
+<?php
+ $parts = explode("/", getcwd());
+ $parts2 = explode("-", $parts[count($parts) - 1]);
+ $buildName = $parts2[1];
+
+ echo "<title>Compile Logs: Test Bundles for $buildName</title>";
+?>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+<style>
+.bold, .bold TD, .bold TH, .bold TR
+{
+font-weight:bold;
+}
+.numeric, .numeric TD
+{
+text-align:right;
+padding-right:2em;
+}
+.normaltable, .normaltable TD, .normaltable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:White;
+}
+.errorltable, .errortable TD, .errortable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Red;
+font-weight:Bold;
+}
+.warningtable, .warningtable TD, .warningtable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:khaki;
+}
+.extraWarningTable, .extraWarningTable TD, .extraWarningTable TH
+{
+font-family:Bitstream Vera Sans Mono, monospace;
+font-size:0.9em;
+color:Black;
+background-color:Yellow;
+}
+</style>
+</head>
+<body>
+
+<?php
+ echo "<h1>Compile Logs: Test Bundles for $buildName</h1>";
+?>
+
+
+<table id=tabledata align = "center" width="75%" border="1">
+ <tr>
+ <td class="bold" align="center">Compile Logs</td>
+ <td class="bold" align="center">Compile Errors</td>
+ <td class="bold" align="center">Compiler Warnings</td>
+ <td class="bold" align="center">Access Violations</td>
+ <td class="bold" align="center">Access Warnings</td>
+ </tr>
+
+ %compilelogs%
+
+</table>
+
+</body>
+</html>
--
GitLab