Subversion Repositories DevTools

Rev

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

Rev 4077 Rev 4086
Line 96... Line 96...
96
my $opt_deleteLinks;
96
my $opt_deleteLinks;
97
my $count_BadPaths = 0;
97
my $count_BadPaths = 0;
98
my $opt_IgnoreBadSourcePath;
98
my $opt_IgnoreBadSourcePath;
99
my $opt_forceSuck;
99
my $opt_forceSuck;
100
my $opt_noVCS;
100
my $opt_noVCS;
101
my $opt_onlyOneBranch;
101
my $opt_onlyOneBranch = 0;
102
 
102
 
103
################################################################################
103
################################################################################
104
#   List of Projects Suffixes and Branch Names to be used within SVN
104
#   List of Projects Suffixes and Branch Names to be used within SVN
105
#
105
#
106
#       Name        - Name of branch for the project
106
#       Name        - Name of branch for the project
Line 134... Line 134...
134
    '.ncc'      => { Name => 'NSWClubCard' },
134
    '.ncc'      => { Name => 'NSWClubCard' },
135
    '.rm'       => { Name => 'Rome' },
135
    '.rm'       => { Name => 'Rome' },
136
    '.vss'      => { Name => 'SmartSite' },
136
    '.vss'      => { Name => 'SmartSite' },
137
    '.ssts'     => { Name => 'SydneySchoolbus' },
137
    '.ssts'     => { Name => 'SydneySchoolbus' },
138
    'unknown'   => { Name => 'UnknownProject' },
138
    'unknown'   => { Name => 'UnknownProject' },
-
 
139
    'brussels'  => { Name => 'Brussels' },
139
 
140
 
140
    '.ebr'      => { Name => 'eBrio' , Trunk => 1 },
141
    '.ebr'      => { Name => 'eBrio' , Trunk => 1 },
141
    '.mas'      => { Name => 'Mass'  , Trunk => 1 },
142
    '.mas'      => { Name => 'Mass'  , Trunk => 1 },
142
    '.cr'       => { Name => 'Core'  , Trunk => 1 },
143
    '.cr'       => { Name => 'Core'  , Trunk => 1 },
143
    '.cots'     => { Name => 'Cots'  , Trunk => 1 },
144
    '.cots'     => { Name => 'Cots'  , Trunk => 1 },
144
    '.tool'     => { Name => 'Tools' , Trunk => 1 },
145
    '.tool'     => { Name => 'Tools' , Trunk => 1 },
-
 
146
    'perth'     => { Name => 'Perth' , Trunk => 1 },
145
);
147
);
146
 
148
 
147
my %suffixFixup = (
149
my %suffixFixup = (
148
    '.sf'           => '.sfo',
150
    '.sf'           => '.sfo',
149
    '.vt'           => '.vtk',
151
    '.vt'           => '.vtk',
Line 172... Line 174...
172
    'ReleaseName'         => ',flat,',
174
    'ReleaseName'         => ',flat,',
173
    'reports'             => ',utf8,',
175
    'reports'             => ',utf8,',
174
    'cda_imports'         => ',utf8,',
176
    'cda_imports'         => ',utf8,',
175
    'cdxforms'            => ',utf8,',
177
    'cdxforms'            => ',utf8,',
176
    'db_cda'              => ',utf8,',
178
    'db_cda'              => ',utf8,',
-
 
179
    'Dataman'             => ',utf8,',
177
    'CommandServer'       => ',IgnoreMakeProject,',
180
    'CommandServer'       => ',IgnoreMakeProject,',
178
    'TDSExporterControl'  => ',IgnoreMakeProject,',
181
    'TDSExporterControl'  => ',IgnoreMakeProject,',
179
    'cdagui'              => ',IgnoreMakeProject,',
182
    'cdagui'              => ',IgnoreMakeProject,',
180
 
183
 
181
    'daf_bvt'                 => ',IgnoreMakeProject,',  # Look OK
184
    'daf_bvt'                 => ',IgnoreMakeProject,',  # Look OK
Line 380... Line 383...
380
 
383
 
381
    'tp5000'                => 'noVCS,IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
384
    'tp5000'                => 'noVCS,IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
382
    'vcp5000'               => 'IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
385
    'vcp5000'               => 'IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
383
 
386
 
384
    'MetrixOra'             => 'Trunk=.sea,ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples',
387
    'MetrixOra'             => 'Trunk=.sea,ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples',
385
    'oracs'                 => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/oracs:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
388
#    'oracs'                 => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/oracs:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
386
    'oradacw'               => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/oradacw:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
389
    'oradacw'               => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/oradacw:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
387
    'orabocw'               => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/orabocw:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
390
    'orabocw'               => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/orabocw:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
388
 
391
 
389
 
-
 
390
    'boi-issuer'            => 'OnlyOneBranch=.vtk,noVCS',
392
    'boi-issuer'            => 'OnlyOneBranch=.vtk,noVCS',
-
 
393
    'oracs'                 => 'SetProjectBase,IgnoreBadSourcePath,NoProcessRipples,mergePaths=++:Model/*',
-
 
394
 
391
 
395
 
392
    'icl'                   => 'IgnoreProjectBase,',
396
    'icl'                   => 'IgnoreProjectBase,',
393
    'itso'                  => 'IgnoreProjectBase,',
397
    'itso'                  => 'IgnoreProjectBase,',
394
#    'daf_osa_mos'           => 'IgnoreProjectBase,',
398
#    'daf_osa_mos'           => 'IgnoreProjectBase,',
395
    'daf_utils_mos'         => 'IgnoreProjectBase,',
399
    'daf_utils_mos'         => 'IgnoreProjectBase,',
Line 817... Line 821...
817
    $versions{$tip}{Tip} = 1 if $tip;
821
    $versions{$tip}{Tip} = 1 if $tip;
818
}
822
}
819
 
823
 
820
#
824
#
821
#   Generate dumps and images
825
#   Generate dumps and images
822
#       Always create image first - we are doing it after every transfer
-
 
823
#
826
#
824
if ( $opt_images || 1 )
827
if ( $opt_images || 1 )
825
{
828
{
826
    createImages();
829
    createImages();
827
}
830
}
Line 1089... Line 1092...
1089
 
1092
 
1090
        #
1093
        #
1091
        #   This is a real kludge. The user MUST make sure that the branch AND all related
1094
        #   This is a real kludge. The user MUST make sure that the branch AND all related
1092
        #   branches ( xxx_for_yyy.zzz ) have been deleted from the repository.
1095
        #   branches ( xxx_for_yyy.zzz ) have been deleted from the repository.
1093
        #
1096
        #
1094
        if ( $data =~ m~,OnlyOneBranch=(.*?),~ ) {
1097
        if ( $data =~ m~,Onlyonebranch=(.*?),~ ) {
1095
            $opt_onlyOneBranch = $1;
1098
            $opt_onlyOneBranch = $1;
1096
            Message ("Limiting the import to one branch: $opt_onlyOneBranch");
1099
            Message ("Limiting the import to one branch: $opt_onlyOneBranch");
1097
            unless (exists $Projects{$opt_onlyOneBranch})
1100
            unless (exists $Projects{$opt_onlyOneBranch})
1098
            {
1101
            {
1099
                Error("The specified branch does not map to a configured project");
1102
                Error("The specified branch does not map to a configured project");
Line 2968... Line 2971...
2968
                    "-label=$import_label",
2971
                    "-label=$import_label",
2969
                    "-datafile=$datafile",
2972
                    "-datafile=$datafile",
2970
                    @args,
2973
                    @args,
2971
                    @mergeArg,
2974
                    @mergeArg,
2972
                     );
2975
                     );
2973
 
-
 
2974
    if ( $rv )
2976
    if ( $rv )
2975
    {
2977
    {
2976
        $data->{errStr} = 'Failed to import to SVN';
2978
        $data->{errStr} = 'Failed to import to SVN';
2977
        return 12;
2979
        return 12;
2978
    }
2980
    }
Line 3736... Line 3738...
3736
 
3738
 
3737
#-------------------------------------------------------------------------------
3739
#-------------------------------------------------------------------------------
3738
# Function        : extractFilesFromStore
3740
# Function        : extractFilesFromStore
3739
#
3741
#
3740
# Description     : Extract files from Store
3742
# Description     : Extract files from Store
3741
#                   Locaal directory under dpkgExtract
3743
#                   Local directory under dpkgExtract
3742
#
3744
#
3743
# Inputs          : $data           - Hash of good stuff from newPackageVersionBody
3745
# Inputs          : $data           - Hash of good stuff from newPackageVersionBody
3744
#                   $entry          - All the PV information
3746
#                   $entry          - All the PV information
3745
#
3747
#
3746
# Returns         : exit code
3748
# Returns         : exit code
Line 4936... Line 4938...
4936
        $patch = $3;
4938
        $patch = $3;
4937
        $build = $4;
4939
        $build = $4;
4938
        $suffix = $5 || '.sls';
4940
        $suffix = $5 || '.sls';
4939
        $isaRipple = 0;
4941
        $isaRipple = 0;
4940
    }
4942
    }
-
 
4943
 
4941
    
4944
    #
-
 
4945
    #   nnnn
-
 
4946
    #
-
 
4947
    elsif ($version =~ m~[0-9]{4}~) {
-
 
4948
        $suffix = '';
-
 
4949
        $major = 0;
-
 
4950
        $minor = 0;
-
 
4951
        $patch = $version;
-
 
4952
        $build = 0;
-
 
4953
    }
4942
    #
4954
    #
4943
    #   Stuff we don't yet handle
4955
    #   Stuff we don't yet handle
4944
    #
4956
    #
4945
    else  {
4957
    else  {
4946
        Warning ("Unknown version number: $name,$version");
4958
        Warning ("Unknown version number: $name,$version");