dougm 01/07/09 08:03:29
Modified:.INSTALL.win32 Makefile.PL Changes
lib/Apache src.pm
src/modules/win32 mod_perl.def mod_perl.dsp
t/conf httpd.conf-win32
t/modules src.t
apacimod_perl.exp
Log:
enabled Apache::ModuleConfig on win32
win32 support for Apache::src
Revision ChangesPath
1.8 +4 -0 modperl/INSTALL.win32
Index: INSTALL.win32
===
RCS file: /home/cvs/modperl/INSTALL.win32,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- INSTALL.win32 2001/06/21 16:11:42 1.7
+++ INSTALL.win32 2001/07/09 15:03:05 1.8
@@ -151,6 +151,10 @@
will complete the installation.
+This latter method of building mod_perl will also install the
+Apache and mod_perl header files, which can then be accessed
+through the Apache::src module.
+
=head1 CONFIGURATION
Add this line to httpd.conf:
1.191 +45 -6 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- Makefile.PL 2001/07/06 20:08:27 1.190
+++ Makefile.PL 2001/07/09 15:03:06 1.191
@@ -354,7 +354,14 @@
$callback_hooks{$k} = $v if exists $callback_hooks{$k};
}
-my $win32_auto = ($vcpp and $win32_args{APACHE_SRC}) ? 1 : 0;
+my $win32_auto;
+if ($vcpp and $win32_args{APACHE_SRC}) {
+ $EVERYTHING = 1;
+ my $fixed_apsrc = win32_fix_path($win32_args{APACHE_SRC});
+ $APACHE_SRC = -d $fixed_apsrc/include ?
+$fixed_apsrc : $fixed_apsrc . '/src';
+ $win32_auto = 1;
+}
my %very_experimental = map {$_,1}
qw(PERL_DEFAULT_OPMASK PERL_SAFE_STARTUP PERL_ORALL_OPMASK
@@ -774,7 +781,9 @@
(need 1.2.0 or higher);
}
-for (qw(PERL_SECTIONS PERL_SSI), keys %experimental) {
+$PERL_SECTIONS = $PERL_SSI = 0 if $Is_Win32;
+unless ($Is_Win32) {
+ for (qw(PERL_SECTIONS PERL_SSI), keys %experimental) {
$k = $_;
if($experimental{$_}) {
@@ -797,6 +806,7 @@
iedit $APACHE_SRC/modules/perl/Makefile, s/^($_) /#\$1 /
if $$_;
}
+ }
}
unless ($USE_APACI or $USE_APXS) {
iedit $APACHE_SRC/modules/perl/Makefile, s/^#TRACE/TRACE/ if $PERL_TRACE;
@@ -877,7 +887,7 @@
iedit $APACHE_SRC/modules/perl/Makefile, s/^#__ORIGINAL__/$edit_note/;
}
-if($mmn = 19970912 and not $USE_APACI and not $USE_APXS) { #1.3b1
+if($mmn = 19970912 and not $USE_APACI and not $USE_APXS and not $Is_Win32) {
#1.3b1
system cat $APACHE_SRC/Makefile.config $APACHE_SRC/modules/perl/Makefile
/tmp/mpmf.$$;
system mv /tmp/mpmf.$$ $APACHE_SRC/modules/perl/Makefile;
}
@@ -887,7 +897,7 @@
\t, '$(CP) t/conf/mod_perl_srm.conf t/conf/srm.conf', \n;
}
unless ($USE_APXS) {
- unless (-l t/httpd) {
+ unless (-l t/httpd or $Is_Win32) {
system $Config{lns} $APACHE_SRC/httpd t/httpd;
}
write_extra_tests();
@@ -1088,6 +1098,10 @@
my $dummy = hooks=`$hooks'\n unless $hooks;
cp lib/mod_perl_hooks.pm.PL, lib/mod_perl_hooks.pm;
+if ($Is_Win32) {
+ my @args = ($^X, ' -spi.bak ', ' -e ', \s/sub mod_perl::hooks.*/sub
mod_perl::hooks { qw($hooks) }/\, 'lib/mod_perl_hooks.pm');
+ system(@args) == 0 or die @args failed\n;
+}
iedit lib/mod_perl_hooks.pm,
qq(s/sub mod_perl::hooks.*/sub mod_perl::hooks { qw($hooks) }/);
@@ -1099,7 +1113,7 @@
@list == @mod_perl_hooks or die Edit of lib/mod_perl_hooks.pm failed $!\n;
}
-unlink lib/mod_perl_hooks.pm~;
+unlink $Is_Win32 ? lib/mod_perl_hooks.pm.bak : lib/mod_perl_hooks.pm~;
}
#checking for LWP code, borrowed from LWP's own Makefile.PL :-)
@@ -1183,7 +1197,15 @@
}
mkdir t/docs/subr, 0755;
-system date t/docs/subr/index.html;
+if ($Is_Win32) {
+ open FH, t/docs/subr/index.html
+ or die Cannot open t/docs/subr/index.html: $!;
+ print FH scalar(localtime);
+ close FH;
+}
+else {
+ system date t/docs/subr/index.html;
+}
return unless
$callback_hooks{PERL_STACKED_HANDLERS}
@@ -1524,6 +1546,18 @@
$My::self-{PM}-{$from} = $to;
}
+sub win32_mph {
+return unless /\.h$/ or /os-inline\.c$/;
+(my $d = $File::Find::dir) =~ s:^\Q$MODPERL_SRC::;
+$d =~ s:^/::;
+my $from = $File::Find::dir/$_;
+my $to = '$(INST_ARCHLIB)/' . auto/Apache/include/modules/perl/;
+$to .= $d/ if $d;
+$to .= $_;
+
+$My::self-{PM}-{$from} = $to;
+}
+
sub
