Subversion Repositories DevTools

Rev

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

Rev 3347 Rev 3559
Line 298... Line 298...
298 
    'qtobeapp'                        => 'Trunk=.uk',
 298 
    'qtobeapp'                        => 'Trunk=.uk',
299 
 
 299 
 
300 
    'br_applets'                      => 'flatTime,LimitProjectBase=/ProjectCD/seattle'.
 300 
    'br_applets'                      => 'flatTime,LimitProjectBase=/ProjectCD/seattle'.
301 
                                       ',mergePaths=++:build/**:Sales/**:FarePayment/**:KCM/**:unit_test/**:VP/**:WSF/**'.
 301 
                                       ',mergePaths=++:build/**:Sales/**:FarePayment/**:KCM/**:unit_test/**:VP/**:WSF/**'.
302 
                                       ',processRipples',
 302 
                                       ',processRipples',
- 
 
 303 
 
- 
 
 304 
    'CDAdministration'                => 'NoRetain,IgnoreMakeProject,XXXXLimitProjectBase=/MASS_Dev_Infra',
303
305
304 
 
 306 
 
305 
 
 307 
 
306 
    'icl'                   => 'IgnoreProjectBase,',
 308 
    'icl'                   => 'IgnoreProjectBase,',
307 
    'itso'                  => 'IgnoreProjectBase,',
 309 
    'itso'                  => 'IgnoreProjectBase,',
Line 1044... Line 1046...
1044 
        if ( index( $data, ',utf8,' ) >= 0) {
 1046 
        if ( index( $data, ',utf8,' ) >= 0) {
1045 
            $mustConvertFileNames = 1;
 1047 
            $mustConvertFileNames = 1;
1046 
            Message ("Convert filenames to UTF8");
 1048 
            Message ("Convert filenames to UTF8");
1047 
        }
 1049 
        }
1048 
 
 1050 
 
- 
 
 1051 
        if ( index( $data, ',NoRetain,' ) >= 0) {
- 
 
 1052 
            $opt_reuse = 2;
- 
 
 1053 
            Message ("Package Versions not Retained");
- 
 
 1054 
        }
- 
 
 1055 
 
1049 
        if ( $data =~ m~,Trunk=(.*?),~ ) {
 1056 
        if ( $data =~ m~,Trunk=(.*?),~ ) {
1050 
            my $tt = $1;
 1057 
            my $tt = $1;
1051 
            $Projects{$tt}{Trunk} = 1;
 1058 
            $Projects{$tt}{Trunk} = 1;
1052 
            Message ("Force project to trunk: $tt");
 1059 
            Message ("Force project to trunk: $tt");
1053 
        }
 1060 
        }
Line 3804... Line 3811...
3804 
        my $bdir = $bf->{dir};
 3811 
        my $bdir = $bf->{dir};
3805 
        my $bname = $bf->{name};
 3812 
        my $bname = $bf->{name};
3806 
        my $bversion = $bf->{version};
 3813 
        my $bversion = $bf->{version};
3807 
Information ("BuildFiles: $bname, $bversion : $bdir");
 3814 
Information ("BuildFiles: $bname, $bversion : $bdir");
3808 
 
 3815 
 
3809 
        if ( exists ($data{$bname}{count}) && ($data{$bname}{count} > 1) )
 3816 
        if ( exists ($data{$bname}{count}) && ($data{$bname}{count} >= 1) )
3810 
        {
 3817 
        {
3811 
            Message ("MultipleBuildFiles for $bname ($bversion)");
 3818 
            Warning ("MultipleBuildFiles for $bname ($bversion)");
3812 
            $rv = 1;
 3819 
            $rv = 1;
3813 
        }
 3820 
        }
3814 
        $data{$bname}{count}++;
 3821 
        $data{$bname}{count}++;
3815 
        push @{$data{$bname}{versions}}, $bversion;
 3822 
        push @{$data{$bname}{versions}}, $bversion;
3816 
    }
 3823 
    }