Subversion Repositories DevTools

Rev

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

Rev 7300 Rev 7301
Line 71... Line 71...
71 
    return bless $self, __PACKAGE__;
 71 
    return bless $self, __PACKAGE__;
72 
}
 72 
}
73 
 
 73 
 
74 
sub New
 74 
sub New
75 
{
 75 
{
76 
    my ($base, $name, $version, $sandbox, $type, $local) = @_;
 76 
    my ($base, $name, $version, $sandbox, $type, $local, $pkgSig) = @_;
77 
    my $self = EmptyEntry();
 77 
    my $self = EmptyEntry();
78 
 
 78 
 
79 
    #   Load package description ...
 79 
    #   Load package description ...
80 
    #
 80 
    #
81 
    #       If a sandbox link, parse the build.pl and retrieve the BuildName()
 81 
    #       If a sandbox link, parse the build.pl and retrieve the BuildName()
Line 116... Line 116...
116 
            unless ( $rec );
 116 
            unless ( $rec );
117 
 
 117 
 
118 
        ::Warning( "Package names do not match: $rec->{NAME}, $name" )
 118 
        ::Warning( "Package names do not match: $rec->{NAME}, $name" )
119 
            if ( $rec->{NAME} ne $name );
 119 
            if ( $rec->{NAME} ne $name );
120 
 
 120 
 
121 
        if ( $local || substr($version,0,8) eq '!current' ||
 121 
        if ( $local )
122 
                substr($version,0,8) eq '!sandbox' )
 - 
 
123 
        {                                       # display results
 122 
        {                                       # display results
124 
            my $logPrefix = "               ->";
 123 
            my $logPrefix = "               ->";
125 
            if ( $local ) {
 124 
            if ( $local ) {
126 
                ::Log( "$logPrefix $base" );
 125 
                ::Log( "$logPrefix $base" );
127 
            } elsif ($rec->{NAME} eq "") {
 126 
            } elsif ($rec->{NAME} eq "") {
Line 147... Line 146...
147 
        $rec->{UNAME}    = $name;
 146 
        $rec->{UNAME}    = $name;
148 
        $rec->{UVERSION} = $version;
 147 
        $rec->{UVERSION} = $version;
149 
        $rec->{UVNUM}    = $vnum;
 148 
        $rec->{UVNUM}    = $vnum;
150 
        $rec->{UPROJ}    = $proj;
 149 
        $rec->{UPROJ}    = $proj;
151 
        $rec->{type}     = $type;
 150 
        $rec->{type}     = $type;
- 
 
 151 
        $rec->{PKGSIG}   = $pkgSig;
152 
 
 152 
 
153 
        $PackageDefined{$name}{$proj}{$vnum} = $base;
 153 
        $PackageDefined{$name}{$proj}{$vnum} = $base;
154 
        push @PackageList, $base;
 154 
        push @PackageList, $base;
155 
 
 155 
 
156 
        $DescPkgCache{$base} = $rec;                  # cache result
 156 
        $DescPkgCache{$base} = $rec;                  # cache result
Line 172... Line 172...
172 
    $self->{'dproj'}        = $descpkg->{PROJ} || $descpkg->{UPROJ} || '';
 172 
    $self->{'dproj'}        = $descpkg->{PROJ} || $descpkg->{UPROJ} || '';
173 
    $self->{'packages'}     = $descpkg->{PACKAGES};
 173 
    $self->{'packages'}     = $descpkg->{PACKAGES};
174 
    $self->{'type'}         = $type;
 174 
    $self->{'type'}         = $type;
175 
    $self->{'cfgdir'}       = "/gbe"
 175 
    $self->{'cfgdir'}       = "/gbe"
176 
        if ( $sandbox || -d $base."/gbe" );
 176 
        if ( $sandbox || -d $base."/gbe" );
- 
 
 177 
#    $self->{pkgsig}         = $descpkg->{PKGSIG};
177 
 
 178 
 
178 
    return $self;
 179 
    return $self;
179 
}
 180 
}
180 
 
 181 
 
181 
#-------------------------------------------------------------------------------
 182 
#-------------------------------------------------------------------------------
Line 535... Line 536...
535 
    }
 536 
    }
536 
 
 537 
 
537 
    return @list;
 538 
    return @list;
538 
}
 539 
}
539 
 
 540 
 
- 
 
 541 
#-------------------------------------------------------------------------------
- 
 
 542 
# Function        : GetPackageSignature
- 
 
 543 
#
- 
 
 544 
# Description     : A class function to return a packages signature
- 
 
 545 
#
- 
 
 546 
#
- 
 
 547 
# Inputs          : None
- 
 
 548 
#
- 
 
 549 
# Returns         : An array of version list entries
- 
 
 550 
#                   Each element of the form: "name (version)"
- 
 
 551 
#
- 
 
 552 
sub GetPackageSignature
- 
 
 553 
{
- 
 
 554 
    my ($tag) = @_;
- 
 
 555 
    my $rec = $DescPkgCache{$tag};
- 
 
 556 
    return $rec->{PKGSIG};
- 
 
 557 
}
- 
 
 558 
 
- 
 
 559 
 
540 
### End of package: PackageEntry
 560 
### End of package: PackageEntry
541 
 
 561 
 
542 
1;
 562 
1;
543 
 
 563