how does this work for you?
this includes my change to INSTALL.win32
sterling
Doug MacEachern wrote:
> sweet, great work guys. the patch i have from randy seems to be truncated
> (the tarball with mod_perl.{dsp,mak.def} looks ok though. sterls can you
> send me the current patch against current cvs? thanks!
Index: INSTALL.win32
===================================================================
RCS file: /home/cvspublic/modperl/INSTALL.win32,v
retrieving revision 1.5
diff -u -r1.5 INSTALL.win32
--- INSTALL.win32 2000/12/21 19:19:08 1.5
+++ INSTALL.win32 2000/12/31 19:01:47
@@ -24,6 +24,17 @@
See http://perl.apache.org/distributions.html for Win32 binaries,
including ActivePerl ppms of mod_perl and some Apache::* packages.
+=head1 CHANGES
+
+Beginning with version 1.3.15, Apache has changed the convention
+for naming Win32 modules in order to follow that for Unix systems.
+Consequently, the name of the mod_perl module built here has
+been changed from ApacheModulePerl.dll to mod_perl.so. This
+is just a change in convention; if you are building mod_perl
+against pre-1.3.15 Apache sources, and wish to follow the old
+convention, simply copy mod_perl.so to your Apache modules directory
+as ApacheModulePerl.dll.
+
=head1 BUILDING
There are two ways to build mod_perl - with MS Developer Studio,
@@ -40,15 +51,16 @@
perl Makefile.PL
nmake install
-This will install the Perl side of mod_perl and setup files for the library build.
+This will install the Perl side of mod_perl and setup files for the
+library build.
-=item Build ApacheModulePerl.dll
+=item Build mod_perl.so
Using MS developer studio,
select "File -> Open Workspace ...",
select "Files of type [Projects (*.dsp)]"
- open mod_perl-x.xx/src/modules/ApacheModulePerl/ApacheModulePerl.dsp
+ open mod_perl-x.xx/src/modules/win32/mod_perl.dsp
=item Settings
@@ -68,9 +80,9 @@
ApacheCore.lib (e.g. C:\Apache\ApacheCore.lib)
select "Build -> Set Active Configuration... ->
- [ApacheModulePerl - Win32 Release]"
+ [mod_perl - Win32 Release]"
- select "Build -> Build ApacheModulePerl.dll"
+ select "Build -> Build mod_perl.so"
You may see some harmless warnings, which can be reduced (along with
the size of the DLL), by setting:
@@ -80,14 +92,14 @@
=item Testing
-Once ApacheModulePerl.dll is built and apache.exe is installed you may
+Once mod_perl.so is built and apache.exe is installed you may
test mod_perl with:
nmake test
=item Apache setup
-You do not need to rebuild apache, just copy ApacheModulePerl.dll to
+You do not need to rebuild apache, just copy mod_perl.so to
$SERVER_ROOT/modules
=back
@@ -98,7 +110,7 @@
perl Makefile.PL APACHE_SRC=..\apache_1.3.xx INSTALL_DLL=\Apache\modules
-will build mod_perl (including ApacheModulePerl.dll) entirely from
+will build mod_perl (including mod_perl.so) entirely from
the command line. The arguments accepted include
=over 3
@@ -110,9 +122,9 @@
=item INSTALL_DLL
-This gives the location of where to install ApacheModulePerl.dll
+This gives the location of where to install mod_perl.so
(eg, \Apache\modules). No default is assumed - if this argument
-is not given, ApacheModulePerl.dll must be copied manually.
+is not given, mod_perl.so must be copied manually.
=item DEBUG
@@ -141,7 +153,7 @@
Add this line to httpd.conf:
- LoadModule perl_module modules/ApacheModulePerl.dll
+ LoadModule perl_module modules/mod_perl.so
Be sure that 'C:\perl\bin' is in your path so apache can find perl.dll
Index: MANIFEST
===================================================================
RCS file: /home/cvspublic/modperl/MANIFEST,v
retrieving revision 1.66
diff -u -r1.66 MANIFEST
--- MANIFEST 2000/12/22 20:55:55 1.66
+++ MANIFEST 2000/12/31 19:01:48
@@ -97,7 +97,7 @@
src/modules/perl/perlio.c
src/modules/perl/perl_config.c
src/modules/perl/Makefile
-src/modules/ApacheModulePerl/ApacheModulePerl.dsp
+src/modules/win32/mod_perl.dsp
src/opcodes.txt
t/report.PL
t/README
Index: Makefile.PL
===================================================================
RCS file: /home/cvspublic/modperl/Makefile.PL,v
retrieving revision 1.174
diff -u -r1.174 Makefile.PL
--- Makefile.PL 2000/12/23 02:23:08 1.174
+++ Makefile.PL 2000/12/31 19:02:00
@@ -1249,6 +1249,17 @@
}
);
+if ($Is_Win32) {
+ print <<'END';
+
+Beginning with version 1.3.15, Apache uses a different convention for
+Win32 module names. Correspondingly, the name of the mod_perl module
+built here has been changed from ApacheModulePerl.dll to mod_perl.so.
+Please see INSTALL.win32 for further details.
+
+END
+}
+
print "*** BSDI users: be sure to read the INSTALL `Notes' section ***\n"
if $Config{osname} =~ /bsdos/i;
@@ -1268,8 +1279,8 @@
my $string = $self->MM::clean(@_);
if ($win32_auto) {
$string .= sprintf
- qq{\tmsdev src\\modules\\ApacheModulePerl\\ApacheModulePerl.dsp \\\n} .
- qq{\t/MAKE "ApacheModulePerl - Win32 %s" /CLEAN\n},
+ qq{\tmsdev src\\modules\\win32\\mod_perl.dsp \\\n} .
+ qq{\t/MAKE "mod_perl - Win32 %s" /CLEAN\n},
($win32_args{DEBUG} == 1) ? 'Debug' : 'Release';
return $string;
}
@@ -1313,12 +1324,15 @@
if ($win32_auto) {
$string =~ s/(pure_all\s+::.*\s+subdirs\s+)(.*)/$1 amp_dll $2/;
$string .= sprintf qq{\namp_dll:\n} .
- qq{\tmsdev src\\modules\\ApacheModulePerl\\ApacheModulePerl.dsp \\\n} .
- qq{\t/MAKE "ApacheModulePerl - Win32 %s" /USEENV\n},
+ qq{\tmsdev src\\modules\\win32\\mod_perl.dsp \\\n} .
+ qq{\t/MAKE "mod_perl - Win32 %s" /USEENV\n},
($win32_args{DEBUG} == 1) ? 'Debug' : 'Release';
if ($win32_args{INSTALL_DLL}) {
$string .= sprintf qq{\namp_install:\n\t\$(CP) "%s" "%s"},
- "$win32_path{MODPERL_LIB}/ApacheModulePerl.dll", $win32_args{INSTALL_DLL};
+ "$win32_path{MODPERL_LIB}/mod_perl.so",
+ $win32_args{INSTALL_DLL} .
+ ($win32_args{APACHE_VERS} < 1315 ?
+ '/ApacheModulePerl.dll' : '/mod_perl.so');
}
return $string;
}
@@ -2024,8 +2038,8 @@
my $modperl_src = win32_fix_path(cwd) . '/src';
$win32_path{MODPERL_INC} = $modperl_src . '/modules/perl';
$win32_path{MODPERL_LIB} = ($win32_args{DEBUG} == 1) ?
- $modperl_src . '/modules/ApacheModulePerl/Debug' :
- $modperl_src . '/modules/ApacheModulePerl/Release';
+ $modperl_src . '/modules/win32/Debug' :
+ $modperl_src . '/modules/win32/Release';
unless ( -d $win32_args{APACHE_SRC}) {
opendir(DIR, '../') or die "Cannot read parent directory: $!\n";
@@ -2038,9 +2052,12 @@
$win32_args{APACHE_SRC} = win32_fix_path($win32_args{APACHE_SRC});
$win32_args{APACHE_SRC} .= '/src' unless $win32_args{APACHE_SRC} =~ /src$/;
$win32_path{APACHE_INC} = $win32_args{APACHE_SRC} . '/include';
+ $win32_args{APACHE_VERS} = httpd_version($win32_path{APACHE_INC}, 1);
$win32_path{APACHE_LIB} = ($win32_args{DEBUG} == 1) ?
- $win32_args{APACHE_SRC} . '/CoreD' :
- $win32_args{APACHE_SRC} . '/CoreR';
+ $win32_args{APACHE_SRC} .
+ ($win32_args{APACHE_VERS} < 1315 ? '/CoreD' : '/Debug') :
+ $win32_args{APACHE_SRC} .
+ ($win32_args{APACHE_VERS} < 1315 ? '/CoreR' : '/Release');
die "Cannot find ApacheCore.lib under $win32_path{APACHE_LIB}\n"
unless -f "$win32_path{APACHE_LIB}/ApacheCore.lib";
@@ -2060,7 +2077,7 @@
print <<'END';
**** The Apache/modules directory was not found. *******
-**** Please install ApacheModulePerl.dll manually. *******
+**** Please install mod_perl.so manually. *******
END
}
@@ -2068,11 +2085,11 @@
}
}
-# fix ApacheModulePerl.dsp with the perl and apache inc and lib directories
+# fix mod_perl.dsp with the perl and apache inc and lib directories
sub win32_fix_dsp {
- my $amp = 'src/modules/ApacheModulePerl';
- my $dsp = 'ApacheModulePerl.dsp';
+ my $amp = 'src/modules/win32';
+ my $dsp = 'mod_perl.dsp';
unless ( -f "$amp/$dsp.orig") {
rename("$amp/$dsp", "$amp/$dsp.orig")
or die "Couldn't rename $amp/$dsp: $!\n";
@@ -2130,7 +2147,7 @@
return $_;
}
-# fix a path for ApacheModulePerl.dsp
+# fix a path for mod_perl.dsp
sub win32_fix_path_dsp {
local $_ = shift;
tr!/!\\!;
Index: t/TEST.win32
===================================================================
RCS file: /home/cvspublic/modperl/t/TEST.win32,v
retrieving revision 1.3
diff -u -r1.3 TEST.win32
--- t/TEST.win32 1998/07/23 14:36:28 1.3
+++ t/TEST.win32 2000/12/31 19:02:08
@@ -73,13 +73,13 @@
#source or binary distribution
-for (qw(src/modules/ApacheModulePerl/Release
- src/modules/ApacheModulePerl/Debug
+for (qw(src/modules/win32/Release
+ src/modules/win32/Debug
win32/modules))
{
- my $dll = "$_/ApacheModulePerl.dll";
+ my $dll = "$_/mod_perl.so";
next unless -e $dll;
- copy $dll, "t/modules/ApacheModulePerl.dll";
+ copy $dll, "t/modules/mod_perl.so";
last;
}
Index: t/conf/httpd.conf-win32
===================================================================
RCS file: /home/cvspublic/modperl/t/conf/httpd.conf-win32,v
retrieving revision 1.9
diff -u -r1.9 httpd.conf-win32
--- t/conf/httpd.conf-win32 1999/01/21 17:04:13 1.9
+++ t/conf/httpd.conf-win32 2000/12/31 19:02:08
@@ -19,7 +19,7 @@
#mod_perl stuff
-LoadModule perl_module modules/ApacheModulePerl.dll
+LoadModule perl_module modules/mod_perl.so
#-Tw
Index: t/conf/httpd.conf.pl
===================================================================
RCS file: /home/cvspublic/modperl/t/conf/httpd.conf.pl,v
retrieving revision 1.24
diff -u -r1.24 httpd.conf.pl
--- t/conf/httpd.conf.pl 1999/05/20 00:22:13 1.24
+++ t/conf/httpd.conf.pl 2000/12/31 19:02:15
@@ -1,7 +1,7 @@
#PerlOpmask default
<IfModule mod_dll.c>
-LoadModule perl_module modules/ApacheModulePerl.dll
+LoadModule perl_module modules/mod_perl.so
</IfModule>
AddType text/x-server-parsed-html .shtml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
