Maint: Uploading of documentation of companion libraries

diff --git a/WWW/index.html b/WWW/index.html
index 3d0e69811b5b8afb5dc37b7ad9f9c7448fd272d2..a5c7366556b6409a30f7c44683fc4d7c85f5fe59 100644 (file)
--- 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 5f34b38d6fa478938f233d9f76ae81b5a9858c5c..2d6fd86690d49fa277357d834789cf5635fb6496 100755 (executable)
--- 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 19b73f629e7faa0f435ce61c6eca264a41d6e562..457d29f30ad45186a5a268ba3ee44ac4f496e739 100755 (executable)
--- 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'