diff --git a/nix-dist/build+upload.sh b/nix-dist/build+upload.sh index 5beac5b34c7..3461756b412 100755 --- a/nix-dist/build+upload.sh +++ b/nix-dist/build+upload.sh @@ -9,13 +9,13 @@ if ! rev=$(curl --silent -k https://svn.cs.uu.nl:12443/repos/trace/nix/trunk/ \ echo $rev > head-revision.nix -if ! storeexpr=$(nix-instantiate do-it.nix); then exit 1; fi +if ! storeexpr=$(nix-instantiate -vvv do-it.nix); then exit 1; fi -if ! nix-store -r "$storeexpr" > /dev/null; then exit 1; fi +if ! nix-store -vvvv -r "$storeexpr" > /dev/null; then exit 1; fi if ! outpath=$(nix-store -qn "$storeexpr"); then exit 1; fi uploader="http://losser.st-lab.cs.uu.nl/~eelco/cgi-bin/upload.pl/" -curl --silent -T "$outpath/manual.html" "$uploader" > /dev/null || exit 1 -curl --silent -T "$outpath"/nix-*.tar.bz2 "$uploader" > /dev/null || exit 1 +curl --silent -T "$outpath/manual.html" "$uploader" || exit 1 +curl --silent -T "$outpath"/nix-*.tar.bz2 "$uploader" || exit 1 diff --git a/nix-dist/nix-source-dist.sh b/nix-dist/nix-source-dist.sh index f100026db82..1eb71037075 100755 --- a/nix-dist/nix-source-dist.sh +++ b/nix-dist/nix-source-dist.sh @@ -14,12 +14,12 @@ echo "autoconfing..." autoreconf -i || exit 1 echo "configuring..." -./configure || exit 1 +./configure \ + --with-docbook-catalog=$docbook_dtd/xml/dtd/docbook/docbook.cat \ + --with-docbook-xsl=$docbook_xslt/xml/xsl/docbook \ + --with-xml-flags="--nonet" || exit 1 echo "building..." -export DOCBOOK_DTD=$docbook_dtd/xml/dtd/docbook -export DOCBOOK_XSL=$docbook_xslt/xml/xsl/docbook -#(cd doc && make) || exit 1 make distdir || exit 1 pkgname=$(echo nix-*) tar cvfz $pkgname.tar.gz $pkgname || exit 1