Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
# This can be overridden on cmdline to generate pages elsewhere.
WEBDIR=/home/rusty/www/html/ccan
# This can be overridden on cmdline to generate pages elsewhere.
WEBDIR=/home/rusty/www/html/ccan
-ALL_PAGES=$(patsubst %, $(WEBDIR)/info/%.html, $(MODS_NORMAL) $(MODS_EXTERNAL))
-DIRECT_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/%.tar.bz2, $(MODS_NORMAL) $(MODS_EXTERNAL))
-DEPEND_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/with-deps/%.tar.bz2, $(MODS_NORMAL) $(MODS_EXTERNAL))
+ALL_PAGES=$(patsubst %, $(WEBDIR)/info/%.html, $(MODS))
+DIRECT_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/%.tar.bz2, $(MODS))
+DEPEND_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/with-deps/%.tar.bz2, $(MODS))
WEB_SUBDIRS=$(WEBDIR)/tarballs $(WEBDIR)/junkcode $(WEBDIR)/tarballs/with-deps $(WEBDIR)/info
JUNKDIRS=$(wildcard junkcode/*)
JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
WEB_SUBDIRS=$(WEBDIR)/tarballs $(WEBDIR)/junkcode $(WEBDIR)/tarballs/with-deps $(WEBDIR)/info
JUNKDIRS=$(wildcard junkcode/*)
JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
$(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
$(WEBDIR)/list.html: web/staticall.php tools/doc_extract $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(JUNKBALLS)
$(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
$(WEBDIR)/list.html: web/staticall.php tools/doc_extract $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(JUNKBALLS)
- php5 web/staticall.php ccan/ junkcode/ $(WEBDIR) > $@
+ php5 web/staticall.php ccan/ junkcode/ $(WEBDIR) $(MODS) > $@
$(WEBDIR)/upload.html: web/staticupload.php
php5 web/staticupload.php > $@
$(WEBDIR)/upload.html: web/staticupload.php
php5 web/staticupload.php > $@
cp $< $@
$(WEBDIR)/info/%.html: $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
cp $< $@
$(WEBDIR)/info/%.html: $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
- URLPREFIX=../ php5 web/staticmoduleinfo.php `pwd`/ccan/$* > $@
+ @mkdir -p `dirname $@`
+ URLPREFIX=../`echo $* | tr -dc '/' | sed s',/,../,g'` php5 web/staticmoduleinfo.php `pwd`/ccan/$* $* > $@
$(WEBDIR)/tarballs/%.tar.bz2: ccan/%/_info clean-tree
$(WEBDIR)/tarballs/%.tar.bz2: ccan/%/_info clean-tree
- tar -c -j -f $@ $$(git ls-files ccan/$*) $$(git ls-files ccan/$* | xargs -n1 -r readlink | sed -n 's,^../../,,p' | sort -u)
+ @mkdir -p `dirname $@`
+ FILES=$$(tools/list_files.sh ccan/$*) && tar -c -j -f $@ $$FILES $$(echo $$FILES | xargs -n1 -r readlink | sed 's,^\(../\)*,,' | sort -u)
$(WEBDIR)/tarballs/with-deps/%.tar.bz2: ccan/%/_info tools/ccan_depends clean-tree
$(WEBDIR)/tarballs/with-deps/%.tar.bz2: ccan/%/_info tools/ccan_depends clean-tree
- tar -c -j -f $@ $$(git ls-files $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) ) ) $$(git ls-files $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) ) | xargs -n1 -r readlink | sed -n 's,^../../,,p' | sort -u)
+ @mkdir -p `dirname $@`
+ FILES=$$(tools/list_files.sh ccan/$* $$(tools/ccan_depends ccan/$*) ) && tar -c -j -f $@ $$FILES $$(echo $$FILES | xargs -n1 -r readlink | sed 's,^\(../\)*,,' | sort -u)
--- /dev/null
+#! /bin/sh
+# Script to list all files, for making tarballs.
+
+set -e
+if [ $# -eq 0 ]; then
+ echo Usage: list_files.sh '<ccandir>...' >&2
+ exit 1
+fi
+
+for d; do
+ # git ls-files recurses, but we want ignores correct :(
+ for f in `git ls-files $d | sed "s,^\($d/[^/]*\)/.*,\1," | uniq`; do
+ # Include subdirs, unless it's a separate module.
+ if [ -d "$f" ]; then
+ if [ ! -f "$f"/_info ]; then
+ $0 "$f"
+ fi
+ else
+ echo "$f"
+ fi
+ done
+done
//location of upload script (for posting uploads)
$uploadscript = "http://ccodearchive.net/uploader.php";
//location of upload script (for posting uploads)
$uploadscript = "http://ccodearchive.net/uploader.php";
-//infofile
-$infofile = '/_info';
-
//ccan admin
$ccanadmin = "rusty@rustcorp.com.au";
//ccan admin
$ccanadmin = "rusty@rustcorp.com.au";
<th align="right">Download</th>
<?php
<th align="right">Download</th>
<?php
-$d = dir($argv[1]);
-$modules = array();
-while (false !== ($entry = $d->read())) {
- if ($entry[0] != '.' && is_file($argv[1].$entry."/_info")) {
- array_push($modules, $entry);
- }
-}
+$modules = array_slice($argv, 4);
sort($modules);
foreach ($modules as $module) {
sort($modules);
foreach ($modules as $module) {
include('menulist.html');
include('static-configuration');
$module_path=$argv[1];
include('menulist.html');
include('static-configuration');
$module_path=$argv[1];
-$module=basename($module_path);
$maintainer=extract_field('maintainer',$module_path);
$author=extract_field('author',$module_path);
$summary=extract_field('summary',$module_path);
$maintainer=extract_field('maintainer',$module_path);
$author=extract_field('author',$module_path);
$summary=extract_field('summary',$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);
$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">
?>
<table align="center" bgcolor="lightblue" width="70%" border="0" cellpadding="3" cellspacing="1">
<tr align="center" bgcolor="FFFFCC">
<a href="<?=$repo_base.$module?>">Browse Source</a>
</td>
<td>
<a href="<?=$repo_base.$module?>">Browse Source</a>
</td>
<td>
-<a href="../<?=$tar_dir?>/with-deps/<?=$module?>.tar.bz2">Download</a>
-<a href="../<?=$tar_dir?>/<?=$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>