matts 2003/07/17 09:34:50
Modified: . Makefile.PL
Added: t/conf extra.last.conf.in
Removed: t/conf extra.conf.in
Log:
Moved extra.conf.in to extra.last.conf.in, allowing us to remove the fixup
in Makefile.PL
Revision Changes Path
1.22 +1 -21 xml-axkit/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/xml-axkit/Makefile.PL,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.PL 16 Jul 2003 15:16:10 -0000 1.21
+++ Makefile.PL 17 Jul 2003 16:34:49 -0000 1.22
@@ -106,8 +106,6 @@
Apache::TestMM::filter_args();
Apache::TestMM::generate_script('t/TEST');
-
- fixup_test_script();
};
undef $@;
@@ -278,24 +276,6 @@
else {
$RUNNING_UNDER_CPAN = $ENV{RUNNING_UNDER_CPAN} || 0;
}
-}
-
-sub fixup_test_script {
- rename("t/conf/httpd.conf", "t/conf/httpd.conf.bak") || die
"rename(t/conf/httpd.conf => t/conf/httpd.conf.bak) : $!";
- open(CONF, "<t/conf/httpd.conf.bak") || die "open(t/conf/httpd.conf.bak)
: $!";
- open(NEWCONF, ">t/conf/httpd.conf") || die "open(t/conf/httpd.conf) :
$!";
- my $extra_line = '';
- while (<CONF>) {
- if (/extra\.conf/) {
- $extra_line = $_;
- next;
- }
- print NEWCONF $_;
- }
- print NEWCONF $extra_line;
- close(NEWCONF);
- close(CONF);
- unlink("t/conf/httpd.conf.bak") || die "unlink(t/conf/httpd.conf.bak) :
$!";
}
sub strip_lfs {
1.1 xml-axkit/t/conf/extra.last.conf.in
Index: extra.last.conf.in
===================================================================
PerlModule AxKit
# AxKit globals
AxNoCache On
AxDebugLevel 10
AxStackTrace On
# Language processors
<Perl>
my $has_libxslt = 0;
eval { require XML::LibXSLT; };
unless ($@) {
$AxAddStyleMap = "text/xsl Apache::AxKit::Language::LibXSLT";
$has_libxslt = 1;
}
unless ( $has_xslt == 1 ) {
eval { require XML::Sablot; };
unless ( $@ ) {
$AxAddStyleMap = "text/xsl Apache::AxKit::Language::Sablot";
}
}
</Perl>
AxAddStyleMap application/x-xsp Apache::AxKit::Language::XSP;
#######################################
# Directives that control the individual configs
#######################################
<Location "/xslt-basic/01.xml">
SetHandler axkit
AxResetProcessors
AxAddProcessor text/xsl /style/xslt-basic/01.xsl
</Location>
<Location "/xslt-basic/02_include.xml">
SetHandler axkit
AxResetProcessors
AxAddProcessor text/xsl /style/xslt-basic/02_include.xsl
</Location>
<Location "/xslt-basic/03_document_1arg.xml">
SetHandler axkit
AxResetProcessors
AxAddProcessor text/xsl /style/xslt-basic/03_document_1arg.xsl
</Location>
<Location "/xslt-basic/04_document_2args.xml">
SetHandler axkit
AxResetProcessors
AxAddProcessor text/xsl /style/xslt-basic/04_document_2args.xsl
</Location>
