[neon/qt6/qt6-tools/Neon/release] debian: nodoc build

Carlos De Maine null at kde.org
Fri Dec 6 21:24:21 GMT 2024


Git commit 8fbc1db4d3ace77dc2ce181b9e0e26739aca510e by Carlos De Maine.
Committed on 06/12/2024 at 21:23.
Pushed by carlosdem into branch 'Neon/release'.

nodoc build

M  +1    -1    debian/qt6-tools-doc.install
M  +25   -10   debian/rules

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/8fbc1db4d3ace77dc2ce181b9e0e26739aca510e

diff --git a/debian/qt6-tools-doc.install b/debian/qt6-tools-doc.install
index 6a0b95c..d22b0e0 100644
--- a/debian/qt6-tools-doc.install
+++ b/debian/qt6-tools-doc.install
@@ -1 +1 @@
-usr/share/qt6/doc
+#usr/share/qt6/doc
diff --git a/debian/rules b/debian/rules
index f22f5ca..68110eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,23 @@ export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
 #### uncomment when bootstrapping a new qt release ####
 #export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
 
-ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
-override_dh_auto_build-indep:
-	dh_auto_build
+#### uncomment when bootstrapping a new qt release ####
+DEB_BUILD_OPTIONS="nodoc"
+DEB_BUILD_PROFILES="nodoc"
+export DEB_BUILD_OPTIONS DEB_BUILD_PROFILES
 
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
+
+# the next statement obviously has to have inverted logic (new)to work for nodoc as
+# nodoc is not beind added to DEB_BUILD_OPTIONS or DEB_BUILD_PROFILES for some reason
+ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
+	extra_build_args +=
+	extra_install_args +=
+	build_docs += false
+else
+	extra_build_args += docs
+	extra_install_args += install_docs
+	build_docs += true
 endif
 
 # QT_HOST_PATH isn't passed in cross-builds
@@ -38,15 +49,19 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
-
 override_dh_auto_build-indep:
-	dh_auto_build -- docs
+	dh_auto_build -- $(extra_build_args)
 
+ifeq ($(build_docs),true)
 override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install_docs
-	# Remove build path from index files.
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
+	# Remove build path from index files if we are a doc build.
 	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
-                sed -i 's@$(CURDIR)/@@g' {} \;
+		sed -i 's@$(CURDIR)/@@g' {} \;
+else
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- $(extra_install_args)
+endif
 
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info


More information about the Neon-commits mailing list