Subversion Repositories DevTools

Rev

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

Rev 2548 Rev 2553
Line 189... Line 189...
189 
        next if ( $ScmPackages{$_}{BadVob} );
 189 
        next if ( $ScmPackages{$_}{BadVob} );
190 
        $Vobs{$vob}++;
 190 
        $Vobs{$vob}++;
191 
        push @{$PackageData{$pkgid}{vobs}{$vob}}, $_ ;
 191 
        push @{$PackageData{$pkgid}{vobs}{$vob}}, $_ ;
192 
        push @{$PackageData{$pkgid}{vobPath}{$path}}, $_  if ($path);
 192 
        push @{$PackageData{$pkgid}{vobPath}{$path}}, $_  if ($path);
193 
        $PackageData{$pkgid}{vobResolver}{$vob} = $path;
 193 
        $PackageData{$pkgid}{vobResolver}{$vob} = $path;
- 
 
 194 
 
- 
 
 195 
        if ( $vob eq 'SVN' )
- 
 
 196 
        {
- 
 
 197 
            delete $ScmPackages{$_}{BadCCView} ;
- 
 
 198 
        }
194 
    }
 199 
    }
195 
 
 200 
 
196 
    my $view = $ScmPackages{$_}{view};
 201 
    my $view = $ScmPackages{$_}{view};
197 
    if ( $view )
 202 
    if ( $view )
198 
    {
 203 
    {
Line 1537... Line 1542...
1537 
 
 1542 
 
1538 
        'jboss_config'                          => 'MASS_Dev_Bus/Business' ,
 1543 
        'jboss_config'                          => 'MASS_Dev_Bus/Business' ,
1539 
        'jboss_service'                         => 'MASS_Dev_Bus/Business' ,
 1544 
        'jboss_service'                         => 'MASS_Dev_Bus/Business' ,
1540 
        'pgres'                                 => 'ITSO_TRACS/DataManagement' ,
 1545 
        'pgres'                                 => 'ITSO_TRACS/DataManagement' ,
1541 
        'ERGcda_imports'                        => 'MREF_Package',
 1546 
        'ERGcda_imports'                        => 'MREF_Package',
1542 
        'daf_dataman_extras'                    => 'ProjectCD/seattle',
 1547 
        'daf_dataman_extras'                    => 'DPG_SWCode/ProjectCD/seattle',
- 
 
 1548 
        'daf_paper_variables'                   => 'DPG_SWCode/ProjectCD',
- 
 
 1549 
 
1543 
        'XmlDocInterface'                       => 'MASS_Dev_Infra',
 1550 
        'XmlDocInterface'                       => 'MASS_Dev_Infra',
1544 
        'SPOS_IngenicoApp'                      => 'DPG_SWCode',
 1551 
        'SPOS_IngenicoApp'                      => 'DPG_SWCode',
1545 
 
 1552 
 
1546 
 
 1553 
 
1547 
        # Kill single package subdirs
 1554 
        # Kill single package subdirs
Line 1575... Line 1582...
1575 
        'MASS_Dev_Infra/security'   => 'MASS_Dev_Infra/Security',
 1582 
        'MASS_Dev_Infra/security'   => 'MASS_Dev_Infra/Security',
1576 
        'MASS_Dev_Infra/web'        => 'MASS_Dev_Infra/Web',
 1583 
        'MASS_Dev_Infra/web'        => 'MASS_Dev_Infra/Web',
1577 
        'MASS_Dev_Infra/cdss'       => 'MASS_Dev_Infra/Cdss',
 1584 
        'MASS_Dev_Infra/cdss'       => 'MASS_Dev_Infra/Cdss',
1578 
 
 1585 
 
1579 
        'TRACS/faresets'            => 'ITSO_TRACS/faresets',
 1586 
        'TRACS/faresets'            => 'ITSO_TRACS/faresets',
- 
 
 1587 
        'ProjectCD'                 => 'DPG_SWCode/ProjectCD',
1580 
    );
 1588 
    );
1581 
 
 1589 
 
1582 
    my %PreferredPath = (
 1590 
    my %PreferredPath = (
1583 
        'MASS_Dev_Bus/Reports'      => 1,
 1591 
        'MASS_Dev_Bus/Reports'      => 1,
1584 
        'MASS_Dev_Bus/CBP'          => 1,
 1592 
        'MASS_Dev_Bus/CBP'          => 1,
Line 1595... Line 1603...
1595 
        'ITSO_TRACS/Packages'       => 1,
 1603 
        'ITSO_TRACS/Packages'       => 1,
1596 
        'LinuxDevices'              => 2,
 1604 
        'LinuxDevices'              => 2,
1597 
        'MASS_Dev_Bus'              => 2,
 1605 
        'MASS_Dev_Bus'              => 2,
1598 
        'MASS_Dev_Infra'            => 2,
 1606 
        'MASS_Dev_Infra'            => 2,
1599 
        'MPR'                       => 2,
 1607 
        'MPR'                       => 2,
1600 
        'ProjectCD'                 => 2,
 1608 
        'DPG_SWCode/ProjectCD'      => 3,
1601 
        'TRACS'                     => 2,
 1609 
        'TRACS'                     => 2,
1602 
        'VIX-PAYMENTS'              => 2,
 1610 
        'VIX-PAYMENTS'              => 2,
1603 
        'WINCE500'                  => 2,
 1611 
        'WINCE500'                  => 2,
1604 
        'LinuxDevices/linux'        => 3,
 1612 
        'LinuxDevices/linux'        => 3,
1605 
        'DAMS_mos_diag'             => 2,
 1613 
        'DAMS_mos_diag'             => 2,
Line 1718... Line 1726...
1718 
 
 1726 
 
1719 
    #
 1727 
    #
1720 
    #   ProjectCd is badly done
 1728 
    #   ProjectCd is badly done
1721 
    #   Many packages are in named directories, some are not.
 1729 
    #   Many packages are in named directories, some are not.
1722 
    #
 1730 
    #
1723 
    if ( $vob eq 'ProjectCD' )
 1731 
    if ( defined $pathFull[1] && $pathFull[1] eq 'ProjectCD' )
1724 
    {
 1732 
    {
1725 
        return $vob if ( $name eq 'daf_paper_variables' );
 - 
 
1726 
        return ($vob . '/seattle')
 - 
 
1727 
            if (  grep {$_ eq 'seattle'} @pathFull );
 1733 
        push @pathBase, $pathFull[2] if ( defined $pathFull[2]  );
1728 
        return ($vob . '/stockholm')
 - 
 
1729 
            if (  grep {$_ eq 'stockholm'} @pathFull );
 - 
 
1730 
        return $vob;
 - 
 
1731 
    }
 1734 
    }
1732 
 
 1735 
 
1733 
    #
 1736 
    #
1734 
    #   Detect core_xxx packages
 1737 
    #   Detect core_xxx packages
1735 
    #
 1738 
    #