httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cvs commit: httpd-apreq-2/build version_check.pl
Date Fri, 07 Nov 2003 23:01:56 GMT
joes        2003/11/07 15:01:56

  Modified:    build    version_check.pl
  Log:
  Improve accuracy of META.yml output.
  
  Revision  Changes    Path
  1.7       +23 -9     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- version_check.pl	7 Nov 2003 20:05:20 -0000	1.6
  +++ version_check.pl	7 Nov 2003 23:01:56 -0000	1.7
  @@ -48,6 +48,7 @@
               );
   
   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"  },
  @@ -59,37 +60,50 @@
       print $preamble, "\n";
       for (sort keys %$prereq) {
           my ($version, $comment) = @{$prereq->{$_}}{qw/version comment/};
  -        if ($opts{version} or not defined $comment) {
  -            $comment = "";
  +        if ($opts{version}) {
  +            print "  $_: $version\n";
           }
           else {
  -            $comment = "   ($comment)";
  +            $comment = defined $comment ? "  ($comment)" : "";
  +            printf "%30s:  %s$comment\n", $_, $version;
           }
  -
  -        printf "%30s:  %s$comment\n", $_, $version;
       }
  -    print "\n";
   }
   
   if (@ARGV == 0) {
       if ($opts{version}) {
           print <<EOT;
  +--- #YAML:1.0 (see http://module-build.sourceforge.net/META-spec.html)
   name: libapreq2
   version: $opts{version}
  +license: open_source
   installdirs: site
   distribution_type: module
  +dynamic_config: 1
  +provides:
  +  Apache::Request:
  +    version: $opts{version}
  +  Apache::Cookie:
  +    version: $opts{version}
   generated_by: $0
   EOT
  -        print_prereqs "requires:", \%perl_glue;
  +        my %build_prereqs = %perl_glue;
  +        my %runtime_prereqs =  (
  +                                mod_perl => $perl_glue{mod_perl},
  +                                perl => $perl_glue{perl},
  +                               );
  +        print_prereqs "requires:", \%runtime_prereqs;
  +        print_prereqs "build_requires:", \%build_prereqs;
       }
       else {
           print "=" x 50, "\n";
           print_prereqs "Build system (core C API) prerequisites\n", \%build;
  -        print "=" x 50, "\n";
  +        print "\n", "=" x 50, "\n";
           print_prereqs "Perl glue (Apache::Request) prerequisites\n", \%perl_glue;
  -        print "=" x 50, "\n";
  +        print "\n", "=" x 50, "\n";
           print_prereqs "Additional prerequisites for httpd-apreq-2 cvs builds\n",\%cvs;
       }
  +
       exit 0;
   }
   
  
  
  

Mime
View raw message