Merge pull request #15 from perl-actions/oalders/makefile

add support for Makefile.PL with and without MANIFEST.SKIP (reworks #12)

Author: oalders

.github/workflows/compile.yml

@@ -30,10 +30,10 @@ jobs:
         run: >
           git config --global user.email "[email protected]" &&
           git config --global user.name "Min Illa"
-      - name: minil tests
-        run: bats -t t/minil_module.bats
-      - name: dzil tests
-        run: bats -t t/dzil_module.bats
+      - name: copy bin files
+        run: cp bin/* /usr/local/bin/
+      - name: bats tests
+        run: bats -v && bats t
         env:
           CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
           COVERALLS_TOKEN: ${{secrets.COVERALLS_TOKEN}}

.gitignore

@@ -4,3 +4,23 @@
 /t/test-data/module-build_module/MANIFEST*
 /t/test-data/module-build_module/Build
 
+/t/test-data/extutils-makemaker-module-with-manifest.skip/Acme-Helpers-*
+/t/test-data/extutils-makemaker-module-with-manifest.skip/MANIFEST
+/t/test-data/extutils-makemaker-module-with-manifest.skip/MYMETA.*
+/t/test-data/extutils-makemaker-module-with-manifest.skip/Makefile
+/t/test-data/extutils-makemaker-module-with-manifest.skip/blib/
+/t/test-data/extutils-makemaker-module-with-manifest.skip/pm_to_blib
+/t/test-data/extutils-makemaker-module-with-manifest.skip/MANIFEST.bak
+/t/test-data/extutils-makemaker-module-with-manifest.skip/build_dir/
+/t/test-data/extutils-makemaker-module-with-manifest.skip/cover_db/
+
+
+/t/test-data/extutils-makemaker-module-with-manifest/Acme-Helpers-*
+/t/test-data/extutils-makemaker-module-with-manifest/MYMETA.*
+/t/test-data/extutils-makemaker-module-with-manifest/Makefile
+/t/test-data/extutils-makemaker-module-with-manifest/blib/
+/t/test-data/extutils-makemaker-module-with-manifest/pm_to_blib
+/t/test-data/extutils-makemaker-module-with-manifest/MANIFEST.bak
+/t/test-data/extutils-makemaker-module-with-manifest/build_dir/
+/t/test-data/extutils-makemaker-module-with-manifest/cover_db/
+

bin/build-dist

@@ -26,6 +26,19 @@ elif [[ -e Build.PL ]]; then
     # the last created dir and use that.
     DIR="$(perl -MModule::Build -e'print Module::Build->resume->dist_dir;')"
     mv "$DIR" "$BUILD_DIR"
+elif [[ -e Makefile.PL ]]; then
+    rm -rf "$BUILD_DIR"
+    perl Makefile.PL
+    make
+    if [[ -e MANIFEST.SKIP ]]; then
+        make manifest
+    fi
+    make distdir
+
+    # same as with minil
+    # shellcheck disable=SC2012
+    DIR=$(ls -td -- */ | head -n 1 | cut -d'/' -f1)
+    mv "$DIR" "$BUILD_DIR"
 fi
 
 exit 0

t/extutils-makemaker-module-with-manifest.bats

@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+
+PATH="$PATH:../../../bin"
+
+setup() {
+  cd t/test-data/extutils-makemaker-module-with-manifest || exit 1
+}
+
+@test "Makefile.PL cpan-install-dist-deps" {
+  run cpan-install-build-deps
+  [ "$status" -eq 0 ]
+}
+
+@test "Makefile.PL build-dist" {
+  run build-dist
+  [ "$status" -eq 0 ]
+}
+
+@test "Makefile.PL test-dist" {
+  run cd build_dir && test-dist
+  [ "$status" -eq 0 ]
+}
+
+@test "Makefile.PL auto-build-and-test-dist" {
+  GITHUB_ACTIONS=${GITHUB_ACTIONS:=''}
+  if [[ $GITHUB_ACTIONS = true ]]; then
+    skip "Tricky to test under CI"
+  fi
+  run rm -rf build_dir && bash auto-build-and-test-dist && rm -rf build_dir
+  [ "$status" -eq 0 ]
+}

t/extutils-makemaker-module-with-manifest.skip.bats

@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+
+PATH="$PATH:../../../bin"
+
+setup() {
+  cd t/test-data/extutils-makemaker-module-with-manifest.skip || exit 1
+}
+
+@test "Makefile.PL cpan-install-dist-deps" {
+  run cpan-install-build-deps
+  [ "$status" -eq 0 ]
+}
+
+@test "Makefile.PL build-dist" {
+  run build-dist
+  [ "$status" -eq 0 ]
+}
+
+@test "Makefile.PL test-dist" {
+  run cd build_dir && test-dist
+  [ "$status" -eq 0 ]
+}
+
+@test "Makefile.PL auto-build-and-test-dist" {
+  GITHUB_ACTIONS=${GITHUB_ACTIONS:=''}
+  if [[ $GITHUB_ACTIONS = true ]]; then
+    skip "Tricky to test under CI"
+  fi
+  run rm -rf build_dir && bash auto-build-and-test-dist && rm -rf build_dir
+  [ "$status" -eq 0 ]
+}

t/test-data/extutils-makemaker-module-with-manifest.skip/MANIFEST.SKIP

@@ -0,0 +1,19 @@
+.*\.gz
+\.git/
+blib/
+MANIFEST.bak
+MANIFEST.SKIP
+pm_to_blib
+Makefile$
+.gitignore
+^eg/.*
+.travis.yml
+README.md
+.vscode/
+.*\.db
+MYMETA.*
+\.github/.*
+docs/.*
+cover_db/.*
+
+Acme-Helpers-.*

t/test-data/extutils-makemaker-module-with-manifest.skip/Makefile.PL

@@ -0,0 +1,11 @@
+use strict;
+use warnings;
+
+use ExtUtils::MakeMaker;
+WriteMakefile(
+    NAME          => 'Acme::Helpers',
+    AUTHOR        => 'Gabor Szabo <[email protected]>',
+    VERSION       => '1.00',
+    ABSTRACT      => 'Acme',
+    LICENSE       => 'perl',
+);

t/test-data/extutils-makemaker-module-with-manifest.skip/lib/Acme/Helpers.pm

@@ -0,0 +1,14 @@
+package Acme::Helpers;
+
+use strict;
+use warnings;
+
+our $VERSION = '0.01';
+
+sub true {
+    return 1;
+}
+
+1;
+
+# ABSTRACT: turns baubles into trinkets

t/test-data/extutils-makemaker-module-with-manifest.skip/t/load.t

@@ -0,0 +1,9 @@
+use strict;
+use warnings;
+
+use Test::More;
+
+use Acme::Helpers ();
+ok( Acme::Helpers::true() );
+
+done_testing();

t/test-data/extutils-makemaker-module-with-manifest/MANIFEST

@@ -0,0 +1,4 @@
+lib/Acme/Helpers.pm
+Makefile.PL
+MANIFEST			This list of files
+t/load.t