[Git][haskell-team/dh-haskell][history] 2 commits: Use Perl recipes directly instead of going through the Dh_Haskell.sh shell library.

[Felix Lechner (@lechner)]

Felix Lechner pushed to branch history at Debian Haskell Group / dh-haskell


Commits:
58669c4a by Felix Lechner at 2022-03-07T17:39:00-08:00
Use Perl recipes directly instead of going through the Dh_Haskell.sh shell library.

- - - - -
172c92c6 by Felix Lechner at 2022-04-04T14:10:38-07:00
Bump Debhelper level to 13.

- - - - -


2 changed files:

- debian/control
- lib/Debian/Debhelper/Buildsystem/haskell.pm


Changes:

=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Felix Lechner <felix.lechner at lease-up.com>
 Build-Depends:
- debhelper-compat (= 10),
+ debhelper-compat (= 13),
  libmodule-install-perl
 Rules-Requires-Root: no
 Standards-Version: 4.6.0
@@ -20,7 +20,7 @@ Depends:
  ${perl:Depends},
  ${shlibs:Depends},
  debhelper (>= 9.20151220),
- haskell-devscripts,
+ haskell-devscripts (>= 0.16.3~),
  libconst-fast-perl,
  libipc-run3-perl,
  liblist-someutils-perl,


=====================================
lib/Debian/Debhelper/Buildsystem/haskell.pm
=====================================
@@ -52,6 +52,9 @@ use IPC::Run3;
 use List::SomeUtils qw(any);
 use Path::Tiny;
 
+use Debian::Debhelper::Buildsystem::Haskell::Recipes
+  qw(make_setup_recipe configure_recipe build_recipe clean_recipe);
+
 const my $SPACE => q{ };
 const my $DOT => q{.};
 
@@ -170,8 +173,8 @@ sub new {
 sub configure {
     my ($self) = @_;
 
-    $self->library_function('make_setup_recipe');
-    $self->library_function('configure_recipe');
+    make_setup_recipe();
+    configure_recipe();
 
     return;
 
@@ -180,7 +183,7 @@ sub configure {
 sub build {
     my ($self) = @_;
 
-    $self->library_function('build_recipe');
+    build_recipe();
 
     return;
 }
@@ -203,25 +206,11 @@ sub install {
 sub clean {
     my ($self) = @_;
 
-    $self->library_function('clean_recipe');
+    clean_recipe();
 
     return;
 }
 
-sub library_function {
-    my ($self, $recipe) = @_;
-
-    my $LIBRARY = '/usr/share/haskell-devscripts/Dh_Haskell.sh';
-
-    my @command = ('bash', '-c', "source $LIBRARY && $recipe");
-    run3(\@command);
-
-    my $exitcode = $?;
-    my $status = ($exitcode >> $WAIT_STATUS_SHIFT);
-
-    return $status;
-}
-
 1;
 
 # Local Variables:



View it on GitLab: https://salsa.debian.org/haskell-team/dh-haskell/-/compare/a7e53df6733758a32d37dbcd0a1c4e8937ba853d...172c92c6301427b5dccb11abe71ae784a6761536

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/dh-haskell/-/compare/a7e53df6733758a32d37dbcd0a1c4e8937ba853d...172c92c6301427b5dccb11abe71ae784a6761536
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/20220405/c861cea9/attachment-0001.htm>