[med-svn] [gdcm] 01/02: Prepare separation of build-indep and build-arch

Sat Jan 9 20:38:59 UTC 2016

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository gdcm.

commit d32beb792320de4027b6c311cb1a65fbc3950ca0
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Fri Jan 8 21:05:54 2016 +0100

    Prepare separation of build-indep and build-arch
    
    Currently, build-indep also runs the full build because the
    dh_auto_install runs the plain 'install' target and this
    depends on the target 'all'. Have to figure out how to properly
    override the install-indep and install-arch targets in d/rules.
---
 debian/changelog                                  |  6 ++++
 debian/control                                    |  2 +-
 debian/patches/05_add_global_doxydoc_target.patch | 44 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 debian/rules                                      | 25 ++++++-------
 5 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 984371b..73c9b1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdcm (2.6.2-2) UNRELEASED; urgency=medium
+
+  * Run doxygen only in arch-indep build Closes: #746268
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Fri, 08 Jan 2016 21:03:22 +0100
+
 gdcm (2.6.2-1) unstable; urgency=medium
 
   * New upstream release 
diff --git a/debian/control b/debian/control
index 9c7a170..e490a04 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9),
 	       uuid-dev,
 	       libz-dev,
 	       libexpat-dev,
-	       doxygen,
 	       swig3.0,
 	       cmake (>= 2.8.9),
 	       libvtk6-dev,
@@ -35,6 +34,7 @@ Build-Depends: debhelper (>= 9),
                xsltproc, 
                docbook-xsl
 Build-Depends-Indep: vtk6-doc,
+		     doxygen,
 		     doxygen-latex,
 		     ghostscript, 
                      graphviz
diff --git a/debian/patches/05_add_global_doxydoc_target.patch b/debian/patches/05_add_global_doxydoc_target.patch
new file mode 100644
index 0000000..0d37d10
--- /dev/null
+++ b/debian/patches/05_add_global_doxydoc_target.patch
@@ -0,0 +1,44 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -554,6 +554,12 @@
+ endif()
+ #-----------------------------------------------------------------------------
+ 
++# Add a target so that the documentation can be build from the
++# root dir
++if(GDCM_DOCUMENTATION)
++  add_custom_target(DoxygenDoc)
++endif()
++
+ # Need to subdirs in Source/Common before Wrapping
+ # to have gdcmConfigure.h around
+ subdirs(Utilities)
+--- a/Utilities/doxygen/CMakeLists.txt
++++ b/Utilities/doxygen/CMakeLists.txt
+@@ -162,6 +162,7 @@
+       ${CMAKE_CURRENT_BINARY_DIR}/latex/gdcm-${GDCM_VERSION}.pdf
+       DESTINATION ${GDCM_INSTALL_DOC_DIR}
+     )
++    add_dependencies(DoxygenDoc GDCMDoxygenPDF)
+   else()
+     # make DoxygenDoc depends on the final tarball thus all file are garantee to be generated
+     add_custom_target(GDCMDoxygenDoc
+@@ -169,6 +170,7 @@
+       DEPENDS ${GDCM_DOC_TARBALL}
+       COMMENT  "GDCM: Executing GDCMDoxygenDoc"
+     )
++    add_dependency(DoxygenDoc GDCMDoxygenDoc)
+   endif()
+ 
+   # Install html pages:
+--- a/Utilities/doxygen/vtk/CMakeLists.txt
++++ b/Utilities/doxygen/vtk/CMakeLists.txt
+@@ -111,6 +111,8 @@
+     ${DOXYGEN_PROJECT_NAME}DoxygenDoc
+     GDCMDoxygenPDF
+   )
++  add_dependencies(DoxygenDoc
++    ${DOXYGEN_PROJECT_NAME}DoxygenDoc)
+ 
+   if(INCLUDE_QT_DOCUMENTATION)
+     add_custom_target(QtDoxygenTags
diff --git a/debian/patches/series b/debian/patches/series
index 9e084ff..e6d1584 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 02_fixhurd.patch
 03_linkvtkdoc.patch
 04_multiarch.patch
+05_add_global_doxydoc_target.patch
diff --git a/debian/rules b/debian/rules
index 04c1d14..58bc6fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_BUILD_TYPE:STRING=None \
 		-DGDCM_DOXYGEN_NO_FOOTER:BOOL=ON \
 		-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
-		-DGDCM_DOCUMENTATION:BOOL=ON \
+		-DGDCM_DOCUMENTATION:BOOL=$(BUILDDOC) \
 		-DGDCM_VTK_DOCUMENTATION:BOOL=$(BUILDDOC) \
 		-DDOCUMENTATION_DOWNLOAD_VTK_TAGFILE:BOOL=OFF \
 		-DGDCM_PDF_DOCUMENTATION:BOOL=$(BUILDDOC) \
@@ -84,8 +84,11 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
-override_dh_install-arch:
-	dh_install --list-missing
+override_dh_auto_build-indep: 
+	dh_auto_build -- DoxygenDoc
+
+override_dh_auto_build-arch: 
+	dh_auto_build 
 
 override_dh_auto_install:
 	# See #664188
@@ -106,6 +109,12 @@ override_dh_auto_install:
 	mv debian/tmp/usr/lib/python debian/tmp/$(PYMODDIR)
 	#mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/
 
+override_dh_auto_install-indep: 
+	DESTDIR=debian/tmp/ $(MAKE) -C obj-*/Utilities/doxygen/ install 
+
+#override_dh_auto_install-arch:
+#	dh_install --list-missing
+
 override_dh_strip:
 	dh_strip --dbg-package=libgdcm2.6-dbg
 
@@ -117,10 +126,6 @@ ifeq ($(DEB_WRAP_CSHARP), 1)
 	dh_clideps
 endif
 
-# Let's be smart with building doc
-override_dh_auto_build-indep:
-	-$(MAKE) -C obj-* vtkgdcmDoxygenDoc
-
 # No tests needed for docs
 override_dh_auto_test-indep:
 
@@ -131,12 +136,8 @@ override_dh_compress:
 	# do not compress .map file for doxygen graph
 	dh_compress -X.map -X.pdf
 
-# TODO I cannot set documentation to separate build target as man page
+#TODO I cannot set documentation to separate build target as man page
 # depends on doc, and bin tools depends on man page
-#build-indep:
-#	$(MAKE) GDCMDoxygenDoc
-#build-arch:
-#	$(MAKE)
 
 debian/control: debian/control.in
 	sed -e"s/@PYVER@/$(PYVER)/g" -e "s/@DEB_MONO_ARCHS@/$(DEB_MONO_ARCHS)/g" $< > $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git

