You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2003/10/29 18:58:00 UTC
cvs commit: httpd-apreq-2/build version_check.pl xsbuilder.pl
joes 2003/10/29 09:58:00
Modified: . README
build version_check.pl xsbuilder.pl
Log:
Enforce rule (on Unix builds): package version == perl module version.
Revision Changes Path
1.6 +2 -4 httpd-apreq-2/README
Index: README
===================================================================
RCS file: /home/cvs/httpd-apreq-2/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README 18 Oct 2003 21:03:06 -0000 1.5
+++ README 29 Oct 2003 17:58:00 -0000 1.6
@@ -28,11 +28,9 @@
The modules' source files are in the env/ directory.
Two supported modules are now available
- 1) mod_apreq - an Apache 2 filter module,
-
- 2) libapreq_cgi - a static library for creating
- CGI applications with libapreq2.
+ 1) an Apache 2 filter module - mod_apreq.c,
+ 2) the default CGI module included in libapreq2.
Version 2 also includes the perl APIs for libapreq2- Apache::Request
and Apache::Cookie. The corresponding XS modules are generated in
1.5 +9 -2 httpd-apreq-2/build/version_check.pl
Index: version_check.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/version_check.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- version_check.pl 28 Oct 2003 14:00:06 -0000 1.4
+++ version_check.pl 29 Oct 2003 17:58:00 -0000 1.5
@@ -13,6 +13,12 @@
require ExtUtils::XSBuilder;
return our $VERSION;
}
+
+sub a_t_version {
+ require Apache::Test;
+ $Apache::Test::VERSION;
+}
+
sub mp2_version {
eval {
require Apache2;
@@ -33,12 +39,13 @@
apu => { test => \&gnu_version, version => "0.9.4" },
perl => { test => \&gnu_version, version => "5.6.1" },
xsbuilder => { test => \&xsb_version, version => "0.23" },
- mp2 => { test => \&mp2_version, version => "1.99_09"},
+ mp2 => { test => \&mp2_version, version => "1.99_09"},
doxygen => { test => \&gnu_version, version => "1.3" },
+ apache_test => { test => \&a_t_version, version => "1.03" },
);
if (@ARGV == 0) {
- printf "%10s: %s\n", $_, $prereq{$_}->{version} for sort keys %prereq;
+ printf "%12s: %s\n", $_, $prereq{$_}->{version} for sort keys %prereq;
exit 0;
}
1.16 +8 -3 httpd-apreq-2/build/xsbuilder.pl
Index: xsbuilder.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/build/xsbuilder.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xsbuilder.pl 27 Oct 2003 06:47:25 -0000 1.15
+++ xsbuilder.pl 29 Oct 2003 17:58:00 -0000 1.16
@@ -9,7 +9,7 @@
use Apache2;
use Apache::Build;
require Win32 if Apache::Build::WIN32;
-
+my $version = "2.XX-dev"; # DUMMY VALUE
use Cwd;
my $cwd = Apache::Build::WIN32 ?
Win32::GetLongPathName(cwd) : cwd;
@@ -27,6 +27,7 @@
if (Apache::Build::WIN32) {
# XXX May need fixing, Randy!
+ # XXX How do we set $version in the Win32 build?
my $apache_dir = Apache::Build->build_config()->dir;
($apache_includes = "-I$apache_dir" . '/include') =~ s!\\!/!g;
($apr_libs = $apache_dir . '/lib') =~ s!\\!/!g;
@@ -54,6 +55,11 @@
$config =~ m/^s,\@APREQ_LIBNAME\@,([^,]+)/m or
die "Can't find apreq libname";
$apreq_libname = $1;
+
+ $config =~ m/^s,\@PACKAGE_VERSION\@,([^,]+)/m or
+ die "Can't find package version";
+ $version = $1;
+
}
my $apr_lib_flags = Apache::Build::WIN32 ?
qq{-L$apr_libs -llibapr -llibaprutil} :
@@ -147,7 +153,6 @@
::c_macro("APREQ_DECLARE", "apreq.h")->();
::c_macro("APREQ_DECLARE_HOOK", "apreq_parsers.h")->();
::c_macro("APREQ_DECLARE_PARSER", "apreq_parsers.h")->();
-# ::c_macro("APREQ_DECLARE_LOG", "apreq_env.h")->();
::c_macro("APR_DECLARE")->();
::c_macro("XS")-> ();
}
@@ -238,7 +243,7 @@
ModPerl::MM::WriteMakefile(
'NAME' => '$class',
- 'VERSION' => '0.01',
+ 'VERSION' => '$version',
'TYPEMAPS' => [qw(@$mp2_typemaps $typemap)],
'INC' => "-I.. -I../.. -I../../.. -I$src_dir -I$xs_dir $apache_includes",
'LIBS' => "$apreq_lib_flags $apr_lib_flags",