WebSVN – DevTools – Diff – /core_devl/trunk/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;
+my $opt_useTestRepo;
 ################################################################################
 #   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',
+    'serpent'                         => 'flatTime,processRipples,LimitProjectBase=/LMOS/linux/kernel'.
+                                         ',mergePaths=serpent-common:common:cobra:viper',
     'rt3070'                          => 'flatVersion',
+    'TRACS'                           => 'IgnoreMakeProject,DeleteFiles=*.plg',   # not tested
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
 #    'daf_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
     'linux_kernel_gen1' => {
             'linux_kernel_eb5600_2.6.21.1.0.cots' => '+:TP5600:EB5600:ETX86:common:packager.sflash:www.kernel.org:packager.grub',
             'linux_kernel_tp5600_2.6.21.1.0.cots' => '+:tp5600:eb5600:etx86:bcp4600:common:packager.sflash:www.kernel.org:packager.grub',
             },
+    'serpent'   => {
+        'linux_kernel_viper_2.6.24.6.0000.cots' => 'common:viper',
+        'linux_kernel_viper_2.6.24.6.1000.cots' => 'serpent-common:cobra:viper',
+    },
+);
+my %packageRippleControl = (
+    'linux_drivers_etx86' => 'major',
+    'linux_drivers_eb5600' => 'major',
+    'linux_drivers_tp5600' => 'major',
 );
 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
                 'postimage!'        => \$opt_postimage,
                 'workdir:s'         => \$opt_workDir,
                 'relabel!'          => \$opt_relabel,
                 'svn!'              => \$opt_useSvn,
                 'testRmDatabase'    => \$opt_testRmDatabase,
-                'fromSvn!'          => \$opt_extractFromSvn,
                 'resume'            => \$opt_resume,
                 'mergePackages:s'   => \$opt_mergePackages,
                 'subdir:s'          => \$opt_repoSubdir,    # Subdir within repo
-                'svn!'          => \$opt_useSvn,
-                'testRmDatabase'    => \$opt_testRmDatabase,
                 'fromSvn!'          => \$opt_extractFromSvn,
+                'testRepo!'         => \$opt_useTestRepo,
                 );
+#
 #   Process help and manual options
+#
         @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
                     linux_kernel_tp5600
                     linux_kernel_eb5600
                     linux_kernel_bcp4600
                 );
+    } elsif ( $opt_mergePackages eq 'serpent' ) {
+        $opt_name = $opt_mergePackages;
+        @ARGV = qw (
+                    linux_kernel_viper
+                    linux_kernel_cobra
+                );
     } else
+    {
         Error ("Unknown Merge Package Name: $opt_mergePackages");
+    }
+}
             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;
+        }
             Message ("Flatten import tree. Sort by Version");
             $opt_flat = 1;
             $flatMode = 2;          # By Version
             $opt_processRipples = 0;
+        }
         if ( index( $data, ',processRipples,' ) >= 0) {
             $opt_processRipples = 1;
+        }
             $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");
+        }
+    {
         my $ep = $versions{$entry};
         if ( defined $ep->{buildVersion} )
+        {
             my $suffix = $ep->{suffix};
+            my $pname = $ep->{name};
+            $suffix = $pname . $suffix;
             my ($major, $minor, $patch, $build) = @{$ep->{buildVersion}};
 #print "--- $major, $minor, $patch, $build, $suffix\n";
+            my $key;
+            my $type = 'patch';
+            $type = $packageRippleControl{$pname} if ( exists  $packageRippleControl{$pname});
+            if ( $type eq 'patch' ) {
+                $key = "$major.$minor.$patch";
+#                $build = $build;
+            } elsif ( $type eq 'minor' ) {
+                $key = "$major.$minor";
+#                $build = ($patch * 1000) + $build;
+            } elsif ( $type eq 'major' ) {
+                $key = "$major";
+#                $build = ($minor * 1000000) + ($patch * 1000) + $build;
+            } else {
+                Error ("Invalid type in packageRippleControl for package $pname: $type");
+            }
-            $rippleVersions{$suffix}{"$major.$minor.$patch"}{count}++;
+            $rippleVersions{$suffix}{$key}{count}++;
-            my $rp = $rippleVersions{$suffix}{"$major.$minor.$patch"};
+            my $rp = $rippleVersions{$suffix}{$key};
-            $rp->{list}{$entry} = 1;
+            $rp->{list}{$entry} = $versions{$entry}{version};
-            next if ( $ep->{badVcsTag} );
+#            next if ( $ep->{badVcsTag} );
-            next if ( $ep->{locked} eq 'N');
+#            next if ( $ep->{locked} eq 'N');
-            if (!defined ($rp->{min}) || $rp->{min} > $build )
+#            if (!defined ($rp->{min}) || $rp->{min} > $build )
-            {
+#            {
-                $rp->{pvid} = $entry;
+#                $rp->{pvid} = $entry;
-                $rp->{min} = $build;
+#                $rp->{min} = $build;
-            }
+#            }
+        }
+    }
 #            DebugDumpData("rippleVersions", \%rippleVersions );
     while ( my($suffix, $e1) = each %rippleVersions )
+    {
+#DebugDumpData("rippleVersions. Suffix , e1", $suffix, $e1 );
         while ( my( $mmp, $e2) = each %{$e1} )
+        {
-            next unless ( exists  $e2->{pvid} );
+#            next unless ( exists  $e2->{pvid} );
-            my $entry = $e2->{pvid};
+#            my $entry = $e2->{pvid};
-            if ( !exists $versions{$entry} )
+#            if ( !exists $versions{$entry} )
-            {
+#            {
-                Error ("Internal: Expected entry not found: $entry, $mmp");
+#                Error ("Internal: Expected entry not found: $entry, $mmp");
-            }
+#            }
+#
-            $versions{$entry}{keepLowestRipple} = 1;
+#            $versions{$entry}{keepLowestRipple} = 1;
-#print "--- Keep Riple $versions{$entry}{vname}\n";
+#print "--- Keep Ripple: $versions{$entry}{name} $versions{$entry}{vname}\n";
+            #
             #   Update entry with list of associated ripples, removing lowest
+            #
+            my @rippleList = sort {$e2->{list}{$a} cmp $e2->{list}{$b}} keys %{$e2->{list}};
-            delete $e2->{list}{$entry};
+            my $firstEntry = shift @rippleList;
-            my @rippleList = sort keys %{$e2->{list}};
+            $versions{$firstEntry}{keepLowestRipple} = 1;
+#print "--- Keep Lowest: $versions{$firstEntry}{name} $versions{$firstEntry}{vname}\n";
             if ( @rippleList)
+            {
 #DebugDumpData("LIST: $entry", $e2->{list}, \@rippleList  );
-                @{$versions{$entry}{rippleList}} = @rippleList;
+                @{$versions{$firstEntry}{rippleList}} = @rippleList;
+#                foreach my $pvid ( @rippleList )
+#                {
+#                    print "----- $versions{$pvid}{name} $versions{$pvid}{vname}\n";
+#                }
+            }
+        }
+    }
+#    Error ("Just Testing");
+}
 #-------------------------------------------------------------------------------
 # Function        : processBranch
+#
         $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
+    #
     #   Create a nice name for the import
+    #
     my $import_label = saneLabel($entry);
-    $data->{ViewRoot} = $opt_name ? $opt_name : $import_label;
+    $data->{ViewRoot} = ( defined $opt_name && ! defined $opt_mergePackages )? $opt_name : $import_label;
     $data->{ViewPath} =  $data->{ViewRoot};
     $data->{ViewPath} =~  tr~/~/~s;
     if ( $opt_reuse && -d $data->{ViewPath}  )
+    {
         Message ("Reusing view: $import_label");
         return 0;
+    }
+                    #
                     #   Some developers have a 'special' package version
                     #   We really need to ignore them
+                    #
                     next if ( $pkg_ver eq '23.23.23.ssw' );
+                    #
                     #   Add data to the hash
                     #       Remove entries that address themselves
+                    #
                     push (@{$versions{$last_pv_id}{next}}, $pv_id) unless ($pv_id == $last_pv_id || $last_pv_id == 0) ;
+#
 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";
     $opt_vobMap = $ScmRepoMap{$packageNames}{repo}
         if (exists $ScmRepoMap{$packageNames});
     $opt_protected = $ScmRepoMap{$packageNames}{protected}
         if (exists $ScmRepoMap{$packageNames}{protected});
+    $opt_vobMap = '' if ( $opt_repoSubdir );
+    #
     #   Free the memory
+    #
     %ScmRepoMap = ();
+    #
     #   Calculate Target Repo
+    #
     Warning ("No VOB Mapping found")
-        unless ($opt_vobMap);
+        unless ($opt_vobMap || ($opt_repoSubdir && $opt_repo));
     Error("No repository specified. ie -repo=DevTools or -repo=COTS")
         unless ( $opt_repo || $opt_vobMap );
     my $r1 = ($opt_repo || '') . '/' . ($opt_vobMap || '') . '/' . ($opt_repoSubdir || '') ;
+    $r1 = 'Import_test/' . $r1 if ( $opt_useTestRepo );
     $r1 =~ s~//~/~g;
     $r1 =~ s~^/~~;
     $r1 =~ s~/$~~;
     $svnRepo = $opt_repo_base . $r1;
-    Verbose( "Repo URL: $svnRepo");
+    Message( "Repo URL: $svnRepo");
+}
 #-------------------------------------------------------------------------------
 # Function        : getEssenialPackageVersions
         } elsif ( $entry->{fromPath} =~ m~/branches/(.*)~ ) {
             $fromBranch = $1;
+        }
         # largest Rev number on branch
-        if ( exists $svnData{max}{$fromBranch} )
+        if ( exists $svnData{max} && exists $svnData{max}{$fromBranch} )
+        {
             if ( $svnData{max}{$fromBranch}{rev} <  $entry->{fromRev} )
+            {
                 $svnData{max}{$fromBranch}{rev} =  $entry->{fromRev};
                 $svnData{max}{$fromBranch}{name} = $name;
     -workdir=path      - Use for temp storage (def:/work)
     -delete            - Delete SVN package before test
     -[no]relabel       - Attempt to relabel dirs in packages that don't extract
     -testRmDatabase    - Use test database
     -[no]fromSvn       - Also extract packages from SVN
+    -[no]testRepo      - Force use of a test repository.
 =head1 OPTIONS
 =over 8

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage.pl – Rev 2764 → 2931