From 11f260eb558bc62da61340951b77ae4aa68324f9 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sat, 14 Feb 2015 00:21:22 +0100
Subject: [PATCH] Maint: Uploading of documentation of companion libraries

---
 WWW/index.html   | 3 ++-
 maint/release    | 4 ++--
 maint/upload-doc | 8 +++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/WWW/index.html b/WWW/index.html
index 3d0e6981..a5c73665 100644
--- a/WWW/index.html
+++ b/WWW/index.html
@@ -50,12 +50,13 @@
 					<li>Transactions and exceptions
 					<li>Build system
 					<li>Documentation system
+					<li>Companion libraries for charset conversion, loading of images, and XML parsing
 					<li>&hellip; and many more
 				</ul>
 			</div>
 			<div class="section" id="docs"><h2>Documentation</h2>
 				<p>
-					You can browse <a href='doc/'>LibUCW documentation</a> online.
+					You can browse <a href='doc/ucw/'>LibUCW documentation</a> online.
 			</div>
 			<div class="section" id="download"><h2>Download</h2>
 				<p>
diff --git a/maint/release b/maint/release
index 5f34b38d..2d6fd866 100755
--- a/maint/release
+++ b/maint/release
@@ -24,11 +24,11 @@ if ($r->{"do_upload"}) {
 	my $tdir = $r->{"TESTDIR"};
 	if (defined $tdir) {
 		print "Generating documentation\n";
-		`cd $tdir && make install-libucw-docs INSTALL_DOC_DIR=../doc`;
+		`cd $tdir && make docs`;
 		die if $?;
 		print "Upload of documentation\n";
 		$r->Confirm;
-		system qw(rsync -avz --delete maint/tmp/doc/ucw/ jw:/var/www/libucw/doc/);
+		`cd $tdir && maint/upload-doc`;
 		die if $@;
 	} else {
 		print "WARNING: With --notest, no documentation is published!\n";
diff --git a/maint/upload-doc b/maint/upload-doc
index 19b73f62..457d29f3 100755
--- a/maint/upload-doc
+++ b/maint/upload-doc
@@ -1,8 +1,10 @@
 #!/bin/bash
 # Build and upload LibUCW documentation and web pages
-# (c) 2012 Martin Mares <mj@ucw.cz>
+# (c) 2012--2015 Martin Mares <mj@ucw.cz>
 
 set -e
-make docs
-rsync -avz --delete obj/ucw/doc/ jw:/var/www/libucw/doc/ --exclude=*.deflist --exclude=*.txt
+rm -rf maint/tmp/doc
+mkdir -p maint/tmp/doc
+make install-libucw-docs install-libucw-xml-docs PREFIX=. INSTALL_DOC_DIR=maint/tmp/doc
+rsync -avz --delete maint/tmp/doc/ jw:/var/www/libucw/doc/
 rsync -avz --no-times --no-perms --executability --omit-dir-times WWW/ jw:/var/www/libucw/ --exclude=doc --exclude='*.swp'
-- 
2.39.2