Changeset 989

Show
Ignore:
Timestamp:
12/28/06 01:03:31 (2 years ago)
Author:
gboggs
Message:

- Moved the ExtUtils::Install prereq. check to the beginning of the setup, instead of the middle of the whole process.
- Ma sure there is a (0 byte) user-style.css so we don't unneccessarily barf into our error_log.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/wheeljack/build/Build.pm

    r782 r989  
    134134    my %args = @_; 
    135135 
     136    my $prereq = 'ExtUtils::Install 1.37_02'; 
     137    eval "use $prereq"; 
     138    die( "ERROR: Can't handle plugin directory manipulation: $@" ) 
     139        if ref($@) or $@ ne ''; 
     140 
    136141    # Do we have SSL support? 
    137     my $ssl = 'Crypt::SSLeay'; 
    138     eval { require $ssl }; 
    139     warn( "WARNING: $ssl not found. Can't use SSL.\n" ) if $@; 
     142    $prereq = 'Crypt::SSLeay'; 
     143    eval { require $prereq }; 
     144    warn( "WARNING: $prereq not found. Can't use SSL.\n" ) if $@; 
    140145 
    141146    # Replace the current language if given one as an argument. 
    …… 
    422427    $self->verbose( "Change to $stage_root" ); 
    423428 
     429    # Make sure there is a user-style so we don't barf unneccessarily into the error_log. 
     430    open STYLE, "> user_styles.css" or 
     431        die( "ERROR: Can't touch user_styles.css $@" ); 
     432    close STYLE; 
     433 
    424434    # Our database is named the same as the distribution (but with _'s) except for LDAP. 
    425435    (my $db = $stage_dir) =~ s/[.-]/_/g; 
    …… 
    628638    return unless $self->{'plugin=s@'}; 
    629639 
    630     my $prereq = 'ExtUtils::Install 1.37_02'; 
    631     eval "use $prereq"; 
    632     die( "ERROR: Can't handle plugin directory manipulation: $@" ) 
    633         if ref($@) or $@ ne ''; 
    634  
    635640    # Change to the export directory, if we are exporting. 
    636641    chdir( $self->{'export-dir=s'} ) or