X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=web%2Fstaticmoduleinfo.php;h=2174f7a598c8c78ef11bed1141010e46684a7791;hp=4accde1e83b237dd80c815660e362891586ca4d6;hb=737dcc0fe959d67eb29f57df37b0d7f188e0213d;hpb=6b73d11998591ec50e726cc2d4105ca85f38d87d;ds=sidebyside

diff --git a/web/staticmoduleinfo.php b/web/staticmoduleinfo.php
index 4accde1e..2174f7a5 100644
--- a/web/staticmoduleinfo.php
+++ b/web/staticmoduleinfo.php
@@ -3,15 +3,19 @@ session_start();
 include('logo.html');
 include('menulist.html');
 include('static-configuration');
-$module=$argv[1];
-
-$maintainer=extract_field('maintainer',$module);
-$author=extract_field('author',$module);
-$summary=extract_field('summary',$module);
-$description=htmlize_field('description',$module);
-$example=extract_field('example',$module);
-$dependencies=htmlspecialchars(shell_exec('tools/ccan_depends --direct '.$module));
-$licence=extract_field('licence',$module);
+$module_path=$argv[1];
+$module=$argv[2];
+$maintainer=extract_field('maintainer',$module_path);
+$author=extract_field('author',$module_path);
+$summary=extract_field('summary',$module_path);
+$see_also=extract_field('see_also',$module_path);
+$description=htmlize_field('description',$module_path);
+$example=extract_field('example',$module_path);
+$dependencies=htmlspecialchars(shell_exec('tools/ccan_depends --direct '.$module_path));
+$extdepends=htmlspecialchars(shell_exec('tools/ccan_depends --compile --non-ccan '.$module_path));
+$licence=extract_field('licence',$module_path);
+$license=extract_field('license',$module_path);
+$url_prefix = getenv("URLPREFIX");
 ?>
 <table align="center" bgcolor="lightblue" width="70%" border="0" cellpadding="3" cellspacing="1">
 <tr align="center" bgcolor="FFFFCC">
@@ -19,8 +23,8 @@ $licence=extract_field('licence',$module);
 <a href="<?=$repo_base.$module?>">Browse Source</a>
 </td>
 <td>
-<a href="../<?=$tar_dir?>/with-deps/<?=basename($module)?>.tar.bz2">Download</a>
-<a href="../<?=$tar_dir?>/<?=basename($module)?>.tar.bz2">(without any required ccan dependencies)</a>
+<a href="<?=$url_prefix?><?=$tar_dir?>/with-deps/<?=$module?>.tar.bz2">Download</a>
+<a href="<?=$url_prefix?><?=$tar_dir?>/<?=$module?>.tar.bz2">(without any required ccan dependencies)</a>
 </tr>
 </table>
 
@@ -64,11 +68,40 @@ if ($dependencies) {
 </tr>
 <?php 
 }
+
+if ($extdepends) {
+?>
+<tr align="left" bgcolor="FFFFCC">
+<td><h3>External dependencies: </h3> <?php
+	foreach (split("\n", $extdepends) as $dep) {
+		$fields=preg_split("/\s+/", $dep);
+		echo $fields[0].' ';
+		if (count($fields) > 1)
+			echo '(version '.$fields[1].') ';
+		echo '<br>';
+        }
+?></td>
+</tr>
+<?php 
+}
 ?>
 <tr align="left" bgcolor="FFFFCC">
 <td><h3>Description: </h3> <?=$description;?> </td>
 </tr>
+
 <?php 
+if ($see_also) {
+?>
+<tr align="left" bgcolor="FFFFCC">
+<td><h3>See Also: </h3> <pre> <?php
+	foreach (preg_split("/[\s,]+/", trim($see_also)) as $see) {
+		echo '<a href="'.substr($see, 5).'.html">'.$see.'</a> ';
+        }
+?></pre></td>
+</tr>
+<?php
+}
+
 if ($example) {
 ?>
 <tr align="left" bgcolor="FFFFCC"> 
@@ -80,7 +113,15 @@ if ($example) {
 if ($licence) {
 ?>
 <tr align="left" bgcolor="FFFFCC"> 
-<td><h3>Licence: </h3> <?=$licence?></td>
+<td><h3>License: </h3> <?=$licence?></td>
+</tr>
+<?php
+}
+
+if ($license) {
+?>
+<tr align="left" bgcolor="FFFFCC"> 
+<td><h3>License: </h3> <?=$license?></td>
 </tr>
 <?php
 }