[Git][java-team/zookeeper][master] 2 commits: Writing appropriated overrides for -arch and -indep packages so that...

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / zookeeper


Commits:
c2cc9388 by Pierre Gruet at 2022-06-29T17:47:34+02:00
Writing appropriated overrides for -arch and -indep packages so that arch-dependent packages can be built on buildds

- - - - -
9b3822ba by Pierre Gruet at 2022-06-29T17:47:56+02:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+zookeeper (3.8.0-2) unstable; urgency=medium
+
+  * Team upload
+  * Making appropriate overrides for -arch and -indep in d/rules so that
+    builds of architecture-dependent packages only succeed
+
+ -- Pierre Gruet <pgt at debian.org>  Wed, 29 Jun 2022 17:47:37 +0200
+
 zookeeper (3.8.0-1) unstable; urgency=medium
 
   * Team upload


=====================================
debian/rules
=====================================
@@ -7,24 +7,43 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 %:
 	dh $@ --with javahelper --with python3
 
-override_dh_auto_build:
+# The configure step is handled through Maven for -arch and -indep builds.
+# It has to be run only once.
+override_dh_auto_configure-arch override_dh_auto_configure-indep:
+	if [ ! -f debian/mavenConfigureDone ]; then \
+	        /usr/share/maven-debian-helper/copy-repo.sh $$(readlink -f debian) && \
+	        mh_patchpoms -plibzookeeper-java --debian-build --keep-pom-version --maven-repo=$$(readlink -f debian/maven-repo) && \
+	        touch debian/mavenConfigureDone; \
+	fi
+
+override_dh_auto_build-indep:
 	dh_auto_build -- package javadoc:jar javadoc:aggregate -Pfull-build
-	
-	# Build Python Bindings
+
+# Running the Java build first, as it also builds the C++ part.
+override_dh_auto_build-arch: override_dh_auto_build-indep
+	# Build Python bindings in addition
 	cd zookeeper-contrib/zookeeper-contrib-zkpython && \
 	        python3 src/python/setup.py build --build-base=$(CURDIR)/build
 
-override_dh_auto_install:
-	dh_auto_install -- -Pfull-build
+# Empty override: no need to call the Maven stuff for the arch-dependent packages
+override_dh_auto_install-arch:
 
-override_dh_install:
+override_dh_auto_install-indep:
+	dh_auto_install -i -- -Pfull-build
+
+override_dh_install-arch:
 	# Installing the Python artifacts in debian/tmp before calling dh_install
 	cd zookeeper-contrib/zookeeper-contrib-zkpython && \
 	        python3 src/python/setup.py build --build-base=$(CURDIR)/build \
 	                install --root=$(CURDIR)/debian/tmp --install-layout=deb ;\
 	
-	dh_install
+	dh_install -a
+
+# Empty override for the -arch part, as we currently run no tests othen than
+# the Java ones. See the commented block below for some perspective.
+override_dh_auto_test-arch:
 
+# In former versions a test could be run for the -arch part. To be reworked.
 #ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 ## Limit architectures which execute tests as some
 ## non x86 archs can be a bit racey.
@@ -62,6 +81,7 @@ override_dh_auto_clean:
 	-rm -rf zookeeper-client/zookeeper-client-c/configure
 	-rm -rf zookeeper-client/zookeeper-client-c/ltmain.sh
 	-rm -rf zookeeper-client/zookeeper-client-c/TEST-*
+	-rm debian/mavenConfigureDone
 
 override_dh_installinit:
 	dh_installinit --name=zookeeper



View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/compare/348282040939e3d189245360c32c3a3185b058b0...9b3822ba271b94cd5ab34373d50ff8c9ce79a6e2

-- 
View it on GitLab: https://salsa.debian.org/java-team/zookeeper/-/compare/348282040939e3d189245360c32c3a3185b058b0...9b3822ba271b94cd5ab34373d50ff8c9ce79a6e2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220629/4639e3be/attachment.htm>