Return-Path: Delivered-To: apmail-httpd-apreq-cvs-archive@www.apache.org Received: (qmail 53572 invoked from network); 8 Nov 2003 00:32:22 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 8 Nov 2003 00:32:22 -0000 Received: (qmail 80381 invoked by uid 500); 8 Nov 2003 00:32:07 -0000 Delivered-To: apmail-httpd-apreq-cvs-archive@httpd.apache.org Received: (qmail 80364 invoked by uid 500); 8 Nov 2003 00:32:07 -0000 Mailing-List: contact apreq-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: apreq-dev@httpd.apache.org List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list apreq-cvs@httpd.apache.org Received: (qmail 80346 invoked by uid 500); 8 Nov 2003 00:32:06 -0000 Delivered-To: apmail-httpd-apreq-2-cvs@apache.org Received: (qmail 80342 invoked from network); 8 Nov 2003 00:32:06 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 8 Nov 2003 00:32:06 -0000 Received: (qmail 53567 invoked by uid 1221); 8 Nov 2003 00:32:21 -0000 Date: 8 Nov 2003 00:32:21 -0000 Message-ID: <20031108003221.53566.qmail@minotaur.apache.org> From: joes@apache.org To: httpd-apreq-2-cvs@apache.org Subject: cvs commit: httpd-apreq-2/build version_check.pl X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N joes 2003/11/07 16:32:21 Modified: build version_check.pl Log: Style/whitespace cleanups to easy maintenance of prereq checks Revision Changes Path 1.8 +30 -23 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- version_check.pl 7 Nov 2003 23:01:56 -0000 1.7 +++ version_check.pl 8 Nov 2003 00:32:21 -0000 1.8 @@ -32,27 +32,27 @@ } my %cvs = ( - libtool => { test => \&gnu_version, version => "1.4.2" }, - autoconf => { test => \&gnu_version, version => "2.53" }, - automake => { test => \&gnu_version, version => "1.6.3" }, - doxygen => { test => \&gnu_version, version => "1.3" }, + libtool => { version => "1.4.2", test => \&gnu_version }, + autoconf => { version => "2.53", test => \&gnu_version }, + automake => { version => "1.6.3", test => \&gnu_version }, + doxygen => { version => "1.3", test => \&gnu_version }, ); my %build = ( - apache2 => { test => \&exe_version, version => "2.0.46"}, - apr => { test => \&gnu_version, version => "0.9.4", - comment => "bundled with apache2 2.0.46"}, - apu => { test => \&gnu_version, version => "0.9.4", - comment => "bundled with apache2 2.0.46"}, - perl => { test => \&gnu_version, version => "5.6.1" }, + apache2 => { version => "2.0.46", test => \&exe_version }, + apr => { version => "0.9.4", test => \&gnu_version, + comment => "bundled with apache2 2.0.46" }, + apu => { version => "0.9.4", test => \&gnu_version, + comment => "bundled with apache2 2.0.46" }, + perl => { version => "5.6.1", test => \&gnu_version }, ); my %perl_glue = ( perl => $build{perl}, - "Apache::Test" => { test => \&a_t_version, version => "1.04", - comment => "bundled with mod_perl 1.99_09"}, - "ExtUtils::XSBuilder" => { test => \&xsb_version, version => "0.23" }, - mod_perl => { test => \&mp2_version, version => "1.99_09"}, + "Apache::Test" => { version => "1.04", test => \&a_t_version, + comment => "bundled with mod_perl 1.99_09" }, + "ExtUtils::XSBuilder" => { version => "0.23", test => \&xsb_version }, + mod_perl => { version => "1.99_09", test => \&mp2_version }, ); sub print_prereqs ($$) { @@ -65,13 +65,14 @@ } else { $comment = defined $comment ? " ($comment)" : ""; - printf "%30s: %s$comment\n", $_, $version; + printf "%30s: %s%s\n", $_, $version, $comment; } } } if (@ARGV == 0) { - if ($opts{version}) { + + if ($opts{version}) { # generate META.yml file content print < $perl_glue{mod_perl}, - perl => $perl_glue{perl}, + perl => $perl_glue{perl}, ); print_prereqs "requires:", \%runtime_prereqs; - print_prereqs "build_requires:", \%build_prereqs; + print_prereqs "build_requires:", \%perl_glue; } - else { + + else { # generate PREREQUISITES file content print "=" x 50, "\n"; - print_prereqs "Build system (core C API) prerequisites\n", \%build; + print_prereqs + "Build system (core C API) prerequisites\n", \%build; print "\n", "=" x 50, "\n"; - print_prereqs "Perl glue (Apache::Request) prerequisites\n", \%perl_glue; + print_prereqs + "Perl glue (Apache::Request) prerequisites\n", \%perl_glue; print "\n", "=" x 50, "\n"; - print_prereqs "Additional prerequisites for httpd-apreq-2 cvs builds\n",\%cvs; + print_prereqs + "Additional prerequisites for httpd-apreq-2 cvs builds\n", \%cvs; } exit 0; } + + +# test prerequisites from the command-line arguments my %prereq = (%cvs, %build, %perl_glue); die "$0 failed: unknown tool '$tool'.\n" unless $prereq{$tool};