DevHeads.net

com web/windows: Add devel and test packages to latest: docroot/listing.php include/listing.php

Link: <a href="http://git.php.net/?p=web/windows.git;a=commitdiff;h=a2dec91311a00fa5fb7f1d78903807e96b6930d3" title="http://git.php.net/?p=web/windows.git;a=commitdiff;h=a2dec91311a00fa5fb7f1d78903807e96b6930d3">http://git.php.net/?p=web/windows.git;a=commitdiff;h=a2dec91311a00fa5fb7...</a>

Log:
Add devel and test packages to latest

Changed paths:
M docroot/listing.php
M include/listing.php

Diff:
diff --git a/docroot/listing.php b/docroot/listing.php
index 554b033..b794c1e 100644
--- a/docroot/listing.php
+++ b/docroot/listing.php
@@ -179,6 +179,14 @@ if (isset($versions[$major]['test_pack'])) {
<span class="md5sum">sha256: <?php echo $versions[$major][$minor]['debug_pack']['sha256']; ?></span>
</li>
<?php } ?>
+<?php if (isset($versions[$major][$minor]['devel_pack'])) { ?>
+ <li>
+ <a href="<?php echo $baseurl . $versions[$major][$minor]['devel_pack']['path']; ?>">Debug Pack</a>
+ [<?php echo $versions[$major][$minor]['devel_pack']['size']; ?>]<br />
+<!-- <span class="md5sum">sha1: <?php echo $versions[$major][$minor]['devel_pack']['sha1']; ?></span><br/ > -->
+ <span class="md5sum">sha256: <?php echo $versions[$major][$minor]['devel_pack']['sha256']; ?></span>
+ </li>
+<?php } ?>
</ul>
<?php
if ($mode == 'snapshots') {
diff --git a/include/listing.php b/include/listing.php
index 7d64f4f..e7c4948 100644
--- a/include/listing.php
+++ b/include/listing.php
@@ -148,7 +148,9 @@ function generate_listing($path, $nmode) {
$buildconf = 'buildconf-'. $elms['version_short'] . '-' . $elms['vc'] . '-' . $elms['arch'] . '-' . ($elms['nts'] ? $elms['nts'] . '-' : '') . $snap_time_suffix . '.log';
} else {
$debug_pack = 'php-debug-pack-' . $elms['version'] . ($elms['nts'] ? '-' . $elms['nts'] : '') . '-Win32-' . $elms['vc'] . '-' . $elms['arch'] . ($elms['ts'] ? '-' . $elms['ts'] : '') . '.zip';
+ $devel_pack = 'php-devel-pack-' . $elms['version'] . ($elms['nts'] ? '-' . $elms['nts'] : '') . '-Win32-' . $elms['vc'] . '-' . $elms['arch'] . ($elms['ts'] ? '-' . $elms['ts'] : '') . '.zip';
$installer = 'php-' . $elms['version'] . ($elms['nts'] ? '-' . $elms['nts'] : '') . '-Win32-' . $elms['vc'] . '-' . $elms['arch'] . ($elms['ts'] ? '-' . $elms['ts'] : '') . '.msi';
+ $testpack = 'php-test-pack-' . $elms['version'] . '.zip';
$source = 'php-' . $elms['version'] . '-src.zip';
}
if (file_exists($source)) {
@@ -165,6 +167,14 @@ function generate_listing($path, $nmode) {
'sha256' => $sha256sums[strtolower($debug_pack)]
);
}
+ if (file_exists($devel_pack)) {
+ $releases[$version_short][$key]['devel_pack'] = array(
+ 'size' => bytes2string(filesize($devel_pack)),
+ 'path' => $devel_pack,
+ 'sha1' => $sha1sums[strtolower($devel_pack)],
+ 'sha256' => $sha256sums[strtolower($devel_pack)]
+ );
+ }
if (file_exists($installer)) {
$releases[$version_short][$key]['installer'] = array(
'size' => bytes2string(filesize($installer)),
@@ -236,7 +246,6 @@ function get_redirection_conf_piece($tpl, $fname_real, $ver, $cur_ver)
return $ret . "\n\t\t";
}

-/* TODO add the test pack and the dev package to the cache and include them into the generated content. */
function generate_web_config(array $releases = array())
{
$config_tpl = file_get_contents(TPL_PATH . "/web.config.tpl");
@@ -265,6 +274,8 @@ function generate_web_config(array $releases = array())
foreach ($release as $flavour) {
$tmp .= get_redirection_conf_piece($redirect_tpl, $flavour["zip"]["path"], $version, $cur_ver);
$tmp .= get_redirection_conf_piece($redirect_tpl, $flavour["debug_pack"]["path"], $version, $cur_ver);
+ $tmp .= get_redirection_conf_piece($redirect_tpl, $flavour["devel_pack"]["path"], $version, $cur_ver);
+ $tmp .= get_redirection_conf_piece($redirect_tpl, $flavour["test_pack"]["path"], $version, $cur_ver);
}
}

@@ -293,7 +304,6 @@ function generate_latest_html_piece($fname, $ts, $size, $ver, $cur_ver)
);
}

-/* TODO add the test pack and the dev package to the cache and include them into the generated content. */
function generate_latest_releases_html(array $releases = array())
{
$index_html_tpl = trim(file_get_contents(TPL_PATH . "/releases_latest.tpl"));
@@ -325,6 +335,8 @@ function generate_latest_releases_html(array $releases = array())

$tmp .= generate_latest_html_piece($flavour["zip"]["path"], $mtime, (float)$flavour["zip"]["size"]*1024*1024, $version, $cur_ver);
$tmp .= generate_latest_html_piece($flavour["debug_pack"]["path"], $mtime, (float)$flavour["debug_pack"]["size"]*1024*1024, $version, $cur_ver);
+ $tmp .= generate_latest_html_piece($flavour["devel_pack"]["path"], $mtime, (float)$flavour["devel_pack"]["size"]*1024*1024, $version, $cur_ver);
+ $tmp .= generate_latest_html_piece($flavour["test_pack"]["path"], $mtime, (float)$flavour["test_pack"]["size"]*1024*1024, $version, $cur_ver);
}
}