Subversion Repositories DevTools

Rev

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

Rev 1197 Rev 1270
Line 65... Line 65...
65
my $opt_postimage = 1;
65
my $opt_postimage = 1;
66
my $opt_workDir = '/work';
66
my $opt_workDir = '/work';
67
my $opt_vobMap;
67
my $opt_vobMap;
68
my $opt_preserveProjectBase;
68
my $opt_preserveProjectBase;
69
my $opt_ignoreProjectBaseErrors;
69
my $opt_ignoreProjectBaseErrors;
-
 
70
my $opt_delete;
70
 
71
 
71
################################################################################
72
################################################################################
72
#   List of Projects Suffixes and Branch Names to be used within SVN
73
#   List of Projects Suffixes and Branch Names to be used within SVN
73
#
74
#
74
#       Name        - Name of branch for the project
75
#       Name        - Name of branch for the project
Line 207... Line 208...
207
my $multiPackages = -1;
208
my $multiPackages = -1;
208
my $visitId = 0;
209
my $visitId = 0;
209
my $noTransfer;
210
my $noTransfer;
210
my $rippleCount = 0;
211
my $rippleCount = 0;
211
my $svnRepo;
212
my $svnRepo;
-
 
213
my $processCount = 0;
-
 
214
my $processTotal = 0;
212
 
215
 
213
our $GBE_RM_URL;
216
our $GBE_RM_URL;
214
my $UNIX = $ENV{'GBE_UNIX'};
217
my $UNIX = $ENV{'GBE_UNIX'};
215
 
218
 
216
my $result = GetOptions (
219
my $result = GetOptions (
Line 228... Line 231...
228
                "pruneMode:s"   => \$opt_pruneModeString,
231
                "pruneMode:s"   => \$opt_pruneModeString,
229
                "listtags:i"    => \$opt_listTags,
232
                "listtags:i"    => \$opt_listTags,
230
                "name:s"        => \$opt_name,          # Alternate output
233
                "name:s"        => \$opt_name,          # Alternate output
231
                "tip:s"         => \@opt_tip,           # Force tip version(s)
234
                "tip:s"         => \@opt_tip,           # Force tip version(s)
232
                "log!"          => \$opt_log,
235
                "log!"          => \$opt_log,
-
 
236
                "delete!"       => \$opt_delete,
233
                "postimage!"    => \$opt_postimage,
237
                "postimage!"    => \$opt_postimage,
234
                'workdir:s'     => \$opt_workDir,
238
                'workdir:s'     => \$opt_workDir,
235
                );
239
                );
236
 
240
 
237
#
241
#
Line 1108... Line 1112...
1108
    }
1112
    }
1109
 
1113
 
1110
    #
1114
    #
1111
    #   All done
1115
    #   All done
1112
    #
1116
    #
-
 
1117
    $processTotal = scalar keys %versions;
1113
    Message("Retained entries: " . (scalar keys %versions) );
1118
    Message("Retained entries: $processTotal" );
1114
    Message("Pruned entries: $pruneCount");
1119
    Message("Pruned entries: $pruneCount");
1115
    Message("Deadwood entries: $trimCount");
1120
    Message("Deadwood entries: $trimCount");
1116
    Message("Bad Singletons: $badSingletonCount");
1121
    Message("Bad Singletons: $badSingletonCount");
1117
    Message("Ripples: $rippleCount");
1122
    Message("Ripples: $rippleCount");
1118
}
1123
}
Line 1324... Line 1329...
1324
 
1329
 
1325
    #
1330
    #
1326
    #   If its been processed then fake that its been done
1331
    #   If its been processed then fake that its been done
1327
    #   May have been a ripple that we processed
1332
    #   May have been a ripple that we processed
1328
    #
1333
    #
-
 
1334
    return if ($versions{$entry}{Processed});
-
 
1335
    $processCount++;
1329
    Message ("------------------------------------------------------------------" );
1336
    Message ("------------------------------------------------------------------" );
-
 
1337
    Message ("Package $processCount of $processTotal");
-
 
1338
 
1330
    Message ("New package-version: " . GetVname($entry) . " Tag: " . $versions{$entry}{vcsTag} );
1339
    Message ("New package-version: " . GetVname($entry) . " Tag: " . $versions{$entry}{vcsTag} );
1331
    return if ($versions{$entry}{Processed});
-
 
1332
 
1340
 
1333
 
1341
 
1334
    #
1342
    #
1335
    #   If we have a global error,then we pretend to process, but we
1343
    #   If we have a global error,then we pretend to process, but we
1336
    #   report errors for the logging system
1344
    #   report errors for the logging system
Line 1487... Line 1495...
1487
    #   Correct well known path mistakes
1495
    #   Correct well known path mistakes
1488
    #
1496
    #
1489
    $cc_path =~ s~/MASS_Dev/Bus/~/MASS_Dev_Bus/~i;
1497
    $cc_path =~ s~/MASS_Dev/Bus/~/MASS_Dev_Bus/~i;
1490
    $cc_path =~ s~/MASS_Dev_Bus/Cbp/~/MASS_Dev_Bus/CBP/~i;
1498
    $cc_path =~ s~/MASS_Dev_Bus/Cbp/~/MASS_Dev_Bus/CBP/~i;
1491
    $cc_path =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
1499
    $cc_path =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
-
 
1500
    $cc_path =~ s~/MREF_21/MREF_Package/~/MREF_Package/~i;
-
 
1501
 
1492
 
1502
 
1493
#print "--- Path: $cc_path, Label: $cc_label\n";
1503
#print "--- Path: $cc_path, Label: $cc_label\n";
1494
 
1504
 
1495
    #
1505
    #
1496
    #   Create CC view
1506
    #   Create CC view
Line 1734... Line 1744...
1734
    #   Only do once
1744
    #   Only do once
1735
    #
1745
    #
1736
    return unless ( $createPackageDone );
1746
    return unless ( $createPackageDone );
1737
    $createPackageDone = 0;
1747
    $createPackageDone = 0;
1738
 
1748
 
-
 
1749
    #
-
 
1750
    #   Real import
-
 
1751
    #       Do not Delete package if it exists
-
 
1752
    #       Package must NOT exist
-
 
1753
    #
1739
    Message ("Creating new SVN package: $packageNames");
1754
    Message ("Creating new SVN package: $packageNames");
-
 
1755
    if ( $opt_delete )
-
 
1756
    {
-
 
1757
        Message ("Delete existing version of package: $packageNames");
1740
    JatsToolPrint ( 'jats_svn', 'delete-package', '-noerror',  "$svnRepo/$packageNames" );
1758
        JatsToolPrint ( 'jats_svn', 'delete-package', '-noerror',  "$svnRepo/$packageNames" );
-
 
1759
    }
1741
    JatsToolPrint ( 'jats_svn', 'create', "$svnRepo/$packageNames", @opts );
1760
    JatsToolPrint ( 'jats_svn', 'create', "$svnRepo/$packageNames", '-new', @opts );
1742
}
1761
}
1743
 
1762
 
1744
 
1763
 
1745
#-------------------------------------------------------------------------------
1764
#-------------------------------------------------------------------------------
1746
# Function        : createBranchPoint
1765
# Function        : createBranchPoint
Line 2690... Line 2709...
2690
 
2709
 
2691
        push @text, 'Total RM versions: ' . $totalVersions;
2710
        push @text, 'Total RM versions: ' . $totalVersions;
2692
        push @text, 'Essential Entries: ' . scalar @EssentialPackages;
2711
        push @text, 'Essential Entries: ' . scalar @EssentialPackages;
2693
        push @text, 'Initial trees: ' . $initialTrees;
2712
        push @text, 'Initial trees: ' . $initialTrees;
2694
 
2713
 
2695
        push @text, 'Number of Entries: ' . scalar keys %versions;
2714
        push @text, 'Number of Entries: ' . $processTotal;
2696
        push @text, 'Type : ' . $packageType;
2715
        push @text, 'Type : ' . $packageType;
2697
        push @text, 'All versions in Subversion' if ( $allSvn );
2716
        push @text, 'All versions in Subversion' if ( $allSvn );
2698
 
2717
 
2699
        push @text, '|';
2718
        push @text, '|';
2700
        push @text, 'Total Project Branches: ' . $ProjectCount;
2719
        push @text, 'Total Project Branches: ' . $ProjectCount;
Line 3413... Line 3432...
3413
    -images[=n]        - Create SVG of version tree. N=0,1,2
3432
    -images[=n]        - Create SVG of version tree. N=0,1,2
3414
    -name=aaa          - Alternate output package name. Test Only
3433
    -name=aaa          - Alternate output package name. Test Only
3415
    -[no]log           - Write output to log file. Def: -nolog
3434
    -[no]log           - Write output to log file. Def: -nolog
3416
    -[no]postimage     - Create image after transger: Def: -post
3435
    -[no]postimage     - Create image after transger: Def: -post
3417
    -workdir=path      - Use for temp storage (def:/work)
3436
    -workdir=path      - Use for temp storage (def:/work)
-
 
3437
    -delete            - Delete SVN package before test
3418
 
3438
 
3419
=head1 OPTIONS
3439
=head1 OPTIONS
3420
 
3440
 
3421
=over 8
3441
=over 8
3422
 
3442