WebSVN – DevTools – Diff – /core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage.pl

 my $opt_extractFromSvn;
 my $opt_AllowMuliplePaths = 1;      #29-Nov-2012
 my $opt_resume;
 my $opt_processRipples = 1;
 my $opt_mergePackages;
+my @opt_deleteFiles;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     '.pxxx.sea'     => '.sea',
     '.pxxx.syd'     => '.syd',
     '.pxxx.sydddd'  => '.syd',
     '.oslo'         => '.oso',
     '.osl'          => '.oso',
+    '.0x3'          => '.cr',
+    '.0x4'          => '.cr',
+    '.0x5'          => '.cr',
+    '.0x13'         => '.cr',
 );
 my %specialPackages = (
     'core_devl'           =>  ',all,protected,',
     'daf_utils_mos'       => ',flat,',
     'daf_br_th'                     => 'IgnoreBadPath,all,IgnoreMakeProject', # MakeProject Tested. Bad Paths not used
     'linux_kernel_bcp4600'          => 'ForceProjectBase=/LMOS/linux/kernel',
     'linux_kernel_viper'            => 'ForceProjectBase=/LMOS/linux/kernel',
     'linux_kernel_cobra'            => 'ForceProjectBase=/LMOS/linux/kernel',
-    'LinuxDrivers'                  => 'flatTime,LimitProjectBase=/LMOS/linux/drivers'.
+    'LinuxDrivers'                  => 'flatTime,processRipples,LimitProjectBase=/LMOS/linux/drivers'.
                                        ',mergePaths=modules:bcp4600:cobra:eb5600:etx86:tp5600:viper',
     'flashCopier'                   => 'flatTime,LimitProjectBase=/LMOS/tools/flashCopier'.
                                        ',mergePaths=+:src:pcp5700:eb5600:tp5600',
     'u-boot'                        => 'flatTime,LimitProjectBase=/LMOS/linux/bootstrap/u-boot'.
                                        ',mergePaths=+:src:u-boot:u-boot-hk',
-    'dams5000'                      => 'flatTime,LimitProjectBase=/LMOS/apps/dams'.
+    'dams_gen1'                      => 'flatTime,LimitProjectBase=/LMOS/apps/dams'.
                                        ',mergePaths=+:tp5600:eb5600:pcp5700:core:doc'.
                                        ',processRipples',
-    'linux_day0fs_5000'            => 'flatTime,LimitProjectBase=/LMOS/linux/filesystems/day0-fs'.
+    'linux_day0fs_gen1'            => 'flatTime,LimitProjectBase=/LMOS/linux/filesystems/day0-fs'.
                                        ',mergePaths=+:tp5600:eb5600:pcp5700:etx86:common'.
                                        ',processRipples',
     'linux_kernel_gen1'               => 'flatTime,mergePaths=,processRipples,LimitProjectBase=/LMOS/linux/kernel',
     'rt3070'                          => 'flatVersion',
+    'TRACS'                           => 'IgnoreMakeProject,DeleteFiles=*.plg',   # not tested
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
 #    'daf_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
 my %notCots = (
     'isl'       => 1,
 );
-my $ukHopsMode = 0;
 my %ukHopsReleases = (
     '6222'      => { name => 'MainLine', 'trunk' => 1 },
     '14503'     => { name => 'Hops3' },
     '21864'     => { name => 'Hops3.6' },
     '22303'     => { name => 'Hops3.7' },
     '17223'     => { name => 'Hops4' },
+    '19743' => {name => 'ITSO.2.1.4-MainlineOBE_Validator'},
+    '11743' => {name => 'ITSO.2.1.3-MainlineOBE_Validator'},
+    '21384' => {name => 'OBE2.1.3-GoAheadRelease-R4'},
+    '23243' => {name => 'OBE2.1.3-GoAheadRelease-R4.5'},
+    '23843' => {name => 'Validator.2.1.3-UKlive'},
+    '15663' => {name => 'Validator.2.1.3-LegacyVersion_SSW_LMR'},
+    '25183' => {name => 'ITSO.2.1.4-Validator-cmnITSO.V2src'},
+    '24303' => {name => 'OBME_PSION-MAINLINE-ITSO.2.1.4'},
+    '13143' => {name => 'OBME_PSION-MAINLINE-ITSO.2.1.2'},
+    '24443' => {name => 'OBME_PSION-MAINLINE-ITSO.2.1.2-hot-fix'},
+    '16023' => {name => 'OBME_PSION-TransportScotlandDLL'},
 );
 # The following packages will have the version in the specified release forced to be on the trunk
 # A trunk will be forced and the version will be on it.
 #   May only work if the version in the release is also a TIP
         @ARGV = qw (
                 u-boot
                 u-boot-hk
                 );
-    } elsif ( $opt_mergePackages eq 'dams5000' ) {
+    } elsif ( $opt_mergePackages eq 'dams_gen1' ) {
         $opt_name = $opt_mergePackages;
         @ARGV = qw (
                     dams_eb5600
                     dams_pcp5700
                     dams_tp5600
                 );
-    } elsif ( $opt_mergePackages eq 'linux_day0fs_5000' ) {
+    } elsif ( $opt_mergePackages eq 'linux_day0fs_gen1' ) {
         $opt_name = $opt_mergePackages;
         @ARGV = qw (
                     linux_day0fs_eb5600
                     linux_day0fs_tp5600
                     linux_day0fs_etx86
             my $rv = scalar @va <=> scalar @vb;
             return $rv if ( $rv );
             foreach my $ii ( 0 .. scalar @va )
+            {
+                $va[$ii] = '' unless ( defined $va[$ii] );
+                $vb[$ii] = '' unless ( defined $vb[$ii] );
+                if ( ($va[$ii] =~ m~^\d+$~) && ($va[$ii] =~ m~^\d+$~)  )
+                {
-                $rv = $va[$ii] <=> $vb[$ii];
+                    $rv = $va[$ii] <=> $vb[$ii];
+                }
+                else
+                {
+                    $rv = $va[$ii] cmp $vb[$ii];
+                }
                 return $rv if ( $rv );
+            }
             return $rv;
+        }
             $opt_forceProjectBase = $1;
             $opt_AllowMuliplePaths = 1;
             Message ("Force Project Base: $opt_forceProjectBase");
+        }
         if ( $data =~ m~,LimitProjectBase=(.*?),~ ) {
             $opt_AllowMuliplePaths = 1;
             @opt_limitProjectBase = split(':', $1);
             Message ("Limit Project Base: @opt_limitProjectBase");
+        }
         if ( $data =~ m~,mergePaths=(.*?),~ ) {
             @opt_mergePaths = split(':', $1);
             Message ("Merge Paths: @opt_mergePaths");
+        }
+        if ( $data =~ m~,DeleteFiles=(.*?),~ ) {
+            @opt_deleteFiles = split(':', $1);
+            Message ("Delete Files: @opt_deleteFiles");
+        }
         if ( index( $data, ',IgnoreProjectBase,' ) >= 0) {
             $opt_ignoreProjectBaseErrors = 1;
             Message ("Ignore ProjectBase Errors");
+        }
         $rv = extractFilesFromClearCase( $data, $cc_path, $cc_label );
         return $rv if ( $rv );
+    }
+    #
+    #   Delete specified files from the source tree
+    #
+    if ( @opt_deleteFiles )
+    {
+        my @args;
+        foreach my $delFileSpec ( @opt_deleteFiles )
+        {
+            Message ("Deleting files that match: $delFileSpec");
+            push @args, "--FilterIn=$delFileSpec";
+        }
+        my $search = JatsLocateFiles->new("--Recurse=1", @args );
+        my @rmFiles = $search->search($data->{ViewRoot});
+        foreach my $rmFile ( @rmFiles )
+        {
+            Information("Deleting: $rmFile");
+            unlink ( join ('/', $data->{ViewRoot}, $rmFile) )|| Warning "Cannot delete: $rmFile";
+        }
+    }
+    #
     #   Developers have been slack
     #       Sometime the mark the source path as 'GMTPE2005'
     #       Sometimes as 'GMTPE2005/Package/Fred/Jill/Harry'
+    #
     #   Attempt to suck up empty directories below the specified
+#
 sub createImages
+{
     my $filebase = "${packageNames}";
+    my $openOk;
+    foreach my $ii ( 0 .. 5 )
+    {
-    open (FH, '>', $cwd . "/$filebase.dot" ) or die "Cannot open output";
+        if (open (FH, '>', $cwd . "/$filebase.dot" ))
+        {
+            $openOk = 1;
+            last;
+        }
+        sleep (2);
+    }
+    unless ( $openOk )
+    {
+        Warning ("Cannot open image output: $filebase.dot");
+        return;
+    }
     print FH "digraph \"${packageNames}\" {\n";
     #print FH "rankdir=LR;\n";
     print FH "node[fontsize=16];\n";
     print FH "node[target=_graphviz];\n";
 #    print FH "subgraph cluster_A {\n";
     $r1 =~ s~//~/~g;
     $r1 =~ s~^/~~;
     $r1 =~ s~/$~~;
     $svnRepo = $opt_repo_base . $r1;
-    Verbose( "Repo URL: $svnRepo");
+    Message( "Repo URL: $svnRepo");
+}
 #-------------------------------------------------------------------------------
 # Function        : getEssenialPackageVersions

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage.pl – Rev 2763 → 2909