From 012a975320aaef76bf0f0be6d8fd71a4adbe8471 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 26 Sep 2010 18:10:19 +0000
Subject: [PATCH] cleanup and standardize
---
.../jsdt.site/templateFiles/index.html.template.php | 7 +++----
.../patches32x.site/templateFiles/index.html.template.php | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
index d0963d0ce..3ee9fd210 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
@@ -524,7 +524,7 @@ else {
<?php
- $shortname="jsdt";
+ $shortname="$build_distribution";
$zipfilename=$bellwether_name."/".$shortname."-buildrepo-".$build;
displayp2repoarchives($zipfilename, $downloadprefix, $shortname , "Minimal", "Executable code");
$zipfilename=$bellwether_name."/".$shortname."_sdk-buildrepo-".$build;
@@ -552,15 +552,14 @@ else {
<tr>
<td align="left" valign="top" colspan="5"><?php
- $zipbellwether_name="${build_distribution}-sdk-${build}.zip";
+ $zipbellwether_name="${build_distribution}-${build}.zip";
if (file_exists($zipbellwether_name)) {
// if-then-include section
// include this whole section if (and only if) the bellwether file exists.
// For example, may not have been created yet
?>
- <p>The Zip files includes the features and plugins for the JavaScript
- Development Tools (JSDT).</p>
+ <p>The Zip files includes the features and plugins for this build.</p>
<p>Note: These traditional zip files should be considered deprecated,
in favor of installing the archived P2 repositories. The tradtional
zip files may eventually no longer be provided.</p>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
index d0963d0ce..3ee9fd210 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
@@ -524,7 +524,7 @@ else {
<?php
- $shortname="jsdt";
+ $shortname="$build_distribution";
$zipfilename=$bellwether_name."/".$shortname."-buildrepo-".$build;
displayp2repoarchives($zipfilename, $downloadprefix, $shortname , "Minimal", "Executable code");
$zipfilename=$bellwether_name."/".$shortname."_sdk-buildrepo-".$build;
@@ -552,15 +552,14 @@ else {
<tr>
<td align="left" valign="top" colspan="5"><?php
- $zipbellwether_name="${build_distribution}-sdk-${build}.zip";
+ $zipbellwether_name="${build_distribution}-${build}.zip";
if (file_exists($zipbellwether_name)) {
// if-then-include section
// include this whole section if (and only if) the bellwether file exists.
// For example, may not have been created yet
?>
- <p>The Zip files includes the features and plugins for the JavaScript
- Development Tools (JSDT).</p>
+ <p>The Zip files includes the features and plugins for this build.</p>
<p>Note: These traditional zip files should be considered deprecated,
in favor of installing the archived P2 repositories. The tradtional
zip files may eventually no longer be provided.</p>
--
GitLab