Author: sandervanderburg
Date: Thu Oct 28 15:19:53 2010
New Revision: 24515
URL: https://svn.nixos.org/websvn/nix/?rev=24515&sc=1
Log:
The PDF manual is now also being built
Added:
disnix/disnix/trunk/doc/manual/index.xml
- copied unchanged from r24501, disnix/disnix/trunk/doc/manual/manual.xml
Deleted:
disnix/disnix/trunk/doc/manual/manual.xml
Modified:
disnix/disnix/trunk/doc/manual/Makefile.am
disnix/disnix/trunk/release.nix
Modified: disnix/disnix/trunk/doc/manual/Makefile.am
==============================================================================
--- disnix/disnix/trunk/doc/manual/Makefile.am Thu Oct 28 14:00:41 2010
(r24514)
+++ disnix/disnix/trunk/doc/manual/Makefile.am Thu Oct 28 15:19:53 2010
(r24515)
@@ -21,7 +21,7 @@
man8_MANS = disnix-service.8
-MANUAL_SRCS = manual.xml introduction.xml overview.xml installation.xml
models.xml activation-scripts.xml usage.xml advanced-options.xml images
style.css \
+MANUAL_SRCS = index.xml introduction.xml overview.xml installation.xml
models.xml activation-scripts.xml usage.xml advanced-options.xml images
style.css \
$(man1_MANS:.1=.xml) $(man8_MANS:.8=.xml)
version.txt:
@@ -33,15 +33,15 @@
touch $@
man $(MANS): $(MANUAL_SRCS) manual.is-valid
- $(XSLTPROC) --nonet --xinclude $(docbookxsl)/manpages/docbook.xsl
manual.xml
+ $(XSLTPROC) --nonet --xinclude $(docbookxsl)/manpages/docbook.xsl
index.xml
-manual.html: $(MANUAL_SRCS) manual.is-valid
- $(XSLTPROC) --nonet --xinclude --output manual.html \
- $(docbookxsl)/html/docbook.xsl manual.xml
+index.html: $(MANUAL_SRCS) manual.is-valid images
+ $(XSLTPROC) --nonet --xinclude --output index.html \
+ $(docbookxsl)/html/docbook.xsl index.xml
-manual.pdf: $(MANUAL_SRCS) manual.is-valid
+index.pdf: $(MANUAL_SRCS) manual.is-valid images
if test "$(dblatex)" != ""; then \
- $(dblatex) $(dblatex_opts) manual.xml; \
+ $(dblatex) $(dblatex_opts) index.xml; \
else \
echo "Please install dblatex and rerun configure."; \
exit 1; \
@@ -53,16 +53,16 @@
cp $(docbookxsl)/images/callouts/*.gif images/callouts
chmod -R +w images
-all-local: manual.html
+all-local: index.html
-install-data-local: manual.html
+install-data-local: index.html
$(INSTALL) -d $(DESTDIR)$(docdir)/manual
- $(INSTALL_DATA) manual.html $(DESTDIR)$(docdir)/manual
+ $(INSTALL_DATA) index.html $(DESTDIR)$(docdir)/manual
$(INSTALL_DATA) style.css $(DESTDIR)$(docdir)/manual
$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(docdir)/manual
cp -r images $(DESTDIR)$(docdir)/manual/images
-KEEP = manual.html manual.is-valid version.txt $(MANS)
+KEEP = index.html manual.is-valid version.txt $(MANS)
EXTRA_DIST = $(MANUAL_SRCS) $(FIGURES) $(KEEP)
Copied: disnix/disnix/trunk/doc/manual/index.xml (from r24501,
disnix/disnix/trunk/doc/manual/manual.xml)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ disnix/disnix/trunk/doc/manual/index.xml Thu Oct 28 15:19:53 2010
(r24515, copy of r24501, disnix/disnix/trunk/doc/manual/manual.xml)
@@ -0,0 +1,66 @@
+<book xmlns="http://docbook.org/ns/docbook";
+ xmlns:xi="http://www.w3.org/2001/XInclude";>
+
+ <info>
+ <title>Disnix User's Guide</title>
+
+ <subtitle>Draft (Version <xi:include href="version.txt" parse="text"
/>)</subtitle>
+
+ <author>
+ <personname>
+ <firstname>Sander</firstname>
+ <surname>van der Burg</surname>
+ </personname>
+ <affiliation>
+ <orgname>Delft University of Technology</orgname>
+ <orgdiv>Department of Software Technology</orgdiv>
+ </affiliation>
+ <contrib>Author</contrib>
+ </author>
+
+ <copyright>
+ <year>2008</year>
+ <year>2009</year>
+ <year>2010</year>
+ <holder>Sander van der Burg</holder>
+ </copyright>
+
+ <date>April 2010</date>
+ </info>
+
+ <xi:include href="introduction.xml" />
+ <xi:include href="overview.xml" />
+ <xi:include href="installation.xml" />
+ <xi:include href="models.xml" />
+ <xi:include href="activation-scripts.xml" />
+ <xi:include href="usage.xml" />
+ <xi:include href="advanced-options.xml" />
+ <xi:include href="extensions.xml" />
+
+ <appendix>
+ <title>Command Reference</title>
+
+ <section>
+ <title>Main commands</title>
+
+ <xi:include href="disnix-collect-garbage.xml" />
+ <xi:include href="disnix-env.xml" />
+ </section>
+
+ <section>
+ <title>Utilities</title>
+
+ <xi:include href="disnix-activate.xml" />
+ <xi:include href="disnix-build.xml" />
+ <xi:include href="disnix-client.xml" />
+ <xi:include href="disnix-copy-closure.xml" />
+ <xi:include href="disnix-distribute.xml" />
+ <xi:include href="disnix-gendist-roundrobin.xml" />
+ <xi:include href="disnix-instantiate.xml" />
+ <xi:include href="disnix-manifest.xml" />
+ <xi:include href="disnix-service.xml" />
+ <xi:include href="disnix-ssh-client.xml" />
+ <xi:include href="disnix-visualize.xml" />
+ </section>
+ </appendix>
+</book>
Modified: disnix/disnix/trunk/release.nix
==============================================================================
--- disnix/disnix/trunk/release.nix Thu Oct 28 14:00:41 2010 (r24514)
+++ disnix/disnix/trunk/release.nix Thu Oct 28 15:19:53 2010 (r24515)
@@ -15,7 +15,7 @@
src = disnix;
inherit officialRelease;
- buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable
];
+ buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable
dblatex tetex nukeReferences ];
# Add documentation in the tarball
configureFlags = ''
@@ -26,6 +26,18 @@
preDist = ''
make -C doc/manual install prefix=$out
+ make -C doc/manual index.pdf prefix=$out
+ cp doc/manual/index.pdf $out/index.pdf
+
+ # The PDF containes filenames of included graphics (see
+ # http://www.tug.org/pipermail/pdftex/2007-August/007290.html).
+ # This causes a retained dependency on dblatex, which Hydra
+ # doesn't like (the output of the tarball job is distributed
+ # to Windows and Macs, so there should be no Linux binaries
+ # in the closure).
+ nuke-refs $out/index.pdf
+
+ echo "doc-pdf manual $out/index.pdf" >>
$out/nix-support/hydra-build-products
echo "doc manual $out/share/doc/disnix/manual" >>
$out/nix-support/hydra-build-products
'';
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
