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

+#
 foreach my $pkgid ( keys %PackageSet )
+{
     ($PackageData{$pkgid}{type}, @{$PackageData{$pkgid}{suffixes}} ) = smartPackageType ($pkgid);
     my @vobs = keys %{$PackageData{$pkgid}{vobs}};
-    $PackageData{$pkgid}{isSVN} = 1 if ( @vobs == 1 && $vobs[0] eq 'SVN' );
+#    $PackageData{$pkgid}{isSVN} = 1 if ( @vobs == 1 && $vobs[0] eq 'SVN' );
-    $PackageData{$pkgid}{isSVN} = 1 if ( (exists ($PackageData{$pkgid}{vobs}{SVN})) && $PackageData{$pkgid}{vobs}{SVN});
+#    $PackageData{$pkgid}{isSVN} = 1 if ( (exists ($PackageData{$pkgid}{vobs}{SVN})) && $PackageData{$pkgid}{vobs}{SVN});
+    $PackageData{$pkgid}{isSVN} = 1 if ( exists $ScmAllPackages{$pkgid} && $ScmAllPackages{$pkgid}{inSvn} );
     $PackageData{$pkgid}{MultiVob} = 1 if ( @vobs > 1 );
     $PackageData{$pkgid}{BadVob} = 1 if ( grep {$_ eq 'BAD'} @vobs   );
+}
+#
 #   Map packages into Repos
+#
 my %Repos_lowercase;
 my %Repos;
             $Data{$name}{repo} = $repo;
             $Data{$name}{SVN} = 1 if $PackageData{$pkgid}{isSVN};
             $Data{$name}{youngest} = $youngest;
             $Data{$name}{ynr} = $youngestNonRipple;
             $Data{$name}{ynb} = $youngestNonBuildadm;
-            $Data{$name}{protected} = $Protected{$PackageData{$pkgid}{name}} if exists $Protected{$PackageData{$pkgid}{name}};
+            $Data{$name}{protected} = $Protected{$PackageData{$pkgid}{name}}{mode} if exists $Protected{$PackageData{$pkgid}{name}};
+        }
         $fh->Close();
+    }
     my $file = "cc2svn.repo.dat";
     print $HTML "Complete list of packages. This includes 'Essential Packages' and packages that ";
     print $HTML "are present in Release Manager, but are not currently used.";
     print $HTML "<br><button type=\"button\" onclick=\"flipStyleByName('.nonessential', 'display', 'none', '')\" >Show/Hide non Essential</button>";
     print $HTML "<button type=\"button\" onclick=\"flipStyleByName('.essential', 'display', 'none', '')\" >Show/Hide Essential</button>";
-    foreach my $pkgid ( sort {lc($ScmAllPackages{$a}) cmp lc($ScmAllPackages{$b}) } keys %ScmAllPackages )
+    foreach my $pkgid ( sort {lc($ScmAllPackages{$a}{name}) cmp lc($ScmAllPackages{$b}{name}) } keys %ScmAllPackages )
+    {
-        my $thisChar = uc(substr($ScmAllPackages{$pkgid}, 0, 1 ));
+        my $thisChar = uc(substr($ScmAllPackages{$pkgid}{name}, 0, 1 ));
         if ( $thisChar ne $currentChar )
+        {
             print $HTML $t->getTable if ( $t );
             $t = new HTML::Table();
         my $import_log = '';
         my $marker = '';
         my $class;
         unless ( exists $PackageData{$pkgid} )
+        {
-            $packageRef = $ScmAllPackages{$pkgid};
+            $packageRef = $ScmAllPackages{$pkgid}{name};
             $marker = 'Not being converted at this time';
             $class = 'nonEssential';
+        }
         else
+        {
+            }
+        }
         my $txt = join( '<br>', values %RepoList);
         $txt = ' : ' . $txt if ( $txt );
         $t->addRow("Repo:", hRef("#Repo_$repo", $repo). $txt );
-        $t->addRow("Protected:", $Protected{$PackageData{$pkgid}{name}} ) if exists $Protected{$PackageData{$pkgid}{name}};
+        if ( exists $Protected{$PackageData{$pkgid}{name}} )
+        {
+            my $entry = $Protected{$PackageData{$pkgid}{name}};
+            my $comment = $entry->{comment} || '';
+            my $t2 = new HTML::Table( -border=>0, -padding=>0, -spacing=>0, -class=>'paddedTable' );
+            $t2->addRow($entry->{mode}, $comment );
+            $t->addRow("Protected:", $t2->getTable);
+        }
+    }
     $t->setColClass (1, 'listTitle' );
     print $HTML $t->getTable;
     generateHTMLTail($HTML);
+    #
     $t->addRow( "Protected Packages - Migration delayed");
     $t->setRowClass  (-1, 'packageTitle');
     $t->setCellColSpan(-1, 1, 2);
     foreach my $pkgname ( sort keys %Protected )
+    {
-        next unless ( $Protected{$pkgname} eq 'Protected' );
+        next unless ( $Protected{$pkgname}{mode} eq 'Protected' );
         my $pkgid =  $ScmPkgNames{$pkgname};
         my $txt = $pkgid ? linkPackageDetails($pkgid) : $pkgname;
-        $t->addRow( $txt, $Protected{$pkgname});
+        $t->addRow( $txt, $Protected{$pkgname}{comment});
+    }
     $t->addRow( "Broken Packages - Migration not possible");
     $t->setRowClass  (-1, 'packageTitle');
     $t->setCellColSpan(-1, 1, 2);
     foreach my $pkgname ( sort keys %Protected )
+    {
-        next if ( $Protected{$pkgname} eq 'Protected' );
+        next if ( $Protected{$pkgname}{mode} eq 'Protected' );
         my $pkgid =  $ScmPkgNames{$pkgname};
         my $txt = $pkgid ? linkPackageDetails($pkgid) : $pkgname;
-        $t->addRow( $txt, $Protected{$pkgname});
+        $t->addRow( $txt, $Protected{$pkgname}{comment});
+    }
     print $HTML $t->getTable;
         'AdvisoryDependency'                    => 'DevTools/buildtool_tests',
         'CommonDependency'                      => 'DevTools/buildtool_tests',
         'GenericProduct'                        => 'DevTools/buildtool_tests',
         'LinuxCentricProduct'                   => 'DevTools/buildtool_tests',
         'CotsWithFunnyVersion'                  => 'DevTools/buildtool_tests',
+        'xp_sequence'                           => 'MASS_Dev_Bus',
+        'dmrc_windows_proxy'                    => 'MASS_Dev_Infra/Dmrc',
+        'ExtDataImporter'                       => 'MASS_Dev_Infra/Dmrc',
+        'inqshim'                               => 'MASS_Dev_Infra/Dmrc',
         'GenAppaCE'                             => 'DPG_SWCode/utilities',
         'AtmelHAL'                              => 'MASS_Dev_Crypto',
         'Netbula'                               => 'COTS',
         'UK_ITSO_COMPLIANT'     => 'ITSO_TRACS',
         'MASS_Dev_Infra/security'   => 'MASS_Dev_Infra/Security',
         'MASS_Dev_Infra/web'        => 'MASS_Dev_Infra/Web',
         'MASS_Dev_Infra/cdss'       => 'MASS_Dev_Infra/Cdss',
+        'TRACS/faresets'            => 'ITSO_TRACS/faresets',
     );
     my %PreferredPath = (
         'MASS_Dev_Bus/Reports'      => 1,
         'MASS_Dev_Bus/CBP'          => 1,
         $bad = 1 unless ( $label );
         $bad = 1 if ( $label =~ m~^N/A$~i || $label  =~ m~^na$~i );
         $bad = 1 unless ( $path );
         $bad = 1 if ( $path =~ m~^N/A$~i || $path  =~ m~^na$~i );
+        $bad = 1 if ( $path =~ m~^/dpkg_archive~ || $path  =~ m~^dpkg_archive~ );
-        $bad = 1 if ( $path =~ m~^/dpkg_archive~ );
+        $bad = 1 if ( $path =~ m~^/devl/~ || $path  =~ m~^devl/~ );
         $bad = 1 if ( $path =~ m~^CVS~ );
-        $bad = 1 if ( $path =~ m~^dpkg_archive~ );
         $bad = 1 if ( $path =~ m~^http:~i );
         $bad = 1 if ( $path =~ m~^[A-Za-z]\:~ );
         $bad = 1 if ( $path =~ m~^//~ );
         $bad = 1 if ( $path =~ m~^/blade1/~ );
         $bad = 1 if ( $path =~ m~^/devl/~ );
         $bad = 1 if ( $path =~ m~^/*none~i );
         $bad = 1 if ( $path =~ m~^/*NoWhere~i );
         $bad = 1 if ( $path =~ m~^-$~i );
+        $bad = 1 if ( $path =~ m~^cvsserver:~ );
+        $bad = 1 if ( $path =~ m~,\s*module:~ );
         $bad = 1 if ( $path =~ m~[()]~ );
 #        $bad = 1 unless ( $path =~ m~^/~ );
+    }
     else
+    {
 # Returns         : Cleaned up vcs tag
+#
 sub vcsCleanup
+{
     my ($tag) = @_;
-    $tag =~ tr~\\/~/~;
+    $tag =~ tr~\\/~/~;                              # Force use of /
+    $tag =~ s~/+$~~;                                # Trailing /
     if ( $tag =~ m~^CC::~ )
+    {
+        $tag =~ s~CC::/VOB:/~CC::/~;                # Kill stuff
         $tag =~ s~CC::load\s+~CC::~;                # Load rule
         $tag =~ s~CC::\s+~CC::~;                    # Leading white space
         $tag =~ s~CC::[A-Za-z]\:/~CC::/~;           # Leading driver letter
         $tag =~ s~CC::/+~CC::/~;                    # Multiple initial /'s
         $tag =~ s~/build.pl::~::~i;
         $tag =~ s~/MASS_Dev/Bus/web~/MASS_Dev_Bus/web~i;
         $tag =~ s~/Vastraffik/~/Vasttrafik/~;
         $tag =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
         $tag =~ s~DPC_SWCode/~DPG_SWCode/~i;
+    }
     return $tag;
+}
 #-------------------------------------------------------------------------------
 sub getProtectedPackages
+{
     my $badFile = 'cc2svn_protected.txt';
     Message ("Reading Protected Package: $badFile");
     open (my $fh, '<', $badFile ) || Error ("Cannot open $badFile");
+    my $section_comment;
     while ( <$fh> )
+    {
+        #
         #   Format of data is:
         #       packageName     - protected
         #      -packageName     - Known Broken
+        #
+        #   Line Comment is '#'
+        #   Package Comment is delimted by White space
+        #   Section Comment is [ comment ]
+        #
         s~\s+$~~;
         s~^\s+~~;
         next if ( m~^#~ );
+        if ( m~^\s*\[\s*(.*?)\s*\]~ )
+        {
+            $section_comment = $1;
+            next;
+        }
         $_ .= ' ';
         my @data = split (/ /, $_, 2);
         next unless ( $data[0] );
         my $name = $data[0];
+        my $comment = $data[1];
+        $comment =~ s~^\s+#~~;
+        $comment =~ s~^\s+~~;
+        $comment =~ s~\s+$~~;
+        $comment = $comment || $section_comment;
         my $mode = 'Protected';
         if ( $name =~ m~^-(.*)~ )
+        {
             $name = $1;
             $mode = 'Broken'
+        }
-        $Protected{$name} = $mode;
+        $Protected{$name}{mode} = $mode;
+        $Protected{$name}{comment} = $comment if ( $comment );
+    }
     close $fh;
 #    DebugDumpData('%Protected', \%Protected );
+}

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_procdata.pl – Rev 2449 → 2548