Subversion Repositories DevTools

Rev

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

Rev 2553 Rev 2635
Line 286... Line 286...
286 
Message ("Mapping Vobs to Repo");
 286 
Message ("Mapping Vobs to Repo");
287 
foreach my $pkgid ( keys %PackageSet )
 287 
foreach my $pkgid ( keys %PackageSet )
288 
{
 288 
{
289 
    my $repo = mapPackage($pkgid);
 289 
    my $repo = mapPackage($pkgid);
290 
    Error ("Unmapped package: $PackageData{$pkgid}{name}" ) unless ( $repo );
 290 
    Error ("Unmapped package: $PackageData{$pkgid}{name}" ) unless ( $repo );
- 
 
 291 
 
- 
 
 292 
    if ( exists $PackageData{$pkgid}{mappingPath} && $PackageData{$pkgid}{mappingPath} =~ m/LinuxDevices/ )
- 
 
 293 
    {
- 
 
 294 
        printf "%-35s %s\n",$PackageData{$pkgid}{name}, $PackageData{$pkgid}{mappingPath};
- 
 
 295 
    }
- 
 
 296 
 
- 
 
 297 
 
291 
    my $repo_lc = lc $repo;
 298 
    my $repo_lc = lc $repo;
292 
 
 299 
 
293 
    if (exists $Repos_lowercase{$repo_lc} && $Repos_lowercase{$repo_lc} ne $repo )
 300 
    if (exists $Repos_lowercase{$repo_lc} && $Repos_lowercase{$repo_lc} ne $repo )
294 
    {
 301 
    {
295 
        Error ("Package mapping: Mapped to Repo with same name, but different case",
 302 
        Error ("Package mapping: Mapped to Repo with same name, but different case",
Line 1562... Line 1569...
1562 
        'boi'                                   => 'MASS_Dev_Bus/BOI',
 1569 
        'boi'                                   => 'MASS_Dev_Bus/BOI',
1563 
 
 1570 
 
1564 
        'mrviewer'                              => 'MASS_Dev_Infra/Reports',
 1571 
        'mrviewer'                              => 'MASS_Dev_Infra/Reports',
1565 
        'cdss'                                  => 'MASS_Dev_Infra/Cdss',
 1572 
        'cdss'                                  => 'MASS_Dev_Infra/Cdss',
1566 
        'InfraPSS'                              => 'MASS_Dev_Infra',
 1573 
        'InfraPSS'                              => 'MASS_Dev_Infra',
- 
 
 1574 
 
- 
 
 1575 
 
- 
 
 1576 
        'arm-926ejs-linux-gnueabi'              => 'LinuxDevices/linux/compilers',
- 
 
 1577 
        'linux_gnu_tools'                       => 'LinuxDevices/linux/compilers',
- 
 
 1578 
        'vsdev-proftpd-insecure'                => 'SmartSite',
- 
 
 1579 
        'obe'                                   => 'ITSO_TRACS/obe',
- 
 
 1580 
        'obme'                                  => 'ITSO_TRACS/obe',
1567
1581
1568 
    );
 1582 
    );
1569 
 
 1583 
 
1570 
    my %VobRename = (
 1584 
    my %VobRename = (
1571 
        'LMOS'              => 'LinuxDevices',
 1585 
        'LMOS'                      => 'LinuxDevices',
1572 
        'MANUFACTURING'     => 'Manufacturing',
 1586 
        'MANUFACTURING'             => 'Manufacturing',
1573 
        'MREF_Package'      => 'MREF_Package',
 1587 
        'MREF_Package'              => 'MREF_Package',
1574 
        'MASS_Dev'          => 'MASS_Dev_Bus',
 1588 
        'MASS_Dev'                  => 'MASS_Dev_Bus',
1575 
        's4k_tracs'         => 'TRACS',
 1589 
        's4k_tracs'                 => 'TRACS',
1576 
        'MASS_Dev_Tools'    => 'DevTools',
 1590 
        'MASS_Dev_Tools'            => 'DevTools',
1577 
 
 1591 
 
1578 
        'GMPTE2005'             => 'ITSO_TRACS',
 1592 
        'GMPTE2005'                 => 'ITSO_TRACS',
1579 
        'GMPTE2005_obe'         => 'ITSO_TRACS',
 1593 
        'GMPTE2005_obe'             => 'ITSO_TRACS/obe',
1580 
        'UK_ITSO_COMPLIANT'     => 'ITSO_TRACS',
 1594 
        'UK_ITSO_COMPLIANT'         => 'ITSO_TRACS',
1581 
 
 1595 
 
1582 
        'MASS_Dev_Infra/security'   => 'MASS_Dev_Infra/Security',
 1596 
        'MASS_Dev_Infra/security'   => 'MASS_Dev_Infra/Security',
1583 
        'MASS_Dev_Infra/web'        => 'MASS_Dev_Infra/Web',
 1597 
        'MASS_Dev_Infra/web'        => 'MASS_Dev_Infra/Web',
1584 
        'MASS_Dev_Infra/cdss'       => 'MASS_Dev_Infra/Cdss',
 1598 
        'MASS_Dev_Infra/cdss'       => 'MASS_Dev_Infra/Cdss',
1585 
 
 1599 
 
1586 
        'TRACS/faresets'            => 'ITSO_TRACS/faresets',
 1600 
        'TRACS/faresets'            => 'ITSO_TRACS/faresets',
1587 
        'ProjectCD'                 => 'DPG_SWCode/ProjectCD',
 1601 
        'ProjectCD'                 => 'DPG_SWCode/ProjectCD',
- 
 
 1602 
 
- 
 
 1603 
        'LinuxDevices/linux/tools'      => 'LinuxDevices/tools',
- 
 
 1604 
        'LinuxDevices/apps/iVal-AFC'    => 'LinuxDevices/iVal-AFC'
1588 
    );
 1605 
    );
1589 
 
 1606 
 
1590 
    my %PreferredPath = (
 1607 
    my %PreferredPath = (
1591 
        'MASS_Dev_Bus/Reports'      => 1,
 1608 
        'MASS_Dev_Bus/Reports'      => 1,
1592 
        'MASS_Dev_Bus/CBP'          => 1,
 1609 
        'MASS_Dev_Bus/CBP'          => 1,
1593 
        'MASS_Dev_Bus/Business'     => 1,
 1610 
        'MASS_Dev_Bus/Business'     => 1,
1594 
        'MASS_Dev_Bus/CIPP'        => 1,
 1611 
        'MASS_Dev_Bus/CIPP'         => 1,
1595 
 
 1612 
 
1596 
        'MASS_Dev_Infra/ProjectSpecific' => 1,
 1613 
        'MASS_Dev_Infra/ProjectSpecific' => 1,
1597 
    );
 1614 
    );
1598 
 
 1615 
 
1599 
    # default is 1
 1616 
    # default is 1
1600 
    my %VobDepth = (
 1617 
    my %VobDepth = (
1601 
        'DPG_SWBase'                => 2,
 1618 
        'DPG_SWBase'                => 2,
1602 
        'ITSO_TRACS'                => 2,
 1619 
        'ITSO_TRACS'                => 2,
1603 
        'ITSO_TRACS/Packages'       => 1,
 1620 
        'ITSO_TRACS/Packages'       => 1,
1604 
        'LinuxDevices'              => 2,
 - 
 
1605 
        'MASS_Dev_Bus'              => 2,
 1621 
        'MASS_Dev_Bus'              => 2,
1606 
        'MASS_Dev_Infra'            => 2,
 1622 
        'MASS_Dev_Infra'            => 2,
1607 
        'MPR'                       => 2,
 1623 
        'MPR'                       => 2,
1608 
        'DPG_SWCode/ProjectCD'      => 3,
 1624 
        'DPG_SWCode/ProjectCD'      => 3,
1609 
        'TRACS'                     => 2,
 1625 
        'TRACS'                     => 2,
1610 
        'VIX-PAYMENTS'              => 2,
 1626 
        'VIX-PAYMENTS'              => 2,
1611 
        'WINCE500'                  => 2,
 1627 
        'WINCE500'                  => 2,
1612 
        'LinuxDevices/linux'        => 3,
 - 
 
1613 
        'DAMS_mos_diag'             => 2,
 1628 
        'DAMS_mos_diag'             => 2,
1614 
        'MASS_Dev_Bus/Financial'    => 3,
 1629 
        'MASS_Dev_Bus/Financial'    => 3,
- 
 
 1630 
        'LinuxDevices'              => 2,
- 
 
 1631 
        'LinuxDevices/linux'        => 3,
- 
 
 1632 
        'SmartSite'                 => 2,
1615 
    );
 1633 
    );
1616 
 
 1634 
 
1617 
    return ('SVN') if ( $PackageData{$pkgid}{isSVN} );
 1635 
    return ('SVN') if ( $PackageData{$pkgid}{isSVN} );
1618 
    my $name = $PackageData{$pkgid}{name};
 1636 
    my $name = $PackageData{$pkgid}{name};
1619 
 
 1637 
 
Line 1650... Line 1668...
1650 
        my $newName = $VobRename{$name};
 1668 
        my $newName = $VobRename{$name};
1651 
        $path =~ s~^/$name/~/$newName/~i;
 1669 
        $path =~ s~^/$name/~/$newName/~i;
1652 
        $path =~ s~^/$name$~/$newName~i;
 1670 
        $path =~ s~^/$name$~/$newName~i;
1653 
    }
 1671 
    }
1654 
 
 1672 
 
- 
 
 1673 
    $PackageData{$pkgid}{mappingPath} = $path;
- 
 
 1674 
 
1655 
    return $Named{$name}  if ( exists $Named{$name} );
 1675 
    return $Named{$name}  if ( exists $Named{$name} );
1656 
 
 1676 
 
1657 
    return 'DevTools/ant'  if ( $name =~ m~^ant~ );
 1677 
    return 'DevTools/ant'  if ( $name =~ m~^ant~ );
1658 
    return 'DevTools/ant'  if ( $name =~ m~^jant~ );
 1678 
    return 'DevTools/ant'  if ( $name =~ m~^jant~ );
1659 
 
 1679 
 
1660 
    return 'LinuxDevices/tools' if ( $path =~ m~LinuxDevices/linux/tools~i );
 - 
 
1661 
 
 - 
 
1662 
    return 'MASS_Dev_Dataman' if ( $name =~ m~^dm_~ );
 1680 
    return 'MASS_Dev_Dataman' if ( $name =~ m~^dm_~ );
1663 
 
 1681 
 
1664 
    return 'MPR/EMV/emvl2' if ( $name =~ m~^cp[sf]-~ );
 1682 
    return 'MPR/EMV/emvl2' if ( $name =~ m~^cp[sf]-~ );
1665 
 
 1683 
 
1666 
    return 'COTS' if ( $PackageData{$pkgid}{type} eq 'COTS' && ! exists $PackageData{$pkgid}{vobs}{'LMOS'});
 1684 
    return 'COTS' if ( $PackageData{$pkgid}{type} eq 'COTS' && ! exists $PackageData{$pkgid}{vobs}{'LMOS'});
Line 1766... Line 1784...
1766 
                return $ppath;
 1784 
                return $ppath;
1767 
            }
 1785 
            }
1768 
        }
 1786 
        }
1769 
    }
 1787 
    }
1770 
 
 1788 
 
- 
 
 1789 
    if ( $vob eq 'LinuxDevices' )
- 
 
 1790 
    {
- 
 
 1791 
        @pathBase = @pathFull;
- 
 
 1792 
    }
- 
 
 1793 
 
1771 
    #
 1794 
    #
- 
 
 1795 
    #   Last resort
1772 
    #   Determine depth for this path
 1796 
    #   Determine depth for this path
1773 
    #
 1797 
    #
1774 
    my $depth = 1;
 1798 
    my $depth = 1;
1775 
    foreach ( reverse sort keys %VobDepth)
 1799 
    foreach ( reverse sort keys %VobDepth)
1776 
    {
 1800 
    {