From 07cdae61d128d9aea822554ee080509524cdafdd Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Wed, 17 Aug 2022 21:47:35 +0200 Subject: Revamp d/rules in order to _actually_ build the "user version" --- debian/rules | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f4dead2b..44c42084 100755 --- a/debian/rules +++ b/debian/rules @@ -46,20 +46,21 @@ execute_before_dh_auto_configure: done override_dh_auto_configure: - dh_auto_configure $(DHFLAGS) --builddirectory=build/userversion -- -DWITH_GUDHI_BENCHMARK=true -DWITH_GUDHI_EXAMPLE=true -DWITH_GUDHI_PYTHON=false -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=true $(HERA_FLAGS) + dh_auto_configure $(DHFLAGS) --sourcedir=build/userversion --builddirectory=build/userversion/build -- -DWITH_GUDHI_BENCHMARK=true -DWITH_GUDHI_EXAMPLE=true -DWITH_GUDHI_PYTHON=false -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=true $(HERA_FLAGS) for py3ver in $(PY3VERS) ; do \ - dh_auto_configure $(DHFLAGS) --builddirectory=build-py$$py3ver/userversion -- -DWITH_GUDHI_BENCHMARK=false -DWITH_GUDHI_EXAMPLE=false -DWITH_GUDHI_PYTHON=true -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=false -DPython_ADDITIONAL_VERSIONS=$$py3ver -DWITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS=false $(HERA_FLAGS) ; \ + dh_auto_configure $(DHFLAGS) --sourcedir=build-py$$py3ver/userversion --builddirectory=build-py$$py3ver/userversion/build -- -DWITH_GUDHI_BENCHMARK=false -DWITH_GUDHI_EXAMPLE=false -DWITH_GUDHI_PYTHON=true -DWITH_GUDHI_TEST=true -DWITH_GUDHI_UTILITIES=false -DPython_ADDITIONAL_VERSIONS=$$py3ver -DWITH_GUDHI_PYTHON_RUNTIME_LIBRARY_DIRS=false $(HERA_FLAGS) ; \ done override_dh_auto_build-arch: - dh_auto_build $(DHFLAGS) --builddirectory=build/userversion + dh_auto_build $(DHFLAGS) --sourcedir=build/userversion --builddirectory=build/userversion/build for py3ver in $(PY3VERS) ; do \ - cd build-py$$py3ver/userversion/src/python ; \ + cd build-py$$py3ver/userversion/build/python ; \ /usr/bin/python$$py3ver setup.py build ; \ done override_dh_auto_build-indep: - make -C build/userversion doxygen + cd build/userversion/build ; \ + make doxygen override_dh_auto_test-indep: @@ -67,15 +68,15 @@ override_dh_auto_test-arch: # I believe this should be handled automatically by dh_auto_test, # but see #901678. ifeq (, $(filter nocheck,$(DEB_BUILD_MAINT_OPTIONS))) - dh_auto_test $(DHFLAGS) --no-parallel --builddirectory=build/userversion + dh_auto_test $(DHFLAGS) --no-parallel --sourcedir=build/userversion --builddirectory=build/userversion/build else @echo "Skipping tests due to nocheck flag." endif override_dh_auto_install-arch: - dh_auto_install $(DHFLAGS) --builddirectory=build/userversion + dh_auto_install $(DHFLAGS) --sourcedir=build/userversion --builddirectory=build/userversion/build for py3ver in $(PY3VERS) ; do \ - cd build-py$$py3ver/userversion/src/python ; \ + cd build-py$$py3ver/userversion/build/python ; \ /usr/bin/python$$py3ver setup.py install --root=../../../../debian/tmp --single-version-externally-managed --install-layout=deb ; \ done @@ -130,6 +131,11 @@ override_dh_missing: override_dh_python3: for py3ver in $(PY3VERS) ; do \ - dh_python3 -O--builddirectory=build-py$$py3ver/userversion ; \ + dh_python3 -O--sourcedir=build-py$$py3ver/userversion ; \ done +execute_before_dh_auto_clean: + rm -rf build + for py3ver in $(PY3VERS) ; do \ + rm -rf build-py$$py3ver ; \ + done -- cgit v1.2.3