Subversion Repositories DevTools

Rev

Rev 341 | Rev 359 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 341 Rev 347
Line 215... Line 215...
215 
            my $ver = $2;
 215 
            my $ver = $2;
216 
 
 216 
 
217 
#print "Got Archive stuff: $_ : $comp, $ver\n";
 217 
#print "Got Archive stuff: $_ : $comp, $ver\n";
218 
 
 218 
 
219 
            Error "Version not specified for: $comp" unless ( $ver );
 219 
            Error "Version not specified for: $comp" unless ( $ver );
220 
            Warning "Suspect version format for: $comp ($ver)" unless ( $opt_mode || $ver =~ m~^\w+\.\w+\.\w+.\w+$~ || $ver =~ m~^\w+\.\w+\.\w+$~ );
 220 
            Warning "Suspect version format for: $comp ($ver)" unless ( $opt_mode || $ver =~ m~^\w+\.\w+\.\w+.\w+$~ || $ver =~ m~^\w+\.\w+\.\w+$~ || $ver =~ m~\.cots$~);
221 
 
 221 
 
222 
            save_package( $comp, $ver );
 222 
            save_package( $comp, $ver );
223 
            next;
 223 
            next;
224 
        }
 224 
        }
225
225
Line 229... Line 229...
229 
        #   Process line as
 229 
        #   Process line as
230 
        #       component version
 230 
        #       component version
231 
        #
 231 
        #
232 
        my ( $comp, $ver, $opt ) = split( /[\s,]+/, $_, 3);
 232 
        my ( $comp, $ver, $opt ) = split( /[\s,]+/, $_, 3);
233 
        Error "Version not specified for: $comp" unless ( $ver );
 233 
        Error "Version not specified for: $comp" unless ( $ver );
234 
        Warning "Suspect version format for: $comp ($ver)" unless ( $opt_mode || $ver =~ m~^\w+\.\w+\.\w+.\w+$~ || $ver =~ m~^\w+\.\w+\.\w+$~ );
 234 
        Warning "Suspect version format for: $comp ($ver)" unless ( $opt_mode || $ver =~ m~^\w+\.\w+\.\w+.\w+$~ || $ver =~ m~^\w+\.\w+\.\w+$~ || $ver =~ m~\.cots$~);
235 
        save_package( $comp, $ver );
 235 
        save_package( $comp, $ver );
236 
    }
 236 
    }
237 
    close FILE;
 237 
    close FILE;
238 
 
 238 
 
239 
#    DebugDumpData ("component", \%component );
 239 
#    DebugDumpData ("component", \%component );
Line 763... Line 763...
763 
    my ($package, $version) = @_;
 763 
    my ($package, $version) = @_;
764 
 
 764 
 
765 
    my $rel;
 765 
    my $rel;
766 
    my $suf;
 766 
    my $suf;
767 
 
 767 
 
- 
 
 768 
    #
- 
 
 769 
    #   Cots packages are special. They end in '.cots'
- 
 
 770 
    #
- 
 
 771 
    if ( $version =~ m~(.*)[\.\s](cots)$~ )
- 
 
 772 
    {
- 
 
 773 
        $rel = $1;
- 
 
 774 
        $suf = $2
- 
 
 775 
    }
768 
    if ( $version =~ m~^(.*?)([\.\s]([^0-9]+))$~ )
 776 
    elsif ( $version =~ m~^(.*?)([\.\s]([^0-9]+))$~ )
769 
    {
 777 
    {
770 
        $rel = $1;
 778 
        $rel = $1;
771 
        $suf = $3;
 779 
        $suf = $3;
772 
        $suf = '' unless ( $suf );
 780 
        $suf = '' unless ( $suf );
773 
    }
 781 
    }
774 
    else
 782 
    else
775 
    {
 783 
    {
776 
        $rel = $version;
 784 
        $rel = $version;
777 
        $suf = '';
 785 
        $suf = '';
778 
    }
 786 
    }
779 
 
 - 
 
780 
    return ( $rel, $suf );
 787 
    return ( $rel, $suf );
781 
}
 788 
}
782 
 
 789 
 
783 
#-------------------------------------------------------------------------------
 790 
#-------------------------------------------------------------------------------
784 
# Function        : get_version
 791 
# Function        : get_version