From nobody Mon May 6 17:28:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526406870403258.92996981648616; Tue, 15 May 2018 10:54:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B44EE300194E; Tue, 15 May 2018 17:54:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E92D96017F; Tue, 15 May 2018 17:54:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E00AE4BB78; Tue, 15 May 2018 17:54:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4FHsMEx006859 for ; Tue, 15 May 2018 13:54:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE3E52166BC7; Tue, 15 May 2018 17:54:22 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12B412166BAD; Tue, 15 May 2018 17:54:19 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 15 May 2018 18:54:19 +0100 Message-Id: <20180515175419.17095-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [perl PATCH v2] Switch over to using Module::Build X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Tue, 15 May 2018 17:54:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The Module::Build system is nicer than ExtUtils::MakeMaker as it allows for better cross-platform portability by only relying on Perl, rather than both Perl and system 'make' binary. Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitignore | 17 +++---- Build.PL | 102 +++++++++++++++++++++++++++++++++++++ MANIFEST | 73 ++++++++++++++++++++++++++ MANIFEST.SKIP | 20 -------- META.yml.PL | 55 -------------------- Makefile.PL | 85 ------------------------------- Virt.xs =3D> lib/Sys/Virt.xs | 0 perl-Sys-Virt.spec.PL | 45 ++++++++-------- prepare-release.sh | 48 +++-------------- t/030-api-coverage.t | 2 +- 10 files changed, 210 insertions(+), 237 deletions(-) create mode 100755 Build.PL create mode 100644 MANIFEST delete mode 100644 MANIFEST.SKIP delete mode 100644 META.yml.PL delete mode 100644 Makefile.PL rename Virt.xs =3D> lib/Sys/Virt.xs (100%) diff --git a/.gitignore b/.gitignore index dc0ba62..3f08c79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,12 @@ -*.swp *~ -MANIFEST META.yml +META.json MYMETA.* -Makefile -Makefile.old +Makefile.PL Sys-Virt-*.tar.gz -Virt.bs -Virt.c -Virt.o blib/ -cover_db perl-Sys-Virt.spec -pm_to_blib -results.log -tags +lib/Sys/Virt\.c +lib/Sys/Virt\.o +_build/ +Build diff --git a/Build.PL b/Build.PL new file mode 100755 index 0000000..13a0e4f --- /dev/null +++ b/Build.PL @@ -0,0 +1,102 @@ +#!/usr/bin/perl +# +# Copyright (C) 2009-2018 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +use Module::Build; + +use strict; +use warnings; + +my $libvirtver =3D "4.4.0"; +my $stat =3D system "pkg-config --atleast-version=3D$libvirtver libvirt"; +die "cannot run pkg-config to check libvirt version" if $stat =3D=3D -1; +die "libvirt >=3D $libvirtver is required\n" unless $stat =3D=3D 0; + +my $LIBVIRT_LIBS =3D `pkg-config --libs libvirt`; +my $LIBVIRT_CFLAGS =3D `pkg-config --cflags libvirt`; + +my $GCC_CFLAGS =3D ""; +if ($ENV{TEST_MAINTAINER}) { + $GCC_CFLAGS =3D qq( + -W -Waddress -Wall -Warray-bounds -Wattributes + -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align + -Wchar-subscripts -Wclobbered -Wcomment -Wcomments + -Wcoverage-mismatch -Wcpp -Wdeprecated-declarations + -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion + -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul + -Wformat-extra-args -Wformat-security -Wformat-y2k + -Wformat-zero-length -Wformat=3D2 -Wfree-nonheap-object + -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration + -Wimplicit-int -Winit-self -Wint-to-pointer-cast + -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init + -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmissing-braces + -Wmissing-declarations -Wmissing-field-initializers + -Wmissing-format-attribute -Wmissing-include-dirs + -Wmissing-noreturn -Wmissing-parameter-type + -Wmultichar -Wnarrowing -Wnonnull + -Wnormalized=3Dnfc -Wold-style-declaration -Wold-style-definition + -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses + -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas + -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing + -Wstrict-prototypes -Wsuggest-attribute=3Dconst + -Wsuggest-attribute=3Dnoreturn -Wsuggest-attribute=3Dpure -Wswitch + -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized + -Wunknown-pragmas -Wunused -Wunused-but-set-parameter + -Wunused-but-set-variable -Wunused-function -Wunused-label + -Wunused-local-typedefs -Wno-unused-parameter -Wunused-result + -Wunused-value -Wunused-variable -Wvariadic-macros + -Wvector-operation-performance -Wvolatile-register-var + -Wwrite-strings -Wno-sign-compare -Wjump-misses-init + -Wno-format-nonliteral -Wframe-larger-than=3D8192 + -Wno-suggest-attribute=3Dpure -Wno-suggest-attribute=3Dconst + -Wno-cast-function-type + ); +} + +my $b =3D Module::Build->new( + module_name =3D> "Sys::Virt", + license =3D> 'gpl', + configure_requires =3D> { + 'Module::Build' =3D> 0, + }, + create_makefile_pl =3D> 'small', + dist_author =3D> 'Daniel Berrange ', + dist_abstract =3D> 'libvirt Perl API', + requires =3D> { + 'perl' =3D> '5.8.0', + }, + extra_compiler_flags =3D> $GCC_CFLAGS . $LIBVIRT_CFLAGS, + extra_linker_flags =3D> $LIBVIRT_LIBS, + build_requires =3D> { + 'ExtUtils::CBuilder' =3D> 0, + 'Sys::Hostname' =3D> 0, + 'Test::CPAN::Changes' =3D> 0, + 'Test::More' =3D> 0, + 'Test::Pod' =3D> '0', + 'Test::Pod::Coverage' =3D> '0', + 'Time::HiRes' =3D> 0, + 'XML::XPath' =3D> 0, + 'XML::XPath::XMLParser' =3D> 0, + }, + script_files =3D> [], + meta_add =3D> { + resources =3D> { + license =3D> "http://www.gnu.org/licenses/gpl.html", + homepage =3D> "http://libvirt.org/", + repository =3D> "https://libvirt.org/git/?p=3Dlibvirt-perl.git= ;a=3Dsummary", + MailingList =3D> "http://www.redhat.com/mailman/listinfo/libvi= r-list", + }, + }, + PL_files =3D> { 'perl-Sys-Virt.spec.PL' =3D> 'perl-Sys-Virt.spec' }, + ); +$b->create_build_script; diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..3840a5c --- /dev/null +++ b/MANIFEST @@ -0,0 +1,73 @@ +.gitignore +.gitpublish +AUTHORS +Build.PL +Changes +HACKING +INSTALL +LICENSE +README +examples/auth.pl +examples/devices.pl +examples/dhcp-leases.pl +examples/dom-fsinfo.pl +examples/dom-ifinfo.pl +examples/dom-migrate.pl +examples/dom-stats.pl +examples/dump-info.pl +examples/dump-xml.pl +examples/emulator-pin.pl +examples/events.pl +examples/fs-freeze.pl +examples/hv-stat.pl +examples/iothreadinfo.pl +examples/node-alloc.pl +examples/node-cpu.pl +examples/node-devlist.pl +examples/node-info.pl +examples/node-ksm.pl +examples/open-console.pl +examples/save-restore.pl +examples/send-key.pl +examples/vcpuinfo.pl +examples/vol-download-all.pl +examples/vol-download-nonblock.pl +examples/vol-download.pl +examples/vol-sparse.pl +examples/vol-upload-all.pl +examples/vol-upload-nonblock.pl +examples/vol-upload.pl +lib/Sys/Virt.pm +lib/Sys/Virt.xs +lib/Sys/Virt/Domain.pm +lib/Sys/Virt/DomainSnapshot.pm +lib/Sys/Virt/Error.pm +lib/Sys/Virt/Event.pm +lib/Sys/Virt/Interface.pm +lib/Sys/Virt/NWFilter.pm +lib/Sys/Virt/Network.pm +lib/Sys/Virt/NodeDevice.pm +lib/Sys/Virt/Secret.pm +lib/Sys/Virt/StoragePool.pm +lib/Sys/Virt/StorageVol.pm +lib/Sys/Virt/Stream.pm +perl-Sys-Virt.spec +perl-Sys-Virt.spec.PL +prepare-release.sh +Makefile.PL +t/005-pod.t +t/010-pod-coverage.t +t/015-changes.t +t/020-constants.t +t/030-api-coverage.t +t/100-connect.t +t/200-domains.t +t/300-networks.t +t/400-storage-pools.t +t/500-storage-vols.t +t/600-interfaces.t +t/800-events.t +typemap +Makefile.PL +META.yml +META.json diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index ebce958..0000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,20 +0,0 @@ -pm_to_blib -Virt\.o -Virt\.c -Virt\.bs -Virt\.xsc -.*.old -Sys-Virt- -blib -.*\.bak -CVS -.cvsignore -.*~ -.#.* -#.* -^Makefile$ -^cover_db/ -.hg -.*\.orig -.*\.sh -\.git diff --git a/META.yml.PL b/META.yml.PL deleted file mode 100644 index 0467309..0000000 --- a/META.yml.PL +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (C) 2008 Daniel Berrange - -use strict; -use warnings; - -die unless (scalar @ARGV =3D=3D 1); - -open SRC, "lib/Sys/Virt.pm" - or die "lib/Sys/Virt.pm: $!"; - -our $VERSION; -while () { - if (/\$VERSION\s*=3D\s*'(.*)'/) { - $VERSION=3D$1; - } -} -close SRC; - -local $/ =3D undef; -$_ =3D ; -s/\@VERSION\@/$VERSION/g; - -open SPEC, ">$ARGV[0]" or die "$!"; -print SPEC $_; -close SPEC; -__DATA__ ---- #YAML:1.0 -name: Sys-Virt -abstract: Extension for the libvirt library -version: @VERSION@ -author: - - Daniel P. Berrange -license: perl -generated_by: ExtUtils::MakeMaker version 6.30 -build_requires: - Test::More: 0 - Test::Pod: 0 - Test::Pod::Coverage: 0 - Test::CPAN::Changes: 0 - XML::XPath: 0 - XML::XPath::XMLParser: 0 - Sys::Hostname: 0 - Time::HiRes: 0 - -resources: - license: http://dev.perl.org/licenses/ - homepage: http://libvirt.org/ - repository: http://libvirt.org/git/?p=3Dlibvirt-perl.git;a=3Dsummary - MailingList: http://www.redhat.com/mailman/listinfo/libvir-list - -distribution_type: module - -meta-spec: - version: 1.3 - url: http://module-build.sourceforge.net/META-spec-v1.3.html diff --git a/Makefile.PL b/Makefile.PL deleted file mode 100644 index f72e210..0000000 --- a/Makefile.PL +++ /dev/null @@ -1,85 +0,0 @@ -use 5.006; -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile that is written. - -my $libvirtver =3D "4.4.0"; -my $stat =3D system "pkg-config --atleast-version=3D$libvirtver libvirt"; -die "cannot run pkg-config to check libvirt version" if $stat =3D=3D -1; -die "libvirt >=3D $libvirtver is required\n" unless $stat =3D=3D 0; - -my $LIBVIRT_LIBS =3D `pkg-config --libs libvirt`; -my $LIBVIRT_CFLAGS =3D `pkg-config --cflags libvirt`; - -my $gccflags =3D "-W -Waddress -Wall -Warray-bounds -Wattributes \\ - -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align \\ - -Wchar-subscripts -Wclobbered -Wcomment -Wcomments \\ - -Wcoverage-mismatch -Wcpp -Wdeprecated-declarations \\ - -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion \\ - -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul \\ - -Wformat-extra-args -Wformat-security -Wformat-y2k \\ - -Wformat-zero-length -Wformat=3D2 -Wfree-nonheap-object \\ - -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration \\ - -Wimplicit-int -Winit-self -Wint-to-pointer-cast \\ - -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init \\ - -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmissing-braces \\ - -Wmissing-declarations -Wmissing-field-initializers \\ - -Wmissing-format-attribute -Wmissing-include-dirs \\ - -Wmissing-noreturn -Wmissing-parameter-type \\ - -Wmultichar -Wnarrowing -Wnonnull \\ - -Wnormalized=3Dnfc -Wold-style-declaration -Wold-style-definition \\ - -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses \\ - -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas \\ - -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing \\ - -Wstrict-prototypes -Wsuggest-attribute=3Dconst \\ - -Wsuggest-attribute=3Dnoreturn -Wsuggest-attribute=3Dpure -Wswitch \\ - -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized \\ - -Wunknown-pragmas -Wunused -Wunused-but-set-parameter \\ - -Wunused-but-set-variable -Wunused-function -Wunused-label \\ - -Wunused-local-typedefs -Wno-unused-parameter -Wunused-result \\ - -Wunused-value -Wunused-variable -Wvariadic-macros \\ - -Wvector-operation-performance -Wvolatile-register-var \\ - -Wwrite-strings -Wno-sign-compare -Wjump-misses-init \\ - -Wno-format-nonliteral -Wframe-larger-than=3D8192 \\ - -Wno-suggest-attribute=3Dpure -Wno-suggest-attribute=3Dconst -Werror"; - -my $cflags; -if ($ENV{TEST_MAINTAINER}) { - $cflags =3D $gccflags; -} else { - $cflags =3D "-Wall"; -} - -WriteMakefile( - 'NAME' =3D> 'Sys::Virt', - 'VERSION_FROM' =3D> 'lib/Sys/Virt.pm', - 'PREREQ_PM' =3D> { - 'Test::More' =3D> 0, - 'Test::Pod' =3D> 0, - 'Test::Pod::Coverage' =3D> 0, - 'Test::CPAN::Changes' =3D> 0, - 'Time::HiRes' =3D> 0, - 'XML::XPath' =3D> 0, - }, - 'AUTHOR' =3D> 'Daniel Berrange ', - 'LIBS' =3D> [$LIBVIRT_LIBS], - 'INC' =3D> "$cflags $LIBVIRT_CFLAGS", - 'depend' =3D> { - Sys-Virt.spec =3D> '$(VERSION_FROM)', - Makefile =3D> '$(VERSION_FROM)', - }, - 'NO_META' =3D> 1, - 'realclean' =3D> { - FILES =3D> 'Sys-Virt.spec', - }, -); - -package MY; - -sub libscan - { - my ($self, $path) =3D @_; - ($path =3D~ /\~$/ || $path =3D~ m,/CVS/,) ? undef : $path; - } - -__END__ diff --git a/Virt.xs b/lib/Sys/Virt.xs similarity index 100% rename from Virt.xs rename to lib/Sys/Virt.xs diff --git a/perl-Sys-Virt.spec.PL b/perl-Sys-Virt.spec.PL index ffa6c86..e7b4044 100644 --- a/perl-Sys-Virt.spec.PL +++ b/perl-Sys-Virt.spec.PL @@ -6,15 +6,19 @@ use strict; =20 die unless (scalar @ARGV =3D=3D 1); =20 -unless (do './lib/Sys/Virt.pm') - { - if ($@) { die $@ }; - die "lib/Sys/Virt.pm: $!"; - } +open PM, './lib/Sys/Virt.pm' or die "lib/Sys/Virt.pm: $!"; +my $ver; +while () { + if (/our \$VERSION =3D '(.*)'/) { + $ver =3D $1; + last; + } +} +die "cannot find version" unless $ver; =20 local $/ =3D undef; $_ =3D ; -s/\@VERSION\@/$Sys::Virt::VERSION/g; +s/\@VERSION\@/$ver/g; =20 open SPEC, ">$ARGV[0]" or die "$!"; print SPEC $_; @@ -29,9 +33,10 @@ Summary: Represent and manage a libvirt hyperviso= r connection License: GPLv2+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sys-Virt/ -Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{ver= sion}.tar.gz +Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-v%{ve= rsion}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}= -n) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::CBuilder) +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::CPAN::Changes) @@ -46,32 +51,24 @@ machine management APIs. This allows machines running w= ithin arbitrary virtualization containers to be managed with a consistent API. =20 %prep -%setup -q -n Sys-Virt-%{version} +%setup -q -n Sys-Virt-v%{version} =20 -sed -i -e '/Sys-Virt\.spec/d' Makefile.PL -sed -i -e '/\.spec\.PL$/d' MANIFEST -rm -f *.spec.PL =20 %build -%{__perl} Makefile.PL INSTALLDIRS=3Dvendor OPTIMIZE=3D"$RPM_OPT_FLAGS" -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=3Dvendor +./Build =20 %install -rm -rf $RPM_BUILD_ROOT +./Build install destdir=3D$RPM_BUILD_ROOT create_packlist=3D0 =20 -make pure_install PERL_INSTALL_ROOT=3D$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f \( -name .packlist -o -name '*.bs' -empty \) | - xargs rm -f -find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \; +#find $RPM_BUILD_ROOT -type f \( -name .packlist -o -name '*.bs' -empty \)= | +# xargs rm -f +#find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \; =20 %{_fixperms} $RPM_BUILD_ROOT/* =20 %check -make test - -%clean -rm -rf $RPM_BUILD_ROOT +./Build test =20 %files %defattr(-,root,root,-) diff --git a/prepare-release.sh b/prepare-release.sh index fea03f4..6850350 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -4,52 +4,18 @@ NAME=3DSys-Virt =20 set -e =20 -test -n "$1" && RESULTS=3D$1 || RESULTS=3Dresults.log +rm -rf blib _build Build $NAME-*.tar.gz =20 -make -k realclean ||: -rm -rf MANIFEST blib pm_to_blib +test -z "$AUTOBUILD_INSTALL_ROOT" && AUTOBUILD_INSTALL_ROOT=3D$HOME/builder =20 export TEST_MAINTAINER=3D1 =20 -perl Makefile.PL PREFIX=3D$HOME/builder +perl Build.PL install_base=3D$AUTOBUILD_INSTALL_ROOT =20 -rm -f MANIFEST - -# Build the RPM. -make -make manifest - -if [ -z "$USE_COVER" ]; then - perl -MDevel::Cover -e '' 1>/dev/null 2>&1 && USE_COVER=3D1 || USE_COVER= =3D0 -fi - -if [ -z "$SKIP_TESTS" -o "$SKIP_TESTS" =3D "0" ]; then - if [ "$USE_COVER" =3D "1" ]; then - cover -delete - export HARNESS_PERL_SWITCHES=3D-MDevel::Cover - fi - - # set -o pipefail is a bashism; this use of exec is the POSIX alternative - exec 3>&1 - st=3D$( - exec 4>&1 >&3 - { make test 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS" - ) - exec 3>&- - test "$st" =3D 0 - - if [ "$USE_COVER" =3D "1" ]; then - cover - mkdir blib/coverage - cp -a cover_db/*.html cover_db/*.css blib/coverage - mv blib/coverage/coverage.html blib/coverage/index.html - fi -fi - -make install - -rm -f $NAME-*.tar.gz -make dist +./Build +./Build test +./Build install +./Build dist =20 if [ -f /usr/bin/rpmbuild ]; then rpmbuild --nodeps -ta --clean $NAME-*.tar.gz diff --git a/t/030-api-coverage.t b/t/030-api-coverage.t index 95bbd11..39d6146 100644 --- a/t/030-api-coverage.t +++ b/t/030-api-coverage.t @@ -48,7 +48,7 @@ foreach my $n ($set->get_nodelist) { push @macros, $n->getData(); } =20 -open XS, "