Subversion Repositories DevTools

Rev

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

Rev 1341 Rev 1342
Line 39... Line 39...
39
use Fcntl ':flock'; # import LOCK_* constants
39
use Fcntl ':flock'; # import LOCK_* constants
40
use Cwd;
40
use Cwd;
41
use DBI;
41
use DBI;
42
use Getopt::Long;
42
use Getopt::Long;
43
use Pod::Usage;                             # required for help support
43
use Pod::Usage;                             # required for help support
-
 
44
use Encode;
44
 
45
 
45
#
46
#
46
#   Options
47
#   Options
47
#
48
#
48
my $opt_help = 0;
49
my $opt_help = 0;
Line 1381... Line 1382...
1381
 
1382
 
1382
    #
1383
    #
1383
    #   If we have a global error,then we pretend to process, but we
1384
    #   If we have a global error,then we pretend to process, but we
1384
    #   report errors for the logging system
1385
    #   report errors for the logging system
1385
    #
1386
    #
1386
    unless ( $globalError )
1387
    if ( $globalError )
-
 
1388
    {
-
 
1389
        Message ("Global error prevents futher importation");
-
 
1390
    }
-
 
1391
    else
1387
    {
1392
    {
1388
        #
1393
        #
1389
        #   Call worker function
1394
        #   Call worker function
1390
        #   It will exist on any error so that it can be logged
1395
        #   It will exist on any error so that it can be logged
1391
        #
1396
        #
Line 1736... Line 1741...
1736
    }
1741
    }
1737
 
1742
 
1738
 
1743
 
1739
    #
1744
    #
1740
    #   Add supplemental tags if this version is in a 'Release'
1745
    #   Add supplemental tags if this version is in a 'Release'
-
 
1746
    #   But only for some packages - els looks like a mess
-
 
1747
    #   Just a solution for the ITSO guys
1741
    #
1748
    #
1742
    foreach my $rname ( keys %{$versions{$entry}{Releases}}  )
1749
    foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  )
1743
    {
1750
    {
-
 
1751
        next unless ( $svnRepo =~ m~/ITSO_TRACS(/|$)~);
-
 
1752
 
1744
        my $rtext = 'Release_' . saneString($versions{$entry}{Releases}{$rname});
1753
        my $prog_id = $versions{$entry}{Releases}{$rtag_id}{proj_id};
1745
        Message ("Adding Release Tag: $rname");
1754
        Message ("Adding Release Tag:$prog_id:$rtag_id");
-
 
1755
 
-
 
1756
        my $rtext = 'Release_' . saneString($versions{$entry}{Releases}{$rtag_id}{rname});
-
 
1757
        my @comment;
-
 
1758
        push @comment, "Tagged by ClearCase to Subversion import";
-
 
1759
        push @comment, "Project:$prog_id:$versions{$entry}{Releases}{$rtag_id}{pname}";
-
 
1760
        push @comment, "Release:$rtag_id:$versions{$entry}{Releases}{$rtag_id}{rname}";
-
 
1761
 
-
 
1762
        $data->{ReleaseTag}{$prog_id}{$rtag_id}{name} = $rtext;
-
 
1763
 
1746
        $rv = JatsToolPrint ( 'jats_svnlabel' ,
1764
        $rv = JatsToolPrint ( 'jats_svnlabel' ,
-
 
1765
                    '-comment', encode('UTF-8', join("\n", @comment), Encode::FB_DEFAULT),
1747
                    $data->{rmRef},
1766
                    $data->{rmRef},
1748
                    '-clone',
1767
                    '-clone',
1749
                    $rtext,
1768
                    $rtext,
1750
#                    @args,
1769
#                    @args,
-
 
1770
                    '-author=buildadm',
1751
                     );
1771
                     );
-
 
1772
        $data->{ReleaseTag}{$prog_id}{$rtag_id}{eState} = $rv;
-
 
1773
        $data->{ReleaseTag}{tCount}++;
-
 
1774
 
1752
        if ( $rv )
1775
        if ( $rv )
1753
        {
1776
        {
1754
            $data->{errStr} = 'Failed to add Release tag';
1777
            $data->{ReleaseTag}{eCount}++;
1755
            return 14;
1778
            Warning("Failed to add Release Tag: $rtext");
1756
        }
1779
        }
1757
                     
-
 
1758
    }
1780
    }
1759
 
1781
 
1760
 
1782
 
1761
    Message ("RM Ref: $data->{rmRef}");
1783
    Message ("RM Ref: $data->{rmRef}");
1762
    unlink $datafile;
1784
    unlink $datafile;
Line 3067... Line 3089...
3067
#        $stateText .= ' M='. $versions{$entry}{maxVersion} if (exists $versions{$entry}{maxVersion});
3089
#        $stateText .= ' M='. $versions{$entry}{maxVersion} if (exists $versions{$entry}{maxVersion});
3068
 
3090
 
3069
        push @label, "(${stateText})" if ( $stateText );
3091
        push @label, "(${stateText})" if ( $stateText );
3070
 
3092
 
3071
##       Insert Release Names
3093
##       Insert Release Names
3072
#        foreach my $rname ( keys %{$versions{$entry}{Releases}}  ) {
3094
#        foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  ) {
3073
#            push @label, "Release: $versions{$entry}{Releases}{$rname}";
3095
#            push @label, "Release: $versions{$entry}{Releases}{$rtag_id}{rname}";
3074
#        }
3096
#        }
3075
 
3097
 
3076
        return join ('\n', @label );
3098
        return join ('\n', @label );
3077
    }
3099
    }
3078
 
3100
 
Line 3313... Line 3335...
3313
            unless ( exists $versions{$_} );
3335
            unless ( exists $versions{$_} );
3314
        $versions{$_}{Essential} = 1;
3336
        $versions{$_}{Essential} = 1;
3315
 
3337
 
3316
        # Retain which RM Release this package-version is the tip
3338
        # Retain which RM Release this package-version is the tip
3317
        # Release of
3339
        # Release of
3318
        foreach my $release ( @{$ScmPackages{$_}{'release'}} )
3340
        foreach my $rtag_id ( @{$ScmPackages{$_}{'release'}} )
3319
        {
3341
        {
3320
            $versions{$_}{Releases}{$release} = $ScmReleases{$release}{name};
3342
            $versions{$_}{Releases}{$rtag_id}{rname}   = $ScmReleases{$rtag_id}{name};
-
 
3343
            $versions{$_}{Releases}{$rtag_id}{pname}   = $ScmReleases{$rtag_id}{pName};
-
 
3344
            $versions{$_}{Releases}{$rtag_id}{proj_id} = $ScmReleases{$rtag_id}{proj_id};
3321
        }
3345
        }
3322
        
3346
        
3323
        #print "ESSENTIAL: $versions{$_}{name} $versions{$_}{vname}\n";
3347
        #print "ESSENTIAL: $versions{$_}{name} $versions{$_}{vname}\n";
3324
    }
3348
    }
3325
 
3349