Subversion Repositories DevTools

Rev

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

Rev 392 Rev 394
Line 1446... Line 1446...
1446
    $cc_path =~ tr~\\/~/~s;
1446
    $cc_path =~ tr~\\/~/~s;
1447
 
1447
 
1448
    #
1448
    #
1449
    #   Correct well known path mistakes
1449
    #   Correct well known path mistakes
1450
    #
1450
    #
-
 
1451
    $cc_path =~ s~/MASS_Dev/Bus/~/MASS_Dev_Bus/~i;
1451
    $cc_path =~ s~/MASS_Dev_Bus/Cbp/~/MASS_Dev_Bus/CBP/~i;
1452
    $cc_path =~ s~/MASS_Dev_Bus/Cbp/~/MASS_Dev_Bus/CBP/~i;
1452
    $cc_path =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
1453
    $cc_path =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
1453
 
1454
 
1454
#print "--- Path: $cc_path, Label: $cc_label\n";
1455
#print "--- Path: $cc_path, Label: $cc_label\n";
1455
 
1456
 
Line 2041... Line 2042...
2041
                       $pkg_ver =~ s~^\s+~~;
2042
                       $pkg_ver =~ s~^\s+~~;
2042
                    my $pv_id = $row[3] || 'Unknown';
2043
                    my $pv_id = $row[3] || 'Unknown';
2043
                    my $last_pv_id = $row[4];
2044
                    my $last_pv_id = $row[4];
2044
                    my $created =  $row[5] || 'Unknown';
2045
                    my $created =  $row[5] || 'Unknown';
2045
                    my $vcstag =  $row[6] || 'Unknown';
2046
                    my $vcstag =  $row[6] || 'Unknown';
2046
                       $vcstag =~ tr~\\/~/~s;
-
 
2047
                    
-
 
-
 
2047
 
2048
                    my $created_id =  $row[7] || ($row[10] ? "Userid_$row[10]" :'Unknown');
2048
                    my $created_id =  $row[7] || ($row[10] ? "Userid_$row[10]" :'Unknown');
2049
                    my $comment =  $row[8] || '';
2049
                    my $comment =  $row[8] || '';
2050
                    my $locked =  $row[9] || 'N';
2050
                    my $locked =  $row[9] || 'N';
2051
 
2051
 
2052
                    #
2052
                    #
Line 2327... Line 2327...
2327
 
2327
 
2328
    return ($suffix, $result, $isaRipple, $isaWIP, $buildVersion );
2328
    return ($suffix, $result, $isaRipple, $isaWIP, $buildVersion );
2329
}
2329
}
2330
 
2330
 
2331
#-------------------------------------------------------------------------------
2331
#-------------------------------------------------------------------------------
-
 
2332
# Function        : vcsCleanup
-
 
2333
#
-
 
2334
# Description     : Cleanup and rewrite a vcstag
-
 
2335
#
-
 
2336
#                   DUPLICATED IN:
-
 
2337
#                       - cc2svn_procdata
-
 
2338
#                       - cc2svn_impartpackage
-
 
2339
#
-
 
2340
# Inputs          : vcstag
-
 
2341
#
-
 
2342
# Returns         : Cleaned up vcs tag
-
 
2343
#
-
 
2344
sub vcsCleanup
-
 
2345
{
-
 
2346
    my ($tag) = @_;
-
 
2347
    $tag =~ tr~\\/~/~;
-
 
2348
    if ( $tag =~ m~^CC::~ )
-
 
2349
    {
-
 
2350
        $tag =~ s~CC::\s+~CC::~;
-
 
2351
        $tag =~ s~MASS_Dev_Bus/Cbp/~MASS_Dev_Bus/CBP/~i;
-
 
2352
        $tag =~ s~MASS_Dev_Bus~MASS_Dev_Bus~i;
-
 
2353
        $tag =~ s~/MASS_Dev/Infra~MASS_Dev_Infra~i;
-
 
2354
        $tag =~ s~/MASS_Dev/Bus/web~/MASS_Dev_Bus/web~i;
-
 
2355
 
-
 
2356
        $tag =~ s~/Vastraffik/~/Vasttrafik/~;
-
 
2357
        $tag =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
-
 
2358
 
-
 
2359
    }
-
 
2360
    return $tag;
-
 
2361
}
-
 
2362
 
-
 
2363
#-------------------------------------------------------------------------------
2332
# Function        : examineVcsTag
2364
# Function        : examineVcsTag
2333
#
2365
#
2334
# Description     : Examine a VCS Tag and determine if it looks like rubbish
2366
# Description     : Examine a VCS Tag and determine if it looks like rubbish
-
 
2367
#                   Give it a clean
2335
#
2368
#
2336
# Inputs          : $entry
2369
# Inputs          : $entry
2337
#
2370
#
2338
# Returns         : Will add Data to the $entry
2371
# Returns         : Will add Data to the $entry
2339
#
2372
#
2340
sub examineVcsTag
2373
sub examineVcsTag
2341
{
2374
{
2342
    my ($entry) = @_;
2375
    my ($entry) = @_;
2343
    my $bad = 0;
2376
    my $bad = 0;
-
 
2377
 
-
 
2378
    $versions{$entry}{vcsTag} = ($versions{$entry}{vcsTag});
2344
    my $vcstag = $versions{$entry}{vcsTag};
2379
    my $vcstag $versions{$entry}{vcsTag};
-
 
2380
    
2345
    if ( $vcstag =~ m~^SVN::~ ) {
2381
    if ( $vcstag =~ m~^SVN::~ ) {
2346
        $versions{$entry}{isSvn} = 1;
2382
        $versions{$entry}{isSvn} = 1;
2347
 
2383
 
2348
    } elsif ( $vcstag =~ m~^CC::(.*?)(::(.+))?$~ ) {
2384
    } elsif ( $vcstag =~ m~^CC::(.*?)(::(.+))?$~ ) {
2349
        my $path = $1  || '';
2385
        my $path = $1  || '';
Line 2356... Line 2392...
2356
        $bad = 1 if ( $path =~ m~^/dpkg_archive~ || $path  =~ m~^dpkg_archive~ );
2392
        $bad = 1 if ( $path =~ m~^/dpkg_archive~ || $path  =~ m~^dpkg_archive~ );
2357
        $bad = 1 if ( $path =~ m~^/devl/~ || $path  =~ m~^devl/~ );
2393
        $bad = 1 if ( $path =~ m~^/devl/~ || $path  =~ m~^devl/~ );
2358
        $bad = 1 if ( $path =~ m~^http:~i );
2394
        $bad = 1 if ( $path =~ m~^http:~i );
2359
        $bad = 1 if ( $path =~ m~^[A-Za-z]\:~ );
2395
        $bad = 1 if ( $path =~ m~^[A-Za-z]\:~ );
2360
        $bad = 1 if ( $path =~ m~^//~ );
2396
        $bad = 1 if ( $path =~ m~^//~ );
-
 
2397
        $bad = 1 if ( $path =~ m~^/*none~i );
-
 
2398
        $bad = 1 if ( $path =~ m~^/*NoWhere~i );
-
 
2399
        $bad = 1 if ( $path =~ m~^-$~i );
2361
        $bad = 1 if ( $path =~ m~^cvsserver:~ );
2400
        $bad = 1 if ( $path =~ m~^cvsserver:~ );
2362
        $bad = 1 if ( $path =~ m~,\s*module:~ );
2401
        $bad = 1 if ( $path =~ m~,\s*module:~ );
2363
#        $bad = 1 unless ( $path =~ m~^/~ );
2402
#        $bad = 1 unless ( $path =~ m~^/~ );
2364
    }
2403
    }
2365
    else
2404
    else