Attachment #358182 for bug #484038

View | Details | Raw Unified | Return to bug 484038
Collapse All | Expand All




++ b/Makefile.PL


}

use lib qw(lib);

use Config;
use File::Spec::Functions;

}

sub configure {

    # mod_perl test suite relies on having Apache-Test bundled with
    # the mod_perl source, since any pre-installed version may not do
    # the right thing
    unless (-d "Apache-Test") {
        error "Can't find a sub-directory Apache-Test. " .
            "Make sure that you are using a complete source distribution";
        exit 1;
    }

    set_modperl_version();

    if ($old_modperl_version) {

run_subtests ::
	cd ModPerl-Registry && $(MAKE) test

run_subtests ::
	cd Apache-Reload && $(MAKE) test

EOF

    $preamble .= <<'EOF' unless $build->mpm_is_threaded();
run_subtests ::
	cd Apache-SizeLimit && $(MAKE) test

EOF


    return $preamble;
}

sub MY::postamble {
    my $self = shift;

    my $string = $self->ModPerl::BuildMM::MY::postamble;

    $string .= <<'EOF';
mydist : Apache-Test/META.yml mod_perl.spec manifest tardist

rpm: dist
	@[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm
	rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \
                 --define "_srcrpmdir $(PWD)/rpm" \
                 $(DISTVNAME).tar.gz
	@mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/
	@rm -rf $(PWD)/rpm/*/
    
mod_perl.spec: build/make_rpm_spec
	$(PERL) build/make_rpm_spec

Apache-Test/META.yml:
	cd Apache-Test && make metafile

tag :
	svn copy  https://svn.apache.org/repos/asf/perl/modperl/trunk  https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM)
	svn copy  https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM)  https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
	svn copy  https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM)
EOF

    return $string;
}

# this is a workaround so that ModPerl::MM will move MY::constants
# away, and Apache-Test/Makefile.PL which has its own MY::constants
# won't get complaints on MY::constants redefined
++ b/ModPerl-Registry/Makefile.PL


# prerequisites
my %require = (
    "Apache::Test" => 0, # any version will do?
);

my @scripts = qw(t/TEST t/SMOKE);
++ b/lib/ModPerl/BuildMM.pm

ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
use strict 'refs';

my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib";

#to override MakeMaker MOD_INSTALL macro
sub mod_install {
    q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
    qq{-MModPerl::BuildMM \\}."\n" .
    q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
}



                push @target,
                    '$(FULLPERL) -I$(INST_LIB) ' .
                    "-MModPerl::BuildMM " .
                    "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";

                # Win32 doesn't normally install man pages
++ b/lib/ModPerl/Manifest.pm

my @add_files = qw{
    MANIFEST
    mod_perl.spec
    Apache-Test/META.yml
};

sub get_svn_files {

Return to bug 484038

Line Link Here

(-)file_not_specified_in_diff (-57 / +8 lines)
0	-- a/Makefile.PL	0	++ b/Makefile.PL
Lines 24-30 BEGIN { Link Here
24		24
25	}	25	}
26		26
27	use lib qw(lib Apache-Test/lib);	27	use lib qw(lib);
28		28
29	use Config;	29	use Config;
30	use File::Spec::Functions;	30	use File::Spec::Functions;
Lines 117-132 sub get_DEFINE { Link Here
117	}	117	}
118		118
119	sub configure {	119	sub configure {
120
121	# mod_perl test suite relies on having Apache-Test bundled with
122	# the mod_perl source, since any pre-installed version may not do
123	# the right thing
124	unless (-d "Apache-Test") {
125	error "Can't find a sub-directory Apache-Test. " .
126	"Make sure that you are using a complete source distribution";
127	exit 1;
128	}
129
130	set_modperl_version();	120	set_modperl_version();
131		121
132	if ($old_modperl_version) {	122	if ($old_modperl_version) {
Lines 798-811 run_tests : test_clean Link Here
798	run_subtests ::	788	run_subtests ::
799	cd ModPerl-Registry && $(MAKE) test	789	cd ModPerl-Registry && $(MAKE) test
800		790
801	run_subtests ::
802	cd Apache-Reload && $(MAKE) test
803
804	EOF	791	EOF
805		792
806	$preamble .= <<'EOF' unless $build->mpm_is_threaded();	793	$preamble .= <<'EOF' unless $build->mpm_is_threaded();
807	run_subtests ::
808	cd Apache-SizeLimit && $(MAKE) test
809		794
810	EOF	795	EOF
811		796
Lines 816-852 EOF Link Here
816	return $preamble;	801	return $preamble;
817	}	802	}
818		803
819	sub MY::postamble {
820	my $self = shift;
821
822	my $string = $self->ModPerl::BuildMM::MY::postamble;
823
824	$string .= <<'EOF';
825	mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
826
827	rpm: dist
828	@[ -d $(PWD)/rpm ] \|\| mkdir $(PWD)/rpm
829	rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \
830	--define "_srcrpmdir $(PWD)/rpm" \
831	$(DISTVNAME).tar.gz
832	@mv $(PWD)/rpm//.rpm $(PWD)/rpm/
833	@rm -rf $(PWD)/rpm/*/
834
835	mod_perl.spec: build/make_rpm_spec
836	$(PERL) build/make_rpm_spec
837
838	Apache-Test/META.yml:
839	cd Apache-Test && make metafile
840
841	tag :
842	svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM)
843	svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
844	svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM)
845	EOF
846
847	return $string;
848	}
849
850	# this is a workaround so that ModPerl::MM will move MY::constants	804	# this is a workaround so that ModPerl::MM will move MY::constants
851	# away, and Apache-Test/Makefile.PL which has its own MY::constants	805	# away, and Apache-Test/Makefile.PL which has its own MY::constants
852	# won't get complaints on MY::constants redefined	806	# won't get complaints on MY::constants redefined
853	-- a/ModPerl-Registry/Makefile.PL	807	++ b/ModPerl-Registry/Makefile.PL
Lines 14-20 use Apache::TestMM qw(test clean); Link Here
14		14
15	# prerequisites	15	# prerequisites
16	my %require = (	16	my %require = (
17	"Apache::Test" => "", # any version will do?	17	"Apache::Test" => 0, # any version will do?
18	);	18	);
19		19
20	my @scripts = qw(t/TEST t/SMOKE);	20	my @scripts = qw(t/TEST t/SMOKE);
21	-- a/lib/ModPerl/BuildMM.pm	21	++ b/lib/ModPerl/BuildMM.pm
Lines 38-49 my @methods = grep *{$stash->{$_}}{CODE} Link Here
38	ModPerl::MM::override_eu_mm_mv_all_methods(@methods);	38	ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
39	use strict 'refs';	39	use strict 'refs';
40		40
41	my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib";
42
43	#to override MakeMaker MOD_INSTALL macro	41	#to override MakeMaker MOD_INSTALL macro
44	sub mod_install {	42	sub mod_install {
45	q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .	43	q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
46	qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" .	44	qq{-MModPerl::BuildMM \\}."\n" .
47	q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";	45	q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
48	}	46	}
49		47
Lines 269-275 sub ModPerl::BuildMM::MY::postamble { Link Here
269		267
270	push @target,	268	push @target,
271	'$(FULLPERL) -I$(INST_LIB) ' .	269	'$(FULLPERL) -I$(INST_LIB) ' .
272	"-I$apache_test_dir -MModPerl::BuildMM " .	270	"-MModPerl::BuildMM " .
273	"-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";	271	"-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";
274		272
275	# Win32 doesn't normally install man pages	273	# Win32 doesn't normally install man pages
276	-- a/lib/ModPerl/Manifest.pm	274	++ b/lib/ModPerl/Manifest.pm
Lines 33-39 our @EXPORT_OK = qw(mkmanifest); Link Here
33	my @add_files = qw{	33	my @add_files = qw{
34	MANIFEST	34	MANIFEST
35	mod_perl.spec	35	mod_perl.spec
36	Apache-Test/META.yml
37	};	36	};
38		37
39	sub get_svn_files {	38	sub get_svn_files {