move to improved p2 functions
diff --git a/releng.wtpbuilder/distribution/patches312.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/patches312.site/staticDropFiles/miscUtil.php
index 6baf717..b1a4a4c 100644
--- a/releng.wtpbuilder/distribution/patches312.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/patches312.site/staticDropFiles/miscUtil.php
@@ -35,7 +35,7 @@
function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
- echo "<td align=\"right\" valign=\"top\" width=\"40%\">";
+ echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
echo $zipfilesize;
@@ -46,7 +46,7 @@
}
function displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
- echo "<td align=\"right\" valign=\"top\" width=\"40%\">";
+ echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
echo $zipfilesize;
diff --git a/releng.wtpbuilder/distribution/patches312.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches312.site/templateFiles/index.html.template.php
index 3c3b7f6..32eab13 100644
--- a/releng.wtpbuilder/distribution/patches312.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/patches312.site/templateFiles/index.html.template.php
@@ -556,9 +556,7 @@
<tr>
<td align="left" valign="top" width="20%"><b>Patch, zipped repository</b></td>
<td align="left" valign="top">
- <p>Remember, care is needed in using patches from this page. These
- patches are specific to particular use-cases or adopters and not
- well tested for general cases.</p>
+ Remember, care is needed in using patches from this page. These patches are specific to particular use-cases or adopters and not well tested for general cases.
</td>
<?php
$zipfilename="wtp-patches312-buildrepo-@build@";
@@ -571,7 +569,7 @@
<tr>
<td align="left" valign="top" width="20%"><b>Patched Tests, zipped repository</b></td>
<td align="left" valign="top">
- <p>Some unit tests may be added or adjusted for patches.</p>
+ Some unit tests may be added or adjusted for patches.
</td>
<?php
$zipfilename="wtp-patches312-tests-buildrepo-@build@";
@@ -589,7 +587,7 @@
<tr>
<td align="left" valign="top" width="20%"><b>Patch</b></td>
<td align="left" valign="top">
- <p>Traditional zip format</p>
+ Traditional zip format
</td>
<?php
$zipfilename="wtp-patches312-@build@";
@@ -602,7 +600,7 @@
<tr>
<td align="left" valign="top" width="20%"><b>Patched Tests</b></td>
<td align="left" valign="top">
- <p>Traditional zip format</p>
+ Traditional zip format
</td>
<?php
$zipfilename="wtp-patches312-tests-@build@";
diff --git a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
index f439486..409711c 100644
--- a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
@@ -99,6 +99,8 @@
<updatePackProperties
archiveFilename="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"/>
+ <!-- comment out when debugging, for original zip files, before updatePackProperties ran -->
+ <delete file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip.bak"/>
<!--
==================================================================================