[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apreq-cvs
Subject:    cvs commit: httpd-apreq-2/build xsbuilder.pl
From:       joes () apache ! org
Date:       2003-10-31 20:48:57
[Download RAW message or body]

joes        2003/10/31 12:48:57

  Modified:    build    xsbuilder.pl
  Log:
  Add version regexp for perl glue on Win32
  
  Revision  Changes    Path
  1.19      +5 -2      httpd-apreq-2/build/xsbuilder.pl
  
  Index: xsbuilder.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/build/xsbuilder.pl,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- xsbuilder.pl	30 Oct 2003 04:45:52 -0000	1.18
  +++ xsbuilder.pl	31 Oct 2003 20:48:57 -0000	1.19
  @@ -19,7 +19,7 @@
   my $xs_dir = "$base_dir/glue/perl/xsbuilder";
   sub slurp($$)
   {
  -    open my $file, $_[1] or die $!;
  +    open my $file, $_[1] or die "Can't open $_[1]: $!";
       read $file, $_[0], -s $file;
   }
   
  @@ -27,7 +27,10 @@
   
   if (Apache::Build::WIN32) {
       # XXX May need fixing, Randy!
  -    # XXX How do we set $version in the Win32 build?
  +    slurp my $config => "$base_dir/configure.ac";
  +    $config =~ /^AC_INIT[^,]+,\s*([^,\s]+)/m or 
  +        die "Can't find version string";
  +    $version = $1;
       my $apache_dir = Apache::Build->build_config()->dir;
       ($apache_includes = "-I$apache_dir" . '/include') =~ s!\\!/!g;
       ($apr_libs = $apache_dir . '/lib') =~ s!\\!/!g;
  
  
  
[prev in list] [next in list] [prev in thread] [next in thread]