Subversion Repositories DevTools

Rev

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

Rev 4030 Rev 4074
Line 98... Line 98...
98 
my $opt_deleteLinks;
 98 
my $opt_deleteLinks;
99 
my $count_BadPaths = 0;
 99 
my $count_BadPaths = 0;
100 
my $opt_IgnoreBadSourcePath;
 100 
my $opt_IgnoreBadSourcePath;
101 
my $opt_forceSuck;
 101 
my $opt_forceSuck;
102 
my $opt_noVCS;
 102 
my $opt_noVCS;
- 
 
 103 
my $opt_archiveName;
103 
 
 104 
 
104 
################################################################################
 105 
################################################################################
105 
#   List of Projects Suffixes and Branch Names to be used within SVN
 106 
#   List of Projects Suffixes and Branch Names to be used within SVN
106 
#
 107 
#
107 
#       Name        - Name of branch for the project
 108 
#       Name        - Name of branch for the project
Line 399... Line 400...
399 
#    'mos_api'               => 'IgnoreProjectBase,',
 400 
#    'mos_api'               => 'IgnoreProjectBase,',
400 
#    'mos_fonts'             => 'IgnoreProjectBase,',
 401 
#    'mos_fonts'             => 'IgnoreProjectBase,',
401 
#    'sntp'                  => 'IgnoreProjectBase,',
 402 
#    'sntp'                  => 'IgnoreProjectBase,',
402 
#    'time_it'               => 'IgnoreProjectBase,',
 403 
#    'time_it'               => 'IgnoreProjectBase,',
403 
 
 404 
 
404 
    'MOS'      => 'MOSVersions,RetainCompressed,IgnoreProjectBase,SetProjectBase,zzznoVCS,'.
 405 
    'MOS'      => 'MOSVersions,RetainCompressed,IgnoreProjectBase,SetProjectBase,noVCS,'.
405 
                  ',mergePaths=++:sy/**:ap/**:tt/**:tl/**:lint/**:hc/**:docs/**:co/**:ba/**',
 406 
                  ',mergePaths=++:sy/**:ap/**:tt/**:tl/**:lint/**:hc/**:docs/**:co/**:ba/**',
- 
 
 407 
 
- 
 
 408 
# jats -t -log dml.importlog cc2svn_importpackage3 -repo=Import_Test SEADML -filelist dml_labels.txt -ccbase MASS_Dev_Bus -reuse=1
- 
 
 409 
 
- 
 
 410 
    'SEADML'      => 'ArchiveName=oracs,flatTime,RetainCompressed,IgnoreProjectBase,SetProjectBase,',
- 
 
 411 
 
406 
);
 412 
);
407 
 
 413 
 
408 
 
 414 
 
409 
my %mergePathExtended = (
 415 
my %mergePathExtended = (
410 
 
 416 
 
Line 1208... Line 1214...
1208 
        if ( $data =~ m~,Trunk=(.*?),~ ) {
 1214 
        if ( $data =~ m~,Trunk=(.*?),~ ) {
1209 
            my $tt = $1;
 1215 
            my $tt = $1;
1210 
            $Projects{$tt}{Trunk} = 1;
 1216 
            $Projects{$tt}{Trunk} = 1;
1211 
            Message ("Force project to trunk: $tt");
 1217 
            Message ("Force project to trunk: $tt");
1212 
        }
 1218 
        }
- 
 
 1219 
 
- 
 
 1220 
        if ( $data =~ m~,ArchiveName=(.*?),~ ) {
- 
 
 1221 
            $opt_archiveName = $1;
- 
 
 1222 
            Message ("Archive search name set: $opt_archiveName");
- 
 
 1223 
        }
1213 
    }
 1224 
    }
1214 
 
 1225 
 
1215 
    Message("Package Type: $packageType, $pruneModeString");
 1226 
    Message("Package Type: $packageType, $pruneModeString");
1216 
}
 1227 
}
1217 
 
 1228 
 
Line 3789... Line 3800...
3789 
sub testDpkgArchive
 3800 
sub testDpkgArchive
3790 
{
 3801 
{
3791 
    my ($entry) = @_;
 3802 
    my ($entry) = @_;
3792 
    my $vname = $versions{$entry}{vname};
 3803 
    my $vname = $versions{$entry}{vname};
3793 
 
 3804 
 
- 
 
 3805 
    #
- 
 
 3806 
    #   Use current package name unless the user has configured a different
- 
 
 3807 
    #   name for use within the archive
- 
 
 3808 
    #
3794 
    if ( -d join('/', $ENV{GBE_DPKG}, $packageNames, $vname )) {
 3809 
    my $path = join('/', $ENV{GBE_DPKG}, $opt_archiveName ? $opt_archiveName : $packageNames, $vname );
- 
 
 3810 
    if ( -d $path ) {
3795 
        Message ("Version found in dpkg_archive");
 3811 
        Message ("Version found in dpkg_archive");
3796 
    } else {
 3812 
    } else {
3797 
        Message ("Version NOT found in dpkg_archive");
 3813 
        Message ("Version NOT found in dpkg_archive:" . $path);
3798 
    }
 3814 
    }
3799 
}
 3815 
}
3800 
 
 3816 
 
3801 
#-------------------------------------------------------------------------------
 3817 
#-------------------------------------------------------------------------------
3802 
# Function        : markDpkgArchive
 3818 
# Function        : markDpkgArchive
Line 3809... Line 3825...
3809 
#
 3825 
#
3810 
sub markDpkgArchive
 3826 
sub markDpkgArchive
3811 
{
 3827 
{
3812 
    my ($entry) = @_;
 3828 
    my ($entry) = @_;
3813 
    my $vname = $versions{$entry}{vname};
 3829 
    my $vname = $versions{$entry}{vname};
- 
 
 3830 
    #
- 
 
 3831 
    #   Use current package name unless the user has configured a different
- 
 
 3832 
    #   name for use within the archive
- 
 
 3833 
    #
3814 
    my $path = join('/', $ENV{GBE_DPKG}, $packageNames, $vname );
 3834 
    my $path = join('/', $ENV{GBE_DPKG}, $opt_archiveName ? $opt_archiveName : $packageNames, $vname );
3815 
    delete $versions{$entry}{dpkgArchive};
 3835 
    delete $versions{$entry}{dpkgArchive};
3816 
    if ( -d $path ) {
 3836 
    if ( -d $path ) {
3817 
        $versions{$entry}{dpkgArchive} = $path;
 3837 
        $versions{$entry}{dpkgArchive} = $path;
3818 
    }
 3838 
    }
3819 
}
 3839 
}
Line 6004... Line 6024...
6004 
# Description     : Read in source data from a file
 6024 
# Description     : Read in source data from a file
6005 
#
 6025 
#
6006 
# Inputs          : FileName
 6026 
# Inputs          : FileName
6007 
#                   Format is 2002-03-05T17:13:50+08 rmussell MASS_DATAMAN_D1.0.0
 6027 
#                   Format is 2002-03-05T17:13:50+08 rmussell MASS_DATAMAN_D1.0.0
6008 
#
 6028 
#
- 
 
 6029 
#                   Generated with the command:
- 
 
 6030 
#                       cleartool lstype -kind lbtype -fmt '%d %u %n\n'
- 
 
 6031 
#                   The date output format is a function of the machine
- 
 
 6032 
#                   This one was done on auperaunx26
- 
 
 6033 
#
6009 
# Returns         :
6034 
# Returns         :
6010 
#
 6035 
#
6011 
sub GetData_by_filelist
 6036 
sub GetData_by_filelist
6012 
{
 6037 
{
6013 
    my ($fname) = @_;
 6038 
    my ($fname) = @_;