richter 01/05/10 23:45:51
Modified: . Changes.pod Makefile.PL test.pl
Log:
Makefile.PL enhancements for win32 binaries
Revision Changes Path
1.162 +2 -2 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- Changes.pod 2001/05/10 19:08:03 1.161
+++ Changes.pod 2001/05/11 06:45:43 1.162
@@ -32,11 +32,11 @@
- added pod documentation to embperl.pl. Patch from Angus Lees.
- %http_headers_out can take now array refs as elements to set multiple
headers of the same value. Patch from Maxwell Krohn.
- - No module-documenations (like Intro.pod Faq.pod etc) now get copied under
+ - Non module-documenations (like Intro.pod Faq.pod etc) now gets copied under
the correct directory and man pages are generated with the correct name
(e.g. perldoc HTML::Embperl::Intro works now after installation). Based
on an idea from Angus Lees.
-
+ - Makefile.PL enhancements for Apache/ActiveState binary distribution
=head1 1.3.1 (RELEASE) 13 Feb. 2001
1.44 +13 -4 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile.PL 2001/05/10 19:08:12 1.43
+++ Makefile.PL 2001/05/11 06:45:45 1.44
@@ -27,7 +27,7 @@
(
'mod_perl.c' => { name => 'perl_module',
path => ['$apache_src/modules/perl/libperl.so',
'$EPBINDIR/modules/libperl.so', '$apache_src/mod_perl.so'],
- win32path => ['$mpdll', '$mpdll/apachemoduleperl.dll',
'$EPBINDIR/modules/apachemoduleperl.dll'],
+ win32path => ['$mpdll', '$mpdll/apachemoduleperl.dll',
'$mpdll/mod_perl.so', '$apache_src/../modules/mod_perl.so',
'$EPBINDIR/modules/apachemoduleperl.dll'],
file => 'libperl.so',
win32file => 'apachemoduleperl.dll',
},
@@ -521,8 +521,12 @@
if ($win32)
{
$i = "-I. -I$inc_dir -I$apache_src/regex -I$apache_src/os/win32" ;
- if (!-e "$apache_src/CoreD/ApacheCore.lib")
+ if (-e "$apache_src/../libexec/ApacheCore.lib")
{
+ $o = " $apache_src/../libexec/ApacheCore.lib" ;
+ }
+ elsif (!-e "$apache_src/CoreD/ApacheCore.lib")
+ {
$o = " $apache_src/CoreR/ApacheCore.lib" ;
}
else
@@ -616,8 +620,13 @@
}
else
{
- $EPHTTPD = "$apache_src/ApacheD/Apache.exe" ;
- $EPHTTPDDLL = "$apache_src/CoreD" ;
+ $EPHTTPD = "$apache_src/../Apache.exe" ;
+ $EPHTTPDDLL = "$apache_src/.." ;
+ if (!-e $EPHTTPD)
+ {
+ $EPHTTPD = "$apache_src/ApacheD/Apache.exe" ;
+ $EPHTTPDDLL = "$apache_src/CoreD" ;
+ }
if (!-e $EPHTTPD)
{
$EPHTTPD = "$apache_src/ApacheR/Apache.exe" ;
1.104 +30 -9 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- test.pl 2001/05/11 04:06:51 1.103
+++ test.pl 2001/05/11 06:45:46 1.104
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.103 2001/05/11 04:06:51 richter Exp $
+# $Id: test.pl,v 1.104 2001/05/11 06:45:46 richter Exp $
#
###################################################################################
@@ -113,12 +113,35 @@
'varerr.htm' => {
'errors' => -1,
'noloop' => 1,
+ 'condition' => '$] < 5.006000',
},
'varerr.htm' => {
+ 'errors' => 7,
+ 'noloop' => 1,
+ 'condition' => '$] >= 5.006000',
+ 'cmpext' => '56',
+ 'version' => 1,
+ },
+ 'varerr.htm' => {
+ 'errors' => 8,
+ 'noloop' => 1,
+ 'condition' => '$] >= 5.006000',
+ 'cmpext' => '56',
+ 'version' => 2,
+ },
+ 'varerr.htm' => {
'errors' => 2,
'version' => 1,
'cgi' => 0,
+ 'condition' => '$] < 5.006000',
},
+ 'varerr.htm' => {
+ 'errors' => 7,
+ 'version' => 1,
+ 'cgi' => 0,
+ 'condition' => '$] >= 5.006000',
+ 'cmpext' => '56',
+ },
'varepvar.htm' => {
'query_info' => 'a=1&b=2',
'offline' => 0,
@@ -616,7 +639,7 @@
use vars qw ($httpconfsrc $httpconf $EPPORT $EPPORT2 *SAVEERR *ERR $EPHTTPDDLL
$EPSTARTUP $EPDEBUG
$testshare
- $EPSESSIONDS $EPSESSIONCLASS $EPSESSIONVERSION $EP1COMPAT
+ $EPSESSIONDS $EPSESSIONCLASS $EPSESSIONVERSION $EP1COMPAT
$EPAPACHEVERSION
$opt_offline $opt_ep1 $opt_cgi $opt_modperl $opt_execute $opt_nokill
$opt_loop
$opt_multchild $opt_memcheck $opt_exitonmem $opt_exitonsv $opt_config
$opt_nostart $opt_uniquefn
$opt_quite $opt_qq $opt_ignoreerror $opt_tests $opt_blib $opt_help
$opt_dbgbreak $opt_finderr
@@ -1368,7 +1391,6 @@
}
$errcnt = $test -> {errors} || 0 ;
- $errcnt = 7 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
$debug = $test -> {debug} || $defaultdebug ;
$debug = 0 if ($opt_qq) ;
@@ -1425,9 +1447,7 @@
$page =~ /.*\/(.*)$/ ;
$org = "$cmppath/$1" ;
$org = "$cmppath$testversion/$1" if (-e "$cmppath$testversion/$1")
;
- $org .= '56' if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0)
;
$org .= $test -> {cmpext} if ($test -> {cmpext}) ;
- #$org .= '-1' if ($ep1compat && -e "$org-1") ;
$err = CmpFiles ($outfile, $org, $errin) ;
}
@@ -1912,8 +1932,12 @@
$ENV{PATH} .= ";$EPHTTPDDLL" if ($EPWIN32) ;
$ENV{PERL_STARTUP_DONE} = 1 ;
+ $EPAPACHEVERSION =~ m#Apache/1\.3\.(\d+) # ;
+
+ $XX .= ' -s ' if ($1 < 13) ;
+
Win32::Process::Create($HttpdObj, $EPHTTPD,
- "Apache -s $XX -f $EPPATH/$httpdconf ", 0,
+ "Apache $XX -f $EPPATH/$httpdconf ", 0,
# NORMAL_PRIORITY_CLASS,
0,
".") or die "***Cannot start $EPHTTPD" ;
@@ -2024,7 +2048,6 @@
}
$errcnt = $test -> {errors} || 0 ;
- $errcnt = 7 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
$errcnt = -1 if ($EPWIN32 && $loc eq $cgiloc) ;
$debug = $test -> {debug} || $defaultdebug ;
@@ -2118,9 +2141,7 @@
$page =~ /.*\/(.*)$/ ;
$org = "$cmppath/$1" ;
$org = "$cmppath$testversion/$1" if (-e "$cmppath$testversion/$1") ;
- $org .= '56' if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
$org .= $test -> {cmpext} if ($test -> {cmpext}) ;
- #$org .= '-1' if ($opt_ep1 && -e "$org-1") ;
#print "Compare $page with $org\n" ;
$err = CmpFiles ($outfile, $org) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
