[hdf5] 05/08: Build-time documentation processing
Gilles Filippini
pini at moszumanska.debian.org
Mon May 5 12:39:15 UTC 2014
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository hdf5.
commit 915591c58a6ff04334ccfec5cc8074ea6ab393b5
Author: Gilles Filippini <pini at debian.org>
Date: Sun May 4 20:39:24 2014 +0200
Build-time documentation processing
* Generate C++ documentation using doxygen
* Process PHP scriptlets in HTML files
* Drop dependency on jquery.js
---
debian/changelog | 11 +++++++----
debian/control | 4 ++--
debian/control.in | 4 ++--
debian/libhdf5-doc.links | 1 -
debian/rules | 21 +++++++++++++++++++--
5 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b376da5..7af20a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
hdf5 (1.8.12+docs1-1) UNRELEASED; urgency=medium
- * Repack upstream docs without doxygen generated C++ doc. Generate
- C++ doc at build time.
- * Build-Depends: doxygen
- * debian/watch: use dversionmangle
+ * Repack upstream docs without generated files
+ * Drop useless MacOS resource fork file
+ * Generate C++ doc at build time with doxygen
+ * Process PHP scriptlets in HTML files at build time
+ * Build-Depends: doxygen, php5-cli
+ * libhdf5-doc: drop dependency on libjs-jquery (not needed anymore)
+ * debian/watch: use dversionmangle to correctly match upstream releases
-- Gilles Filippini <pini at debian.org> Sun, 04 May 2014 08:59:38 +0200
diff --git a/debian/control b/debian/control
index 24929a9..526b3e2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Build-Depends: dpkg-dev (>= 1.16.1~), libmpich-dev, zlib1g-dev,
libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 9~), sed (>=4.1.5),
gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf
+ sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf, doxygen, php5-cli
Standards-Version: 3.9.5
Homepage: http://hdfgroup.org/HDF5/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf5.git
@@ -262,7 +262,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - default MPI
Package: libhdf5-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends}
Suggests: libhdf5-dev, www-browser, pdf-viewer, doc-base
Description: Hierarchical Data Format 5 (HDF5) - Documentation
HDF5 is a file format and library for storing scientific data.
diff --git a/debian/control.in b/debian/control.in
index a72dd1f..45142ba 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
Build-Depends: dpkg-dev (>= 1.16.1~), libmpich-dev, zlib1g-dev,
libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 9~), sed (>=4.1.5),
gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf, doxygen
+ sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf, doxygen, php5-cli
Standards-Version: 3.9.5
Homepage: http://hdfgroup.org/HDF5/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf5.git
@@ -262,7 +262,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - default MPI
Package: libhdf5-doc
Section: doc
Architecture: all
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends}
Suggests: libhdf5-dev, www-browser, pdf-viewer, doc-base
Description: Hierarchical Data Format 5 (HDF5) - Documentation
HDF5 is a file format and library for storing scientific data.
diff --git a/debian/libhdf5-doc.links b/debian/libhdf5-doc.links
deleted file mode 100644
index e78d77c..0000000
--- a/debian/libhdf5-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/libhdf5-doc/html/cpplus_RM/jquery.js
diff --git a/debian/rules b/debian/rules
index 1e54389..a7e799b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,6 +126,9 @@ configure-stamp: configure-stamp-debian
# configure serial version
cd debian/build && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" CC=/usr/bin/cc CXX=/usr/bin/c++ FC=gfortran \
../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) || { cat config.log; exit 1; }
+ # Upgrade the doxygen configuration file
+ cp c++/src/cpp_doc_config c++/src/cpp_doc_config_u
+ cd c++/src && doxygen -s -u cpp_doc_config_u
touch $@
configure-stamp-openmpi: configure-stamp-debian
@@ -155,7 +158,7 @@ prep:
build: build-arch build-indep
build-arch: build-stamp $(build_stamp_openmpi) build-stamp-mpich
-build-indep:
+build-indep: build-stamp-doc
build-stamp: configure-stamp
dh_testdir
@@ -172,6 +175,12 @@ build-stamp-mpich: configure-stamp-mpich
$(MAKE) $(MAKEFLAGS) -C debian/build-mpich/
touch $@
+build-stamp-doc: configure-stamp
+ cd c++/src && doxygen cpp_doc_config_u >/dev/null
+ rm -rf html/cpplus_RM
+ mv c++/src/cpplus_RM html/
+ touch $@
+
#
# Be sure to not have a previous version installed before running
# the test suite
@@ -188,6 +197,9 @@ clean:
dh_autoreconf_clean
rm -rf m4
-cd debian && rm -f `ls libhdf5-*.install libhdf5-*.shlibs libhdf5-*.doc | grep -v 'libhdf5-doc'`
+ -rm -rf c++/src/cpplus_RM
+ -rm -rf html/cpplus_RM
+ -rm -f c++/src/cpp_doc_config_u*
dh_clean configure-stamp* build-stamp* install-stamp*
install: build prep install-serial $(install_openmpi) install-mpich install-doc
@@ -223,10 +235,15 @@ install-mpich: build-stamp-mpich
--sourcedir=debian/build-mpich/tmpinst
install -m644 -D debian/hdf5-mpich.pc debian/$(package)-mpich-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/hdf5.pc
+install-doc: HTML_DIR := debian/$(package)-doc/usr/share/doc/$(package)-doc/html
install-doc: build-indep
dh_testdir
dh_testroot
- dh_install -p$(package)-doc -X Dependencies -X Makefile.in -X CppUserNotes.doc -X jquery.js
+ dh_install -p$(package)-doc -X Dependencies -X Makefile.in -X CppUserNotes.doc
+ # process php in html files
+ find "$(HTML_DIR)"/ -type f -iname '*.html' \
+ -execdir /bin/sh -c "/usr/bin/php -f '{}' > '{}.new'" \; \
+ -exec mv "{}.new" "{}" \;
binary-indep: install-doc
dh_testdir
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git
More information about the Pkg-grass-devel
mailing list