Subversion Repositories DevTools

Rev

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

Rev 2401 Rev 2403
Line 68... Line 68...
68 
my $opt_vobMap;
 68 
my $opt_vobMap;
69 
my $opt_preserveProjectBase;
 69 
my $opt_preserveProjectBase;
70 
my $opt_ignoreProjectBaseErrors;
 70 
my $opt_ignoreProjectBaseErrors;
71 
my $opt_delete;
 71 
my $opt_delete;
72 
my $opt_recentAge = 14;             # Days
 72 
my $opt_recentAge = 14;             # Days
- 
 
 73 
my $opt_relabel = 1;
73 
 
 74 
 
74 
################################################################################
 75 
################################################################################
75 
#   List of Projects Suffixes and Branch Names to be used within SVN
 76 
#   List of Projects Suffixes and Branch Names to be used within SVN
76 
#
 77 
#
77 
#       Name        - Name of branch for the project
 78 
#       Name        - Name of branch for the project
Line 157... Line 158...
157 
    'mos_packager'        => ',all,',
 158 
    'mos_packager'        => ',all,',
158 
    'cfmgr-cfmgr'         => ',flat,',
 159 
    'cfmgr-cfmgr'         => ',flat,',
159 
    'daf_utils_button_st' => ',flat,',
 160 
    'daf_utils_button_st' => ',flat,',
160 
    'ReleaseName'         => ',flat,',
 161 
    'ReleaseName'         => ',flat,',
161 
    'reports'             => ',utf8,',
 162 
    'reports'             => ',utf8,',
- 
 
 163 
    'cda_imports'         => ',utf8,',
- 
 
 164 
    'cdxforms'            => ',utf8,',
- 
 
 165 
    'db_cda'              => ',utf8,',
- 
 
 166 
 
162 
 
 167 
 
163 
    # Need to be handled in a special manner
 168 
    # Need to be handled in a special manner
164 
    # Not done by this utility
 169 
    # Not done by this utility
165 
    #
 170 
    #
166 
    'linux_drivers_eb5600'  => ',protected,',
 171 
    'linux_drivers_eb5600'  => ',protected,',
Line 298... Line 303...
298 
                "tip:s"         => \@opt_tip,           # Force tip version(s)
 303 
                "tip:s"         => \@opt_tip,           # Force tip version(s)
299 
                "log!"          => \$opt_log,
 304 
                "log!"          => \$opt_log,
300 
                "delete!"       => \$opt_delete,
 305 
                "delete!"       => \$opt_delete,
301 
                "postimage!"    => \$opt_postimage,
 306 
                "postimage!"    => \$opt_postimage,
302 
                'workdir:s'     => \$opt_workDir,
 307 
                'workdir:s'     => \$opt_workDir,
- 
 
 308 
                'relabel!'      => \$opt_relabel,
303 
                );
 309 
                );
304 
 
 310 
 
305 
#
 311 
#
306 
#   Process help and manual options
 312 
#   Process help and manual options
307 
#
 313 
#
Line 2376... Line 2382...
2376 
            #   No files found
 2382 
            #   No files found
2377 
            #   If this is the first time then try really hard to find them
 2383 
            #   If this is the first time then try really hard to find them
2378 
            #
 2384 
            #
2379 
            unless ( $tryCount++ )
 2385 
            unless ( $tryCount++ )
2380 
            {
 2386 
            {
- 
 
 2387 
                if ( $opt_relabel )
- 
 
 2388 
                {
2381 
                $packageReLabelCount++;
 2389 
                    $packageReLabelCount++;
2382 
                $rv = JatsToolPrint('cc2svn_labeldirs',
 2390 
                    $rv = JatsToolPrint('cc2svn_labeldirs',
2383 
                                        '-vob', $cc_path,
 2391 
                                            '-vob', $cc_path,
2384 
                                        $cc_label,
 2392 
                                            $cc_label,
2385 
                                        );
 2393 
                                            );
2386 
                $data->{DirsLabled} = 100 + $rv;
 2394 
                    $data->{DirsLabled} = 100 + $rv;
- 
 
 2395 
                }
2387 
 
 2396 
 
2388 
                #
 2397 
                #
2389 
                #   Second attempt - massage the users path
 2398 
                #   Second attempt - massage the users path
2390 
                #   We should have labled up to the VOB root so lets
 2399 
                #   We should have labled up to the VOB root so lets
2391 
                #   just use the VOB and not the path
 2400 
                #   just use the VOB and not the path
2392 
                #
 2401 
                #
- 
 
 2402 
                #   If we are not relabeling then we can still do this
- 
 
 2403 
                #   in an attempt to fix user stupidity
- 
 
 2404 
                #
2393 
                $cc_path =~ s~^/~~;
 2405 
                $cc_path =~ s~^/~~;
2394 
                $cc_path =~ s~/.*~~;
 2406 
                $cc_path =~ s~/.*~~;
2395 
                $cc_path = '/' . $cc_path;
 2407 
                $cc_path = '/' . $cc_path;
2396 
                $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
 2408 
                $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
2397 
                redo;
 2409 
                redo;
Line 4041... Line 4053...
4041 
    -name=aaa          - Alternate output package name. Test Only
 4053 
    -name=aaa          - Alternate output package name. Test Only
4042 
    -[no]log           - Write output to log file. Def: -nolog
 4054 
    -[no]log           - Write output to log file. Def: -nolog
4043 
    -[no]postimage     - Create image after transger: Def: -post
 4055 
    -[no]postimage     - Create image after transger: Def: -post
4044 
    -workdir=path      - Use for temp storage (def:/work)
 4056 
    -workdir=path      - Use for temp storage (def:/work)
4045 
    -delete            - Delete SVN package before test
 4057 
    -delete            - Delete SVN package before test
- 
 
 4058 
    -[no]relabel       - Attempt to relabel dirs in packages that don't extract
4046 
 
 4059 
 
4047 
=head1 OPTIONS
 4060 
=head1 OPTIONS
4048 
 
 4061 
 
4049 
=over 8
 4062 
=over 8
4050 
 
 4063