[qgis] 06/07: Disable doxygen during build, run doxygen in build-indep target.
Bas Couwenberg
sebastic at xs4all.nl
Fri Mar 14 01:05:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository qgis.
commit 2c0c801b2e62dc0d5b9c6a170a7be067ac6d7692
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Mar 13 23:50:54 2014 +0100
Disable doxygen during build, run doxygen in build-indep target.
---
debian/changelog | 1 +
debian/patches/disable-doxygen.patch | 23 +++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 14 ++++++++++++--
4 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9e84d6a..c66847e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
qgis (2.2.0-1~exp2) UNRELEASED; urgency=low
* Add patches for changes from upstream release_2.2 branch.
+ * Disable doxygen during build, run doxygen in build-indep target.
-- Bas Couwenberg <sebastic at xs4all.nl> Thu, 13 Mar 2014 21:36:23 +0100
diff --git a/debian/patches/disable-doxygen.patch b/debian/patches/disable-doxygen.patch
new file mode 100644
index 0000000..2192708
--- /dev/null
+++ b/debian/patches/disable-doxygen.patch
@@ -0,0 +1,23 @@
+Description: Disable doxygen, only built in build-indep target.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -29,12 +29,12 @@ IF(WITH_APIDOC)
+ FIND_PACKAGE(Doxygen)
+ IF(DOXYGEN_FOUND)
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+- ADD_CUSTOM_TARGET(apidoc ALL
+- COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+- DEPENDS qgis_core qgis_gui qgis_analysis
+- COMMENT "Generating API documentation" VERBATIM)
+- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/api/html/ DESTINATION ${QGIS_DATA_DIR}/doc/api)
++ #ADD_CUSTOM_TARGET(apidoc ALL
++ # COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
++ # WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++ # DEPENDS qgis_core qgis_gui qgis_analysis
++ # COMMENT "Generating API documentation" VERBATIM)
++ #INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/api/html/ DESTINATION ${QGIS_DATA_DIR}/doc/api)
+ ELSE(DOXYGEN_FOUND)
+ MESSAGE(STATUS "QGIS api documentation not built - Doxygen not found")
+ ENDIF(DOXYGEN_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index 728b20f..bd74bf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ use-local-icon.patch
fix-qreal-vs-double.patch
disable-features-on-arm.patch
qgis-api-doc-MAX_DOT_GRAPH_DEPTH.patch
+disable-doxygen.patch
0001-oracle-provider-replace-rownum-0-with-1-0-to-retriev.patch
0001-don-t-open-the-identify-dialog-beforehand-if-Open-fe.patch
0001-Georeferencer-fix-bad-allocation-error.patch
diff --git a/debian/rules b/debian/rules
index 405d097..4fca0e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,6 +111,12 @@ override_dh_clean:
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_OPTS)
+override_dh_auto_build-arch:
+ dh_auto_build --arch
+
+override_dh_auto_build-indep:
+ cd obj-* && doxygen doc/Doxyfile ; cd -
+
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Code to run the package test suite - and ignore the outcome for now
@@ -119,8 +125,8 @@ else
@echo Skipping tests.
endif
-override_dh_auto_install:
- dh_auto_install
+override_dh_auto_install-arch:
+ dh_auto_install --arch
# remove unwanted files
$(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
@@ -178,6 +184,10 @@ override_dh_auto_install:
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
+override_dh_auto_install-indep:
+ install -o root -g root -m 755 -d $(CURDIR)/debian/tmp/usr/share/qgis/doc
+ install -o root -g root -m 755 -d obj-*/api/html $(CURDIR)/debian/tmp/usr/share/qgis/doc/api
+
override_dh_install:
dh_install --autodest --list-missing
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list