openshot.code team mailing list archive

["FeRD (Frank Dana)" <mp+412174@xxxxxxxxxxxxxxxxxx>]

FeRD (Frank Dana) has proposed merging ~ferdnyc/openshot-packaging/+git/openshot-packaging-1:bionic-no-docs into openshot-packaging:master.

Commit message:
Don't build API docs on bionic

Requested reviews:
  OpenShot Code (openshot.code)

For more details, see:
https://code.launchpad.net/~ferdnyc/openshot-packaging/+git/openshot-packaging-1/+merge/412174

The bionic CMake is too old to generate our API docs,
so these changes simply disable them iff the build host
is Ubuntu bionic (identified by name using lsb_release).

In those situations, libopenshot-doc.deb will still be
generated, but it will only contain the example files.

-- 
Your team OpenShot Code is requested to review the proposed merge of ~ferdnyc/openshot-packaging/+git/openshot-packaging-1:bionic-no-docs into openshot-packaging:master.

diff --git a/libopenshot/debian/control b/libopenshot/debian/control
index f3176ba..f4a2c07 100644
--- a/libopenshot/debian/control
+++ b/libopenshot/debian/control
@@ -2,29 +2,30 @@ Source: libopenshot
 Maintainer: Ghislain Antony Vaillant <ghisvail@xxxxxxxxx>
 Section: libs
 Priority: optional
-Build-Depends: cmake,
-               debhelper (>= 9),
-               dh-python,
-               libasound2-dev,
-               libavcodec-dev,
-               libavformat-dev,
-               libavutil-dev,
-               libbabl-dev,
-               libfdk-aac-dev,
-               libjsoncpp-dev,
-               libmagick++-dev,
-               libopencv-dev,
-               libopenshot-audio-dev,
-               libprotobuf-dev,
-               libswscale-dev,
-               libswresample-dev,
-               libzmq3-dev,
-               pkg-config,
-               protobuf-compiler,
-               python3-dev,
-               qtbase5-dev,
-               libqt5svg5-dev,
-               swig
+Build-Depends:
+  cmake,
+  debhelper (>= 9),
+  dh-python,
+  libasound2-dev,
+  libavcodec-dev,
+  libavformat-dev,
+  libavutil-dev,
+  libbabl-dev,
+  libfdk-aac-dev,
+  libjsoncpp-dev,
+  libmagick++-dev,
+  libopencv-dev,
+  libopenshot-audio-dev,
+  libprotobuf-dev,
+  libswscale-dev,
+  libswresample-dev,
+  libzmq3-dev,
+  pkg-config,
+  protobuf-compiler,
+  python3-dev,
+  qtbase5-dev,
+  libqt5svg5-dev,
+  swig
 Build-Depends-Indep: doxygen
 Standards-Version: 3.9.6
 Homepage: http://www.openshot.org/
@@ -32,18 +33,20 @@ Homepage: http://www.openshot.org/
 Package: libopenshot20
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends:
+  ${misc:Depends},
+  ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Replaces: libopenshot19,
-          libopenshot18,
-          libopenshot17,
-          libopenshot16,
-          libopenshot15,
-          libopenshot14,
-          libopenshot13,
-          libopenshot12,
-          libopenshot11
+Replaces:
+  libopenshot19,
+  libopenshot18,
+  libopenshot17,
+  libopenshot16,
+  libopenshot15,
+  libopenshot14,
+  libopenshot13,
+  libopenshot12,
+  libopenshot11
 Description: library for high quality video editing
  Libopenshot is an open-source, cross-platform C++ library dedicated to
  delivering high quality video editing, animation, and playback solutions
@@ -55,8 +58,9 @@ Package: libopenshot-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libopenshot20 (= ${binary:Version}),
-         ${misc:Depends}
+Depends:
+  libopenshot20 (= ${binary:Version}),
+  ${misc:Depends}
 Suggests: libopenshot-doc
 Description: development files for the OpenShot library
  Libopenshot is an open-source, cross-platform C++ library dedicated to
@@ -68,8 +72,9 @@ Description: development files for the OpenShot library
 Package: libopenshot-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery,
-         ${misc:Depends}
+Depends:
+  libjs-jquery,
+  ${misc:Depends}
 Description: documentation of the OpenShot library
  Libopenshot is an open-source, cross-platform C++ library dedicated to
  delivering high quality video editing, animation, and playback solutions
@@ -81,9 +86,10 @@ Package: python3-openshot
 Architecture: any
 Multi-Arch: same
 Section: python
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         ${shlibs:Depends}
+Depends:
+  ${misc:Depends},
+  ${python3:Depends},
+  ${shlibs:Depends}
 Description: Python bindings for the OpenShot library
  Libopenshot is an open-source, cross-platform C++ library dedicated to
  delivering high quality video editing, animation, and playback solutions
diff --git a/libopenshot/debian/rules b/libopenshot/debian/rules
index d184f0d..0461098 100755
--- a/libopenshot/debian/rules
+++ b/libopenshot/debian/rules
@@ -10,6 +10,18 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 # Environment information.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_DISTRIBUTION = $(shell lsb_release -i -s)
+DEB_RELEASE = $(shell lsb_release -c -s)
+
+EXTRA_CMAKE_ARGS =
+BUILD_DOCS = yes
+
+ifeq (Ubuntu,$(DEB_DISTRIBUTION))
+  ifeq (bionic,$(DEB_RELEASE))
+    EXTRA_CMAKE_ARGS = -DENABLE_DOCS=0
+    BUILD_DOCS = no
+  endif
+endif
 
 %:
 	dh $@  
@@ -18,15 +30,24 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
 		-DUSE_SYSTEM_JSONCPP=ON \
-		-DDISABLE_TESTS=1
+		-DBUILD_TESTING=0 $(EXTRA_CMAKE_ARGS)
 
 override_dh_auto_build-indep:
+ifeq (yes,$(BUILD_DOCS))
 	dh_auto_build --indep -- doc
+endif
 
 override_dh_install-arch:
 	dh_install --arch
 	dh_python3 --arch
 
 override_dh_install-indep:
+ifeq (yes,$(BUILD_DOCS))
 	dh_install --indep
 	dh_doxygen --indep
+endif
+
+override_dh_installdocs-indep:
+ifeq (yes,$(BUILD_DOCS))
+	dh_installdocs --indep
+endif