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

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


Git commit 73d591ad1ee461b33a2a76bc78bc81e379ffaff6 by Carlos De Maine.
Committed on 06/12/2024 at 21:16.
Pushed by carlosdem into branch 'Neon/release'.

nodoc build

M  +1    -1    debian/qt6-declarative-doc.install
M  +23   -13   debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/73d591ad1ee461b33a2a76bc78bc81e379ffaff6

diff --git a/debian/qt6-declarative-doc.install b/debian/qt6-declarative-doc.install
index 8536ff4..36c01e0 100644
--- a/debian/qt6-declarative-doc.install
+++ b/debian/qt6-declarative-doc.install
@@ -1 +1 @@
-usr/share/qt6/doc/
+#usr/share/qt6/doc/
diff --git a/debian/rules b/debian/rules
index 19c613b..afe153d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,15 +6,20 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
 #### 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
-
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+DEB_BUILD_OPTIONS="nodoc"
+DEB_BUILD_PROFILES="nodoc"
+export DEB_BUILD_OPTIONS DEB_BUILD_PROFILES
+
+# the next statement obviously has inverted logic but nodoc is not beind added to
+# DEB_BUILD_OPTIONS 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
@@ -37,13 +42,18 @@ override_dh_auto_configure:
 		$(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
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list