WebSVN – DevTools – Diff – /core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_procdata.pl



        delete $ScmPackages{$_};
    }
}
 
Message ("Create Package Sets");
my $badCount = 0;
foreach ( keys %ScmPackages )
{
    my $pkgid = $ScmPackages{$_}{pkgid};
    unless ( $pkgid )
    {
        $badCount++;
        next;
    }
 
    push @{$PackageSet{$pkgid}}, $_;
 
    my ($vob, $path) = extractVob($_);
    if ($vob)
    {
        next if ( $ScmPackages{$_}{BadVob} );
        $Vobs{$vob}++;
        push @{$PackageData{$pkgid}{vobs}{$vob}}, $_ ;
        push @{$PackageData{$pkgid}{vobPath}{$path}}, $_  if ($path);
    }
 

    }
 
 
    $PackageData{$pkgid}{name} = $ScmPackages{$_}{name} ;
}
Warning ("Bad Package Data entries: " . $badCount ) if $badCount;
 
#
#   Tag packages with BadVob and MultiVob
#
foreach my $pkgid ( keys %PackageSet )

    close $fh;
    Message("Unique Package Names: $count");
#    DebugDumpData("PackageData", \%PackageData);
}
 
 
#
#   Display MutiVob Packages
#
    foreach my $pkgid (  keys %PackageData )
    {

            foreach my $pvid ( @{$PackageData{$pkgid}{vobs}{$vob}} )
            {
                Message ("        $ScmPackages{$pvid}{'version'}, $ScmPackages{$pvid}{'vcstag'}");
            }
        }
#DebugDumpData("DATA",$PackageData{$pkgid} );
    }
 
 
=pod
    foreach my $pkgid (  keys %PackageData )
    {
        next unless ( $PackageData{$pkgid}{isSVN}  );

#        $t->setRowHead(-1,1);
        
        my $t2 = new HTML::Table( -border=>0, -padding=>0, -spacing=>0 );
        foreach my $pvid ( sort {$ScmPackages{$a}{fullVersion} cmp $ScmPackages{$b}{fullVersion} } @{$PackageSet{$pkgid}} )
        {
            my @markers;
            if ( $ScmPackages{$pvid}{BadVob} || $ScmPackages{$pvid}{BadCCView}  ) {
 
                push @markers, hRef( "#BadVcs_$pvid", ' -Bad Tag');
            }
 
            if ( $ScmPackages{$pvid}{sbomOsid} || $ScmPackages{$pvid}{sbomBase}  ) {
                push @markers, 'SBOM';
            }
            
 
            $t2->addRow( linkPvid($pvid, undef, 1), "@markers" );
 
            push @badVobs,$pvid if ($ScmPackages{$pvid}{BadVob});
        }
        $t->addRow("Versions used:", $t2->getTable);
        $t->addRow("Type:", $PackageData{$pkgid}{type});

        if ( exists ($PackageData{$pkgid}{vobs}{MREF_Package}) )
        {
            $vob = 'MREF_Package';
        }
 
        if ( exists ($PackageData{$pkgid}{vobs}{MASS_Dev}) && exists ($PackageData{$pkgid}{vobs}{MASS_Dev_Bus}))
        {
            $vob = 'MASS_Dev_Bus';
        }
        
        if ( $vob )
        {
            $pathBase[0] = $vob;
            $pathFull[0] = $vob;
        }

        $bad = 1 if ( $path =~ m~^http:~i );
        $bad = 1 if ( $path =~ m~^[A-Za-z]\:~ );
        $bad = 1 if ( $path =~ m~^//~ );
        $bad = 1 if ( $path =~ m~^/blade1/~ );
        $bad = 1 if ( $path =~ m~^/devl/~ );
        $bad = 1 if ( $path =~ m~^/*none~i );
        $bad = 1 if ( $path =~ m~^/*NoWhere~i );
        $bad = 1 if ( $path =~ m~^-$~i );
        $bad = 1 if ( $path =~ m~[()]~ );
#        $bad = 1 unless ( $path =~ m~^/~ );
    }
    else
    {

    }
 
    return $packageType, keys %suffixes;
}
 
 
#-------------------------------------------------------------------------------
# Function        : vcsCleanup
#
# Description     : Cleanup and rewrite a vcstag
#
#                   DUPLICATED IN:
#                       - cc2svn_procdata
#                       - cc2svn_impartpackage
#
# Inputs          : vcstag
#
# Returns         : Cleaned up vcs tag
#
sub vcsCleanup
{
    my ($tag) = @_;
    $tag =~ tr~\\/~/~;
    if ( $tag =~ m~^CC::~ )
    {
        $tag =~ s~CC::\s+~CC::~;
        $tag =~ s~MASS_Dev_Bus/Cbp/~MASS_Dev_Bus/CBP/~i;
        $tag =~ s~MASS_Dev_Bus~MASS_Dev_Bus~i;
        $tag =~ s~/MASS_Dev/Infra~MASS_Dev_Infra~i;
        $tag =~ s~/MASS_Dev/Bus/web~/MASS_Dev_Bus/web~i;
 
        $tag =~ s~/Vastraffik/~/Vasttrafik/~;
        $tag =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
 
    }
    return $tag;
}
 
#-------------------------------------------------------------------------------
# Function        : extractVob
#
# Description     : Extract the VOB for a package
#

#
sub extractVob
{
    my ($entry) = @_;
 
    $ScmPackages{$entry}{'vcstag'} = vcsCleanup($ScmPackages{$entry}{'vcstag'});
 
    my $tag = $ScmPackages{$entry}{vcstag};
    my $package = $ScmPackages{$entry}{name};
    if ( $tag =~ m~^SVN::~ )
    {

Rev 392	Rev 394
Line 137...	Line 137...
137	`delete $ScmPackages{$_};`	137	`delete $ScmPackages{$_};`
138	`}`	138	`}`
139	`}`	139	`}`
140		140
141	`Message ("Create Package Sets");`	141	`Message ("Create Package Sets");`
-		142	`my $badCount = 0;`
142	`foreach ( keys %ScmPackages )`	143	`foreach ( keys %ScmPackages )`
143	`{`	144	`{`
144	`my $pkgid = $ScmPackages{$_}{pkgid};`	145	`my $pkgid = $ScmPackages{$_}{pkgid};`
-		146	`unless ( $pkgid )`
-		147	`{`
-		148	`$badCount++;`
-		149	`next;`
-		150	`}`
-		151
145	`push @{$PackageSet{$pkgid}}, $_;`	152	`push @{$PackageSet{$pkgid}}, $_;`
146		153
147	`my ($vob, $path) = extractVob($_);`	154	`my ($vob, $path) = extractVob($_);`
148	`if ($vob)`	155	`if ($vob)`
149	`{`	156	`{`
-		157	`next if ( $ScmPackages{$_}{BadVob} );`
150	`$Vobs{$vob}++;`	158	`$Vobs{$vob}++;`
151	`push @{$PackageData{$pkgid}{vobs}{$vob}}, $_ ;`	159	`push @{$PackageData{$pkgid}{vobs}{$vob}}, $_ ;`
152	`push @{$PackageData{$pkgid}{vobPath}{$path}}, $_ if ($path);`	160	`push @{$PackageData{$pkgid}{vobPath}{$path}}, $_ if ($path);`
153	`}`	161	`}`
154		162
Line 182...	Line 190...
182	`}`	190	`}`
183		191
184		192
185	`$PackageData{$pkgid}{name} = $ScmPackages{$_}{name} ;`	193	`$PackageData{$pkgid}{name} = $ScmPackages{$_}{name} ;`
186	`}`	194	`}`
-		195	`Warning ("Bad Package Data entries: " . $badCount ) if $badCount;`
187		196
188	`#`	197	`#`
189	`# Tag packages with BadVob and MultiVob`	198	`# Tag packages with BadVob and MultiVob`
190	`#`	199	`#`
191	`foreach my $pkgid ( keys %PackageSet )`	200	`foreach my $pkgid ( keys %PackageSet )`
Line 248...	Line 257...
248	`close $fh;`	257	`close $fh;`
249	`Message("Unique Package Names: $count");`	258	`Message("Unique Package Names: $count");`
250	`# DebugDumpData("PackageData", \%PackageData);`	259	`# DebugDumpData("PackageData", \%PackageData);`
251	`}`	260	`}`
252		261
253	`=pod`	-
254	`#`	262	`#`
255	`# Display MutiVob Packages`	263	`# Display MutiVob Packages`
256	`#`	264	`#`
257	`foreach my $pkgid ( keys %PackageData )`	265	`foreach my $pkgid ( keys %PackageData )`
258	`{`	266	`{`
Line 264...	Line 272...
264	`foreach my $pvid ( @{$PackageData{$pkgid}{vobs}{$vob}} )`	272	`foreach my $pvid ( @{$PackageData{$pkgid}{vobs}{$vob}} )`
265	`{`	273	`{`
266	`Message (" $ScmPackages{$pvid}{'version'}, $ScmPackages{$pvid}{'vcstag'}");`	274	`Message (" $ScmPackages{$pvid}{'version'}, $ScmPackages{$pvid}{'vcstag'}");`
267	`}`	275	`}`
268	`}`	276	`}`
-		277	`#DebugDumpData("DATA",$PackageData{$pkgid} );`
269	`}`	278	`}`
270	`=cut`	-
271		279
272	`=pod`	280	`=pod`
273	`foreach my $pkgid ( keys %PackageData )`	281	`foreach my $pkgid ( keys %PackageData )`
274	`{`	282	`{`
275	`next unless ( $PackageData{$pkgid}{isSVN} );`	283	`next unless ( $PackageData{$pkgid}{isSVN} );`
Line 586...	Line 594...
586	`# $t->setRowHead(-1,1);`	594	`# $t->setRowHead(-1,1);`
587		595
588	`my $t2 = new HTML::Table( -border=>0, -padding=>0, -spacing=>0 );`	596	`my $t2 = new HTML::Table( -border=>0, -padding=>0, -spacing=>0 );`
589	`foreach my $pvid ( sort {$ScmPackages{$a}{fullVersion} cmp $ScmPackages{$b}{fullVersion} } @{$PackageSet{$pkgid}} )`	597	`foreach my $pvid ( sort {$ScmPackages{$a}{fullVersion} cmp $ScmPackages{$b}{fullVersion} } @{$PackageSet{$pkgid}} )`
590	`{`	598	`{`
591	`my $marker = '';`	599	`my @markers;`
592	`if ( $ScmPackages{$pvid}{BadVob} \|\| $ScmPackages{$pvid}{BadCCView} )`	600	`if ( $ScmPackages{$pvid}{BadVob} \|\| $ScmPackages{$pvid}{BadCCView} ) {`
593	`{`	-
594	`$marker = hRef( "#BadVcs_$pvid", ' -Bad Tag');`	601	`push @markers, hRef( "#BadVcs_$pvid", ' -Bad Tag');`
595	`}`	602	`}`
-		603
-		604	`if ( $ScmPackages{$pvid}{sbomOsid} \|\| $ScmPackages{$pvid}{sbomBase} ) {`
-		605	`push @markers, 'SBOM';`
-		606	`}`
-		607
-		608
596	`$t2->addRow( linkPvid($pvid, undef, 1), $marker );`	609	`$t2->addRow( linkPvid($pvid, undef, 1), "@markers" );`
597		610
598	`push @badVobs,$pvid if ($ScmPackages{$pvid}{BadVob});`	611	`push @badVobs,$pvid if ($ScmPackages{$pvid}{BadVob});`
599	`}`	612	`}`
600	`$t->addRow("Versions used:", $t2->getTable);`	613	`$t->addRow("Versions used:", $t2->getTable);`
601	`$t->addRow("Type:", $PackageData{$pkgid}{type});`	614	`$t->addRow("Type:", $PackageData{$pkgid}{type});`
Line 1418...	Line 1431...
1418	`if ( exists ($PackageData{$pkgid}{vobs}{MREF_Package}) )`	1431	`if ( exists ($PackageData{$pkgid}{vobs}{MREF_Package}) )`
1419	`{`	1432	`{`
1420	`$vob = 'MREF_Package';`	1433	`$vob = 'MREF_Package';`
1421	`}`	1434	`}`
1422		1435
-		1436	`if ( exists ($PackageData{$pkgid}{vobs}{MASS_Dev}) && exists ($PackageData{$pkgid}{vobs}{MASS_Dev_Bus}))`
-		1437	`{`
-		1438	`$vob = 'MASS_Dev_Bus';`
-		1439	`}`
-		1440
1423	`if ( $vob )`	1441	`if ( $vob )`
1424	`{`	1442	`{`
1425	`$pathBase[0] = $vob;`	1443	`$pathBase[0] = $vob;`
1426	`$pathFull[0] = $vob;`	1444	`$pathFull[0] = $vob;`
1427	`}`	1445	`}`
Line 1561...	Line 1579...
1561	`$bad = 1 if ( $path =~ m~^http:~i );`	1579	`$bad = 1 if ( $path =~ m~^http:~i );`
1562	`$bad = 1 if ( $path =~ m~^[A-Za-z]\:~ );`	1580	`$bad = 1 if ( $path =~ m~^[A-Za-z]\:~ );`
1563	`$bad = 1 if ( $path =~ m~^//~ );`	1581	`$bad = 1 if ( $path =~ m~^//~ );`
1564	`$bad = 1 if ( $path =~ m~^/blade1/~ );`	1582	`$bad = 1 if ( $path =~ m~^/blade1/~ );`
1565	`$bad = 1 if ( $path =~ m~^/devl/~ );`	1583	`$bad = 1 if ( $path =~ m~^/devl/~ );`
-		1584	`$bad = 1 if ( $path =~ m~^/*none~i );`
-		1585	`$bad = 1 if ( $path =~ m~^/*NoWhere~i );`
-		1586	`$bad = 1 if ( $path =~ m~^-$~i );`
1566	`$bad = 1 if ( $path =~ m~[()]~ );`	1587	`$bad = 1 if ( $path =~ m~[()]~ );`
1567	`# $bad = 1 unless ( $path =~ m~^/~ );`	1588	`# $bad = 1 unless ( $path =~ m~^/~ );`
1568	`}`	1589	`}`
1569	`else`	1590	`else`
1570	`{`	1591	`{`
Line 1659...	Line 1680...
1659	`}`	1680	`}`
1660		1681
1661	`return $packageType, keys %suffixes;`	1682	`return $packageType, keys %suffixes;`
1662	`}`	1683	`}`
1663		1684
-		1685
-		1686	`#-------------------------------------------------------------------------------`
-		1687	`# Function : vcsCleanup`
-		1688	`#`
-		1689	`# Description : Cleanup and rewrite a vcstag`
-		1690	`#`
-		1691	`# DUPLICATED IN:`
-		1692	`# - cc2svn_procdata`
-		1693	`# - cc2svn_impartpackage`
-		1694	`#`
-		1695	`# Inputs : vcstag`
-		1696	`#`
-		1697	`# Returns : Cleaned up vcs tag`
-		1698	`#`
-		1699	`sub vcsCleanup`
-		1700	`{`
-		1701	`my ($tag) = @_;`
-		1702	`$tag =~ tr~\\/~/~;`
-		1703	`if ( $tag =~ m~^CC::~ )`
-		1704	`{`
-		1705	`$tag =~ s~CC::\s+~CC::~;`
-		1706	`$tag =~ s~MASS_Dev_Bus/Cbp/~MASS_Dev_Bus/CBP/~i;`
-		1707	`$tag =~ s~MASS_Dev_Bus~MASS_Dev_Bus~i;`
-		1708	`$tag =~ s~/MASS_Dev/Infra~MASS_Dev_Infra~i;`
-		1709	`$tag =~ s~/MASS_Dev/Bus/web~/MASS_Dev_Bus/web~i;`
-		1710
-		1711	`$tag =~ s~/Vastraffik/~/Vasttrafik/~;`
-		1712	`$tag =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;`
-		1713
-		1714	`}`
-		1715	`return $tag;`
-		1716	`}`
-		1717
1664	`#-------------------------------------------------------------------------------`	1718	`#-------------------------------------------------------------------------------`
1665	`# Function : extractVob`	1719	`# Function : extractVob`
1666	`#`	1720	`#`
1667	`# Description : Extract the VOB for a package`	1721	`# Description : Extract the VOB for a package`
1668	`#`	1722	`#`
Line 1672...	Line 1726...
1672	`#`	1726	`#`
1673	`sub extractVob`	1727	`sub extractVob`
1674	`{`	1728	`{`
1675	`my ($entry) = @_;`	1729	`my ($entry) = @_;`
1676		1730
1677	`$ScmPackages{$entry}{'vcstag'} =~ tr~\\/~/~;`	1731	`$ScmPackages{$entry}{'vcstag'} = vcsCleanup($ScmPackages{$entry}{'vcstag'});`
1678		1732
1679	`my $tag = $ScmPackages{$entry}{vcstag};`	1733	`my $tag = $ScmPackages{$entry}{vcstag};`
1680	`my $package = $ScmPackages{$entry}{name};`	1734	`my $package = $ScmPackages{$entry}{name};`
1681	`if ( $tag =~ m~^SVN::~ )`	1735	`if ( $tag =~ m~^SVN::~ )`
1682	`{`	1736	`{`

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_procdata.pl – Rev 392 → 394