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

     '.uk'       => { Name => 'UkProject' },
     '.pmb'      => { Name => 'Pietermaritzburg' },
     '.vps'      => { Name => 'VixPayments' },
     '.ncc'      => { Name => 'NSWClubCard' },
     '.rm'       => { Name => 'Rome' },
+    '.vss'      => { Name => 'SmartSite' },
     'unknown'   => { Name => 'UnknownProject' },
     '.ebr'      => { Name => 'eBrio' , Trunk => 1 },
     '.mas'      => { Name => 'Mass'  , Trunk => 1 },
     '.cr'       => { Name => 'Core'  , Trunk => 1 },
     '.pxxx.sydddd'  => '.syd',
     '.oslo'         => '.oso',
     '.osl'          => '.oso',
 );
+my @excludeFromImport = (
+    # 22-Oct-12: Excluded on request from Kasun Sirikumara
+    # Pending VSS work
+    'agency_website',
+    'alx',
+    'alx-api',
+    'cardholder_website',
+    'loginmodule-ad',
+    'ols-enquiry',
+    'ols-enquiry-api',
+    'olsrpc4j',
+    'orca-middleware',
+    'orca-middleware-api',
+    'orca-salesEngine',
+    'orca-web-api',
+    'orca-web-utils',
+    'TestPaymentGateway',
+    'tgen4j',
+    'web-cd-client',
+);
 my %specialPackages = (
     'core_devl'           =>  ',all,protected,',
     'daf_utils_mos'       => ',flat,',
     'mos_packager'        => ',all,',
     'cfmgr-cfmgr'         => ',flat,',
     'daf_utils_button_st' => ',flat,',
+    'ReleaseName'         => ',flat,',
     # Need to be handled in a special manner
     # Not done by this utility
+    #
     'linux_drivers_eb5600'  => ',protected,',
     if ( $packageNames[0] =~ m'^br_applet_' )
+    {
         $opt_flat = 1 unless defined $opt_flat;
+    }
+    foreach  ( @excludeFromImport )
+    {
+         $specialPackages{$_} .= 'protected,';
+    }
     if ( exists $specialPackages{$packageNames[0]} )
+    {
         my $data = $specialPackages{$packageNames[0]};
         if ( index( $data, ',all' ) >= 0) {
             setPruneMode('none') unless (defined $opt_pruneModeString);
     #   Delete the created view
     #   Its just a directory, so delete it
+    #
     if ( $data{ViewRoot} && -d $data{ViewRoot})
+    {
-        if ( !$opt_reuse || ($rv && $rv != 4) )
+        if ( !$opt_reuse || ($rv && ($rv != 4 && $rv != 12 )) )
+        {
             Message ("Delete View: $data{ViewRoot}");
             RmDirTree ($data{ViewRoot} );
+        }
         else
+    #
     #   If this version has any 'ripples' then process them while we have the
     #   main view. Note the ripple list may contain entries that do not
     #   exist - they will have been pruned.
+    #
-if(0) {
+if(1) {
     foreach my $rentry ( @{$versions{$entry}{rippleList}} )
+    {
         next unless( exists $versions{$rentry} );
         if ($versions{$rentry}{Processed})
+{
     my ($data, $entry) = @_;
     my $rv;
     my $cc_label;
     my $cc_path;
+    my $cc_path_original;
+    #
     #   Init Data
+    #
     $data->{rmRef} = 'ERROR';
     $data->{tag} =~ m~^(.+?)::(.*?)(::(.+))?$~;
     $cc_label = $4;
     $cc_path = $2;
     $cc_path = '/' . $cc_path;
     $cc_path =~ tr~\\/~/~s;
+    $cc_path_original = $cc_path;
+    #
     #   Correct well known path mistakes
+    #
     $cc_path =~ s~/build.pl$~~i;
     $cc_path =~ s~/src$~~i;
+    $cc_path =~ s~/cpp$~~i;
     $cc_path =~ s~/MASS_Dev/Infra/~/MASS_Dev_Infra/~i;
     $cc_path =~ s~/MASS_Dev/Tools/~/MASS_Dev_Tools/~i;
     $cc_path =~ s~/MASS_Dev/Bus/~/MASS_Dev_Bus/~i;
     $cc_path =~ s~/MASS_Dev_Bus/Cbp/~/MASS_Dev_Bus/CBP/~i;
     $cc_path =~ s~/MREF_Package/ergpostmongui$~/MREF_Package/ergpostmongui~i;
-    $cc_path =~ s~/MREF_21/MREF_Package/~/MREF_Package/~i;
+    $cc_path =~ s~/MREF_../MREF_Package/~/MREF_Package/~i;
+    $cc_path =~ s~/MREF_Package/mass_ergocdp/~/MREF_Package/ergocdp/~i;
+    $cc_path =~ s~/MASS_Dev_Bus/CBP/systemCD.ejb~/MASS_Dev_Bus/CBP/systemCD/ejb~i;
+    $cc_path =~ s~/MASS_Dev_Bus/Financial/cpp/paymentmanager~/MASS_Dev_Bus/Financial/cpp/paymentmanager~i;
+    $cc_path =~ s~/MASS_Dev_Bus/WebServices~/MASS_Dev_Bus/WebServices~i;
+    $cc_path =~ s~/MASS_Dev_Bus/CBP/nullAdapter~//MASS_Dev_Bus/CBP/nullAdaptor~i;
+    $cc_path = '/MASS_Dev_Bus' if ( $cc_path =~ m~/MASS_Dev_Bus/ImageCapture(/|$)~i );
+    $cc_path = '/MASS_Dev_Bus/CBP/enquiry' if ( $versions{$entry}{name} eq 'EJBEnqPxyConnector');
+    $cc_path = '/MASS_Dev_Bus/CBP/enquiry' if ( $versions{$entry}{name} eq 'proxyif4j');
+    $cc_path = '/MASS_Dev_Bus' if ( $versions{$entry}{name} eq 'ImageCaptureTomcatDeployment');
+    $cc_path = '/MASS_Dev_Bus/WebServices/MassWS' if ( $versions{$entry}{name} eq 'MassWebServicesImpl');
+    if (   $versions{$entry}{name} =~ m/^ERGagency$/i
+        || $versions{$entry}{name} =~ m/^ERGavm$/i
+        || $versions{$entry}{name} =~ m/^ERGboi$/i
+        || $versions{$entry}{name} =~ m/^ERGcallcenter$/i
+        || $versions{$entry}{name} =~ m/^ERGcardholder$/i
+        || $versions{$entry}{name} =~ m/^ERGcdaimports$/i
+        || $versions{$entry}{name} =~ m/^ERGcda$/i
+        || $versions{$entry}{name} =~ m/^ERGcscedit$/i
+        || $versions{$entry}{name} =~ m/^ERGcs$/i
+        || $versions{$entry}{name} =~ m/^ERGofs$/i
+        || $versions{$entry}{name} =~ m/^ERGols$/i
+        || $versions{$entry}{name} =~ m/^ERGtpf$/i
+        || $versions{$entry}{name} =~ m/^ERGorasys$/i
+        || $versions{$entry}{name} =~ m/^ERGoracs$/i
+        || $versions{$entry}{name} =~ m/^ERGpxyif$/i
+        || $versions{$entry}{name} =~ m/^ERGtp5upg$/i
+        || $versions{$entry}{name} =~ m/^ERGinstitutional$/i
+        || $versions{$entry}{name} =~ m/^ERGinfra$/i
+        || $versions{$entry}{name} =~ m/^ERGcrrpts$/i
+        || $versions{$entry}{name} =~ m/^ERGmiddle$/i
+        || $versions{$entry}{name} =~ m/^ERGmiddleapi$/i
+        || $versions{$entry}{name} =~ m/^ERGwebapi$/i
+        || $versions{$entry}{name} =~ m/^ERGwebtestui$/i
+        || $versions{$entry}{name} =~ m/^ERGwebesbui$/i
+        || $versions{$entry}{name} =~ m/^ERGwspiv$/i
+        || $versions{$entry}{name} =~ m/^ERGwscst$/i
+        || $versions{$entry}{name} =~ m/^sposMUG$/i
+        || $versions{$entry}{name} =~ m/^ERGfinman$/i
+        || $versions{$entry}{name} =~ m/^ERGkm$/i
+        || $versions{$entry}{name} =~ m/^ERGxml$/i
+        || $versions{$entry}{name} =~ m/^ERGoradacw$/i
+        || $versions{$entry}{name} =~ m/^ERGtru$/i
+        )
+    {
+        $cc_path = '/MREF_Package';
+    }
+    if (   $versions{$entry}{name} =~ m/^tp5000_MUG$/i )
+    {
+        if ( $versions{$entry}{version} =~ m~vtk$~ )
+        {
+            $cc_path = '/MREF_Package';
+        }
+    }
+    if ( $cc_path_original ne $cc_path )
+    {
+            Message ("Package: $versions{$entry}{name}. Forcing CC path to: $cc_path" );
+    }
 #print "--- Path: $cc_path, Label: $cc_label\n";
+    #
     #   Create CC view
     #   Import into Subversion View
                     "-label=$cc_label" ,
                     "-path=$cc_path",
                     @args
                     );
+        if ( $rv == 10 ) {
+            $data->{errStr} = 'No Files in the extracted view';
+            $data->{errCode} = '0';
+            return 2;
+        }
+        elsif ( $rv == 11 ) {
+            $data->{errStr} = 'Label not found';
+            $data->{errCode} = 'L';
+            return 2;
+        }
         unless ( -d $data->{ViewPath}  )
+        {
             $data->{errStr} = 'Failed to extract files from CC';
             return 2;
+        }
+#
 # Returns         :
+#
 sub endPackage
+{
+    Message ("-- Import Summary ------------------------------------------------" );
     RmDirTree ('SvnImportDir');
+    #
     #   Display versions that did get captured
+    #
+    #
     foreach my $entry ( @processOrder )
+    {
         $versions{$entry}{Scanned} = 1;
         next if ( $versions{$entry}{TagCreated} );
+        my $reason = $versions{$entry}{data}{errStr} || '';
+        my $tag = $versions{$entry}{vcsTag}|| 'No Tag';
-        Warning ("Not Processed: " . GetVname($entry) );
+        Warning ("Not Processed: " . GetVname($entry) . ':' . $tag . ' : ' . $reason );
+    }
     foreach my $entry ( keys(%versions) )
+    {
         next if ( $versions{$entry}{Scanned} );
 #-------------------------------------------------------------------------------
 # Function        : findDirWithStuff
+#
 # Description     : Find a directory that contains more than just another subdir
+#                   Note: don't use 'glob' it doesn't work if the name has a space in it.
+#
 # Inputs          : $base               - Start of the scan
+#
 # Returns         : Path to dir with more than just a single dir in it
+#
+    {
     my $fileCount = 0;
     my $dirCount = 0;
     my $firstDir;
+    opendir (my $dh, $base ) || Error ("Cannot opendir $base. $!");
-    my @list = glob( $base . '/*');
+    my @list =readdir $dh;
+    closedir $dh;
     foreach ( @list )
+    {
         next if ( $_ eq '.' );
         next if ( $_ eq '..' );
+        $_ = $base . '/' . $_;
         if ( -d $_ )
+        {
             $dirCount++;
             $firstDir = $_ unless ( defined $firstDir );
+            return $base
-            return $base if ( $dirCount > 1  );
+                if ( $dirCount > 1  )
+        }
         elsif ( -e $_ )
+        {
             return $base;
+        }
         # else its probably a dead symlink
+    }
+    return $base
-    return $base unless ( $dirCount == 1  );
+        unless ( $dirCount == 1  );
     $base = $firstDir;
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : JatsToolPrint
+#
 # Description     : Print and Execuate a JatsTool command
+#
+{
     my ($tag) = @_;
     $tag =~ tr~\\/~/~;
     if ( $tag =~ m~^CC::~ )
+    {
-        $tag =~ s~CC::\s+~CC::~;
+        $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~/src::~::~i;
         $tag =~ s~MASS_Dev_Bus/Cbp/~MASS_Dev_Bus/CBP/~i;
         $tag =~ s~MASS_Dev_Bus~MASS_Dev_Bus~i;
         $tag =~ s~/MASS_Dev/Infra~MASS_Dev_Infra~i;
         push @text, 'b: Bad Singleton';
         push @text, 'B: Bad VCS Tag';
         push @text, 'D: DeadWood';
         push @text, 'E: Essential Release Version';
         push @text, 'G: Glued into Version Tree';
+        push @text, 'L: Label not in VOB';
         push @text, 'r: Recent version';
         push @text, 'R: Ripple';
         push @text, 'S: Splitpoint';
         push @text, 't: Glued into Project Tree';
         push @text, 'T: Tip version';
         push @text, 'V: In SVN';
         push @text, '+: In Subversion';
+        push @text, '0: Zero files extracted';
         push @text, '}}';
         push @text, '|';
         push @text, 'Outline';
         push @text, 'Red: Dead or Bad VCS Tag';
         push @text, 'Orange: Project Branch Root';
         push @text, 'Green: Ripple Build Version';
         push @text, 'Blue: Essential Version';
         push @text, 'Darkmagenta: Entry Glued into tree';
         push @text, 'Magenta: Entry added to project tree';
+        push @text, 'DeepPink: Label not in VOB';
+        push @text, 'DarkViolet: Zero files extracted';
         push @text, '|';
         push @text, 'Fill';
         push @text, 'PowderBlue: Essential Version';
         $stateText .= 'r' if (exists $versions{$entry}{keepRecent} && $versions{$entry}{keepRecent} );
         $stateText .= 'S' if (exists $versions{$entry}{EssentialSplitPoint} && $versions{$entry}{EssentialSplitPoint} > 1 );
         $stateText .= 'T' if (exists $versions{$entry}{Tip} );
         $stateText .= 'V' if (exists $versions{$entry}{isSvn} );
         $stateText .= '+' if (exists $versions{$entry}{svnVersion} );
+        $stateText .= '0' if (exists $versions{$entry}{data}{errCode} && $versions{$entry}{data}{errCode} eq '0');
+        $stateText .= 'L' if (exists $versions{$entry}{data}{errCode} && $versions{$entry}{data}{errCode} eq 'L');
 #        $stateText .= 's' if (exists $versions{$entry}{branchPoint} );
 #        $stateText .= ' T='. $versions{$entry}{threadId} if (exists $versions{$entry}{threadId});
 #        $stateText .= ' EssentalPath' if (exists $versions{$entry}{EssentialPath});
 #        $stateText .= ' Count='. $versions{$entry}{EssentialSplitPoint} if (exists $versions{$entry}{EssentialSplitPoint});
 #        $stateText .= ' M='. $versions{$entry}{maxVersion} if (exists $versions{$entry}{maxVersion});
-        push @label, "(${stateText})" if ( $stateText );
+        push @label, "(${stateText})" if ( length($stateText) );
 ##       Insert Release Names
         foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  ) {
             next unless ( exists $ukHopsReleases{$rtag_id} );
             push @label, "Release: $versions{$entry}{Releases}{$rtag_id}{rname}";
            $color = 'color=orange style=bold' if ( $versions{$entry}{newSuffix} );
            $color = 'color=red style=bold' if ( $versions{$entry}{DeadWood} || $versions{$entry}{badVcsTag} );
            $color = 'color=blue style=bold' if ( $versions{$entry}{Essential} );
            $color = 'color=darkmagenta style=bold' if ( $versions{$entry}{GluedIn} );
            $color = 'color=magenta style=bold' if ( $versions{$entry}{MakeTree} );
+           $color = 'color=DeepPink style=bold' if (exists $versions{$entry}{data}{errCode} && $versions{$entry}{data}{errCode} eq 'L');
+           $color = 'color=DarkViolet style=bold' if (exists $versions{$entry}{data}{errCode} && $versions{$entry}{data}{errCode} eq '0');
            $fill = 'style=filled fillcolor=powderblue' if ( $versions{$entry}{Essential} );
            $fill = 'style=filled fillcolor=red' if ( $versions{$entry}{Essential} && $versions{$entry}{badVcsTag} );
            $fill = 'style=filled fillcolor="#99FF99"' if ( exists $versions{$entry}{svnVersion} );

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/LOCAL/cc2svn_importpackage.pl – Rev 2319 → 2354