[Git][haskell-team/haskell-devscripts][master] 2 commits: Re-add separate configure/check/haddock targets (Closes: #1011762,

[Scott Talbert (@swt2c)]

Scott Talbert pushed to branch master at Debian Haskell Group / haskell-devscripts


Commits:
3061a1b8 by Scott Talbert at 2022-05-31T21:57:16-04:00
Re-add separate configure/check/haddock targets (Closes: #1011762,
bug#1011767, #1011764, #1011834, #1011873, #1011877, #1011915, #1011860,
bug#1011855, #1011910, #1011896)

- - - - -
59e4513d by Scott Talbert at 2022-05-31T22:57:27-04:00
Release version 0.16.18 into unstable

- - - - -


2 changed files:

- debian/changelog
- hlibrary.mk


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+haskell-devscripts (0.16.18) unstable; urgency=medium
+
+  * Team Upload.
+  * Re-add separate configure/check/haddock targets (Closes: #1011762,
+    #1011767, #1011764, #1011834, #1011873, #1011877, #1011915, #1011860,
+    #1011855, #1011910, #1011896)
+
+ -- Scott Talbert <swt at techie.net>  Tue, 31 May 2022 22:57:07 -0400
+
 haskell-devscripts (0.16.17) unstable; urgency=medium
 
   * Team Upload.


=====================================
hlibrary.mk
=====================================
@@ -138,7 +138,9 @@ export GHC_HAS_SMP
 clean::
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
 		-E 'clean_recipe'
-	rm -f build-ghc-stamp build-hugs-stamp
+	rm -f configure-ghc-stamp
+	rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp
+	rm -f check-ghc-stamp
 	rm -f debian/tmp
 	rm -rf debian/tmp-inst-ghc debian/tmp-inst-ghcjs
 	rm -rf $(DEB_GHC_DATABASE)
@@ -149,12 +151,29 @@ $(DEB_SETUP_BIN_NAME):
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
 		-E 'make_setup_recipe'
 
-build-ghc-stamp: $(DEB_SETUP_BIN_NAME)
+configure-ghc-stamp: $(DEB_SETUP_BIN_NAME)
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
-		-E 'configure_recipe; haddock_recipe; build_recipe; check_recipe'
+		-E 'configure_recipe'
 	touch $@
 
-build/%-dev build/%-prof build/%-doc:: build-ghc-stamp
+build-ghc-stamp: configure-ghc-stamp
+	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
+		-E 'build_recipe'
+	touch $@
+
+check-ghc-stamp: build-ghc-stamp
+	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
+		-E 'check_recipe'
+	touch $@
+
+build/%-dev build/%-prof:: build-ghc-stamp check-ghc-stamp
+
+build-haddock-stamp:
+	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
+		-E 'haddock_recipe'
+	touch $@
+
+build/%-doc:: configure-ghc-stamp build-haddock-stamp
 
 debian/tmp-inst-%: $(DEB_SETUP_BIN_NAME) build-ghc-stamp
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
@@ -183,7 +202,7 @@ install/libghc-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghc
 	dh_haskell_depends_cabal --package=$(notdir $@) --config-shipper="libghc-$(CABAL_PACKAGE)-dev"
 	dh_haskell_blurbs --package=$(notdir $@) --type=prof
 
-install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc
+install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc build-haddock-stamp
 	dh_haskell_install_htmldocs --package=$(notdir $@) --source-dir="$<"
 	dh_haskell_install_haddock --package=$(notdir $@) --source-dir="$<"
 	dh_haskell_depends_haddock --package=$(notdir $@)
@@ -206,7 +225,7 @@ install/libghcjs-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghcjs
 	dh_haskell_depends_cabal --package=$(notdir $@) --config-shipper="libghc-$(CABAL_PACKAGE)-dev"
 	dh_haskell_blurbs --package=$(notdir $@) --type=prof
 
-install/libghcjs-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghcjs
+install/libghcjs-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghcjs build-haddock-stamp
 	dh_haskell_install_htmldocs --package=$(notdir $@) --source-dir="$<"
 	dh_haskell_install_haddock --package=$(notdir $@) --source-dir="$<"
 	dh_haskell_depends_haddock --package=$(notdir $@)



View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/compare/c8d1925146acd0d23983eca92a0e054d95798915...59e4513d6c349e1079aae9c8af0784976e386fb9

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/compare/c8d1925146acd0d23983eca92a0e054d95798915...59e4513d6c349e1079aae9c8af0784976e386fb9
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-haskell-commits/attachments/20220601/0f0d0a46/attachment-0001.htm>