1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
diff -ur httpd24-orig/lib/ModPerl/BuildMM.pm httpd24/lib/ModPerl/BuildMM.pm
--- httpd24-orig/lib/ModPerl/BuildMM.pm 2013-06-20 21:13:35.491728266 +0000
+++ httpd24/lib/ModPerl/BuildMM.pm 2013-06-20 21:16:02.991193839 +0000
@@ -38,12 +38,10 @@
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{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" .
+ qq{-MModPerl::BuildMM \\}."\n" .
q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
}
@@ -269,7 +267,7 @@
push @target,
'$(FULLPERL) -I$(INST_LIB) ' .
- "-I$apache_test_dir -MModPerl::BuildMM " .
+ "-MModPerl::BuildMM " .
"-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";
# Win32 doesn't normally install man pages
diff -ur httpd24-orig/lib/ModPerl/Manifest.pm httpd24/lib/ModPerl/Manifest.pm
--- httpd24-orig/lib/ModPerl/Manifest.pm 2013-06-20 21:13:35.491728266 +0000
+++ httpd24/lib/ModPerl/Manifest.pm 2013-06-20 21:16:02.991193839 +0000
@@ -33,7 +33,6 @@
my @add_files = qw{
MANIFEST
mod_perl.spec
- Apache-Test/META.yml
};
sub get_svn_files {
diff -ur httpd24-orig/Makefile.PL httpd24/Makefile.PL
--- httpd24-orig/Makefile.PL 2013-06-20 21:13:35.461728372 +0000
+++ httpd24/Makefile.PL 2013-06-20 21:16:02.991193839 +0000
@@ -24,7 +24,7 @@
}
-use lib qw(lib Apache-Test/lib);
+use lib qw(lib);
use Config;
use File::Spec::Functions;
@@ -117,16 +117,6 @@
}
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) {
@@ -798,14 +788,9 @@
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
@@ -816,37 +801,6 @@
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
diff -ur httpd24-orig/ModPerl-Registry/Makefile.PL httpd24/ModPerl-Registry/Makefile.PL
--- httpd24-orig/ModPerl-Registry/Makefile.PL 2013-06-20 21:13:35.471728336 +0000
+++ httpd24/ModPerl-Registry/Makefile.PL 2013-06-20 21:16:02.991193839 +0000
@@ -14,7 +14,7 @@
# prerequisites
my %require = (
- "Apache::Test" => "", # any version will do?
+ "Apache::Test" => 0, # any version will do?
);
my @scripts = qw(t/TEST t/SMOKE);
|
GitWeb