thomasvs - in flumotion-doc: . doc/manual m4 make
flumotion-commit at lists.fluendo.com
flumotion-commit at lists.fluendo.com
Tue Feb 20 23:29:32 CET 2007
Author: thomasvs
Date: Tue Feb 20 23:29:17 2007
New Revision: 4502
Modified:
flumotion-doc/ChangeLog
flumotion-doc/configure.ac
flumotion-doc/doc/manual/Makefile.am
flumotion-doc/flumotion-doc.spec.in
flumotion-doc/m4/as-db-doc.m4
flumotion-doc/m4/as-db-images.m4
flumotion-doc/make/doc.mak
Log:
* configure.ac:
* doc/manual/Makefile.am:
* flumotion-doc.spec.in:
* m4/as-db-doc.m4:
* m4/as-db-images.m4:
* make/doc.mak:
update rules to also output xml
fix spec file
Modified: flumotion-doc/ChangeLog
==============================================================================
--- flumotion-doc/ChangeLog (original)
+++ flumotion-doc/ChangeLog Tue Feb 20 23:29:17 2007
@@ -1,3 +1,14 @@
+2007-02-20 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * configure.ac:
+ * doc/manual/Makefile.am:
+ * flumotion-doc.spec.in:
+ * m4/as-db-doc.m4:
+ * m4/as-db-images.m4:
+ * make/doc.mak:
+ update rules to also output xml
+ fix spec file
+
2006-06-18 Thomas Vander Stichele <thomas at apestaart dot org>
* doc/manual/configuration.xml:
Modified: flumotion-doc/configure.ac
==============================================================================
--- flumotion-doc/configure.ac (original)
+++ flumotion-doc/configure.ac Tue Feb 20 23:29:17 2007
@@ -6,7 +6,7 @@
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
dnl add a parameter to set output formats
-OUTPUT_FORMATS="html pdf txt" # ps disabled until it works
+OUTPUT_FORMATS="xml html txt" # ps and pdf disabled until it works
AC_ARG_WITH(docbook-output-formats,
AC_HELP_STRING([--with-docbook-output-formats],
[list of docbook output formats to generate]),
Modified: flumotion-doc/doc/manual/Makefile.am
==============================================================================
--- flumotion-doc/doc/manual/Makefile.am (original)
+++ flumotion-doc/doc/manual/Makefile.am Tue Feb 20 23:29:17 2007
@@ -31,7 +31,7 @@
# HTML_STYLE = nochunks
# where to install documentation
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/$(DOC)
+docdir = $(datadir)/flumotion/$(DOC)
# what to install there
doc_DATA = $(DOC_DAT)
Modified: flumotion-doc/flumotion-doc.spec.in
==============================================================================
--- flumotion-doc/flumotion-doc.spec.in (original)
+++ flumotion-doc/flumotion-doc.spec.in Tue Feb 20 23:29:17 2007
@@ -1,47 +1,37 @@
-Name: docbook-xml-template
+Name: flumotion-doc
Version: @VERSION@
Release: 1
-Summary: A template docbook xml package.
+Summary: Flumotion documentation
-Group: Applications/Text
+Group: Documentation
License: GPL
-URL: http://thomas.apestaart.org/projects/docbook-xml-template
-Source: http://thomas.apestaart.org/projects/docbook-xml-template/%{name}-%{version}.tar.gz
+URL: http://www.flumotion.net/
+Source: http://www.flumotion.net/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
%description
-This is a template package containing documentation generated from
-DocBook/XML source.
+This package contains the documentation for Flumotion.
%prep
%setup -q
%build
-%configure
+%configure --with-docbook-output-formats=html,xml
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-# install docs by hand in a staging area
-mkdir installed-doc
-cd doc
-cp -pr --parents */*.ps ../installed-doc
-cp -pr --parents */*.pdf ../installed-doc
-cp -pr --parents */html ../installed-doc
-
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
-%doc installed-doc/article/article.{ps,pdf}
-%doc installed-doc/article/html
-%doc installed-doc/book/book.{ps,pdf}
-%doc installed-doc/book/html
+%{_datadir}/flumotion/manual
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Apr 18 2004 Thomas Vander Stichele <thomas at apestaart dot org>
+* Tue Feb 20 2007 Thomas Vander Stichele <thomas at apestaart dot org>
- Initial package
Modified: flumotion-doc/m4/as-db-doc.m4
==============================================================================
--- flumotion-doc/m4/as-db-doc.m4 (original)
+++ flumotion-doc/m4/as-db-doc.m4 Tue Feb 20 23:29:17 2007
@@ -14,6 +14,8 @@
do
AC_MSG_NOTICE(Checking for tools needed to generate $format)
case $format in
+ xml) HAVE_FORMAT_XML="yes"
+ ;;
html) AS_DB_CHECK_HTML(HAVE_FORMAT_HTML="yes", [
AC_MSG_WARN(Cannot generate HTML documentation)
HAVE_FORMAT_HTML="no"
@@ -35,6 +37,7 @@
done
dnl make our decision known to automake
+ AM_CONDITIONAL(HAVE_FORMAT_XML, test "x$HAVE_FORMAT_XML" = "xyes")
AM_CONDITIONAL(HAVE_FORMAT_HTML, test "x$HAVE_FORMAT_HTML" = "xyes")
AM_CONDITIONAL(HAVE_FORMAT_PDF, test "x$HAVE_FORMAT_PDF" = "xyes")
AM_CONDITIONAL(HAVE_FORMAT_PS, test "x$HAVE_FORMAT_PS" = "xyes")
Modified: flumotion-doc/m4/as-db-images.m4
==============================================================================
--- flumotion-doc/m4/as-db-images.m4 (original)
+++ flumotion-doc/m4/as-db-images.m4 Tue Feb 20 23:29:17 2007
@@ -238,6 +238,7 @@
for outputformat in $DB_OUTPUT_FORMATS
do
case $outputformat in
+ xml) AS_DB_CHECK_FIG_TO_PNG(HAVE_FIG_TO_PNG=yes, IMAGE=no) ;;
html) AS_DB_CHECK_FIG_TO_PNG(HAVE_FIG_TO_PNG=yes, IMAGE=no) ;;
pdf) AS_DB_CHECK_FIG_TO_PDF(HAVE_FIG_TO_PDF=yes, IMAGE=no) ;;
ps) AS_DB_CHECK_FIG_TO_PS(HAVE_FIG_TO_PS=yes, IMAGE=no) ;;
@@ -250,6 +251,7 @@
for outputformat in $DB_OUTPUT_FORMATS
do
case $outputformat in
+ xml) ;;
html) ;;
pdf) AS_DB_CHECK_PNG_TO_PDF(HAVE_PNG_TO_PDF=yes, IMAGE=no) ;;
ps) AS_DB_CHECK_PNG_TO_PS(HAVE_PNG_TO_PS=yes, IMAGE=no) ;;
@@ -262,7 +264,8 @@
for outputformat in $DB_OUTPUT_FORMATS
do
case $outputformat in
- html) AS_DB_CHECK_PS_TO_PNG(HAVE_PS_TO_PNG=yes, IMAGE=no) ;;
+ xml) AS_DB_CHECK_PS_TO_PNG(HAVE_PS_TO_PNG=yes, IMAGE=no) ;;
+ html) AS_DB_CHECK_PS_TO_PNG(HAVE_PS_TO_PNG=yes, IMAGE=no) ;;
pdf) AS_DB_CHECK_PS_TO_PDF(HAVE_PS_TO_PDF=yes, IMAGE=no) ;;
ps) ;;
txt) ;;
Modified: flumotion-doc/make/doc.mak
==============================================================================
--- flumotion-doc/make/doc.mak (original)
+++ flumotion-doc/make/doc.mak Tue Feb 20 23:29:17 2007
@@ -26,22 +26,44 @@
# since html output really is a subtree of stuff in html/, we have to hook
# in local install/uninstall rules
if HAVE_FORMAT_HTML
-install-data-local: html
+install-data-local-html: html
@echo Installing HTML documentation
$(mkinstalldirs) $(DESTDIR)$(docdir)
cp -pr html $(DESTDIR)$(docdir)
-uninstall-local:
+uninstall-local-html:
@echo Uninstalling HTML documentation
@for part in html; do rm -rf $(DESTDIR)$(docdir)/$$part; done
@if test -d $(DESTDIR)$(docdir); then rmdir $(DESTDIR)$(docdir) > /dev/null 2>&1 || true; fi
-all-local: html
+all-local-html: html
else
-install-data-local:
-uninstall-local:
-all-local:
+install-data-local-html:
+uninstall-local-html:
+all-local-html:
endif
+# same for xml
+if HAVE_FORMAT_XML
+install-data-local-xml: xml
+ @echo Installing XML documentation
+ $(mkinstalldirs) $(DESTDIR)$(docdir)
+ cp -pr xml $(DESTDIR)$(docdir)
+
+uninstall-local-xml:
+ @echo Uninstalling XML documentation
+ @for part in xml; do rm -rf $(DESTDIR)$(docdir)/$$part; done
+ @if test -d $(DESTDIR)$(docdir); then rmdir $(DESTDIR)$(docdir) > /dev/null 2>&1 || true; fi
+all-local-xml: xml
+else
+install-data-local-xml:
+uninstall-local-xml:
+all-local-xml:
+endif
+
+install-data-local: install-data-local-html install-data-local-xml
+uninstall-local: uninstall-local-html uninstall-local-xml
+all-local: all-local-html all-local-xml
+
# this can't be named DOC_DATA since then automake picks it up
DOC_DAT = $(PDF_DAT) $(PS_DAT) $(TXT_DAT)
@@ -80,6 +102,21 @@
mkdir -p html/images; \
cp $(PNG_BUILT) html/images; fi
+xml/*.xml: xml
+
+xml: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC) $(PS_SRC)
+ @make check-local
+ @-mkdir -p xml
+ @make $(BUILDDIR)/image.entities.png
+ echo "*** Generating XML output ***"; \
+ cd xml && cp ../*.xml .
+ cp $(BUILDDIR)/image.entities xml
+# copy png images
+ @if test "x$(PNG)" != "x"; then \
+ echo "Copying .png images: $(PNG_BUILT)"; \
+ mkdir -p xml/images; \
+ cp $(PNG_BUILT) xml/images; fi
+
$(DOC).pdf: $(BUILDDIR)/$(MAIN) $(PDF_BUILT) $(PNG_SRC) $(FIG_SRC) $(PS_SRC) $(FO_XSL)
@make check-local
@echo "*** Generating PDF output ***"
More information about the flumotion-commit
mailing list