Author: sandervanderburg
Date: Thu Nov 11 22:30:04 2010
New Revision: 24675
URL: https://svn.nixos.org/websvn/nix/?rev=24675&sc=1
Log:
- Added apidox target so that we can easily build doxygen documentation
- Fixed a typo
Modified:
disnix/disnix/trunk/release.nix
disnix/disnix/trunk/src/Doxyfile
disnix/disnix/trunk/src/Makefile.am
disnix/disnix/trunk/src/libinfrastructure/infrastructure.c
Modified: disnix/disnix/trunk/release.nix
==============================================================================
--- disnix/disnix/trunk/release.nix Thu Nov 11 22:18:14 2010 (r24674)
+++ disnix/disnix/trunk/release.nix Thu Nov 11 22:30:04 2010 (r24675)
@@ -15,7 +15,7 @@
src = disnix;
inherit officialRelease;
- buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable
dblatex tetex nukeReferences ];
+ buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable
dblatex tetex doxygen nukeReferences ];
# Add documentation in the tarball
configureFlags = ''
@@ -33,6 +33,9 @@
make -C doc/manual index.pdf prefix=$out
cp doc/manual/index.pdf $out/index.pdf
+
+ make -C src apidox
+ cp -av doc/apidox $out/share/doc/disnix
# The PDF containes filenames of included graphics (see
# http://www.tug.org/pipermail/pdftex/2007-August/007290.html).
@@ -44,6 +47,7 @@
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
+ echo "doc api $out/share/doc/disnix/apidox/html" >>
$out/nix-support/hydra-build-products
'';
};
Modified: disnix/disnix/trunk/src/Doxyfile
==============================================================================
--- disnix/disnix/trunk/src/Doxyfile Thu Nov 11 22:18:14 2010 (r24674)
+++ disnix/disnix/trunk/src/Doxyfile Thu Nov 11 22:30:04 2010 (r24675)
@@ -38,7 +38,7 @@
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = doc
+OUTPUT_DIRECTORY = ../doc/apidox
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
Modified: disnix/disnix/trunk/src/Makefile.am
==============================================================================
--- disnix/disnix/trunk/src/Makefile.am Thu Nov 11 22:18:14 2010 (r24674)
+++ disnix/disnix/trunk/src/Makefile.am Thu Nov 11 22:30:04 2010 (r24675)
@@ -3,4 +3,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = disnix.pc
+apidox:
+ doxygen Doxyfile
+
EXTRA_DIST = disnix.pc.in
Modified: disnix/disnix/trunk/src/libinfrastructure/infrastructure.c
==============================================================================
--- disnix/disnix/trunk/src/libinfrastructure/infrastructure.c Thu Nov 11
22:18:14 2010 (r24674)
+++ disnix/disnix/trunk/src/libinfrastructure/infrastructure.c Thu Nov 11
22:30:04 2010 (r24675)
@@ -168,7 +168,7 @@
result = executeXPathQuery(doc, query);
g_free(query);
- /* Iterate over all targets and and them to the array */
+ /* Iterate over all targets and add them to the array */
if(result)
{
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
