WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage2.pl

 use JatsProperties;
 use JatsEnv;
 use ConfigurationFile;
 use JatsSvn qw(:All);
 use JatsLocateFiles;
+use Encode;
 #use Data::Dumper;
 use Fcntl ':flock'; # import LOCK_* constants
 use Cwd;
 my $opt_postimage = 1;
 my $opt_workDir = '/work';
 my $opt_vobMap;
 my $opt_preserveProjectBase;
 my $opt_ignoreProjectBaseErrors;
+my $opt_ignoreMakeProjectErrors;
 my $opt_delete;
 my $opt_recentAge = 14;             # Days
+my $opt_relabel = 0;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     '.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',
+    # 05-Nov-12: Pending fixup for include.txt files that escape the VOB
+    #
+#    'ddu_app_manager',
+#    'ddu_dog',
+#    'ddu_dog_lib',
+#    'ddu_fim',
+#    'ddu_logging_lib',
+#    'ddu_management',
+#    'ddu_mccain',
+#    'ddu_mon',
+#    'ddu_rcu',
+#    'ddu_status_logging',
+);
 my %specialPackages = (
-    'core_devl' =>  ',all,protected,',
+    'core_devl'           =>  ',all,protected,',
+    'daf_utils_mos'       => ',flat,',
-#    'core_devl' =>  ',all,',
+    'mos_packager'        => ',all,',
+    'cfmgr-cfmgr'         => ',flat,',
-    'daf_utils_mos' => ',flat,',
+    'daf_utils_button_st' => ',flat,',
-    'mos_packager'  => ',all,',
+    'ReleaseName'         => ',flat,',
+    'reports'             => ',utf8,',
+    'cda_imports'         => ',utf8,',
+    'cdxforms'            => ',utf8,',
+    'db_cda'              => ',utf8,',
     # Need to be handled in a special manner
     # Not done by this utility
+    #
     'linux_drivers_eb5600'  => ',protected,',
     'linux_drivers_cobra'   => ',protected,',
     'linux_drivers_bcp4600' => ',protected,',
     'linux_drivers_etx86'   => ',protected,',
     'linux_drivers_tp5600'  => ',protected,',
+# Not in the ukHops migration at the moment
+    'cs'                        => ',protected,',
+    'DBA-Common'                => ',protected,',
+    'DBA-DatabaseInstall'       => ',protected,',
+    'DBA-ExternalPerlModules'   => ',protected,',
+    'DBA-OraUserBuild'          => ',protected,',
+    'DBA-OST'                   => ',protected,',
+    'orahops-install'           => ',protected,',
+    'orahops-patch'             => ',protected,',
+    'orahops-ssw-install'       => ',protected,',
+    'orahops-ssw-patch'         => ',protected,',
+# End of ukHops migration exclussion
     'ftp'                   => 'SetProjectBase,',
+    'ddu_app_manager'       => 'SetProjectBase,',
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
     'daf_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
     'itso_ud'               => 'IgnoreProjectBase,',
 #    'mos_api'               => 'IgnoreProjectBase,',
 #    'mos_fonts'             => 'IgnoreProjectBase,',
 #    'sntp'                  => 'IgnoreProjectBase,',
 #    'time_it'               => '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' },
+);
+# 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
+my %ukHopsTip = (
+    'ItsoMessaging'         => '6222',
+    'MessageProcessor'      => '6222',
+    'StrongNameKey'         => '6222',
+);
 ################################################################################
 #   Global data
+#
 my $VERSION = "1.0.0";
 my $RM_DB;
 my $allSvn;
 my @multiplePaths;
 my @badEssentials;
 my %svnData;
 my $cwd;
+my $mustConvertFileNames;
+my $workDir;
 my $packageNames;
 my @packageNames;
 my $multiPackages = -1;
 my $visitId = 0;
 my $rippleCount = 0;
 my $svnRepo;
 my $processCount = 0;
 my $processTotal = 0;
 my $recentCount = 0;
+my $packageReLabelCount = 0;
+my %saneLabels;
 our $GBE_RM_URL;
 my $UNIX = $ENV{'GBE_UNIX'};
 my $result = GetOptions (
                 "tip:s"         => \@opt_tip,           # Force tip version(s)
                 "log!"          => \$opt_log,
                 "delete!"       => \$opt_delete,
                 "postimage!"    => \$opt_postimage,
                 'workdir:s'     => \$opt_workDir,
+                'relabel!'      => \$opt_relabel,
                 );
+#
 #   Process help and manual options
+#
+    }
+    #
     #   Perform all the work in a package specific subdirectory
+    #
-    my $workDir = $opt_workDir . '/' . $packageNames;
+    $workDir = $opt_workDir . '/' . $packageNames;
     mkdir $workDir unless ( -d $workDir );
     chdir $workDir || Error ("Cannot cd to $workDir");
+    #
     #   Process all packages
         $opt_flat = 1 unless defined $opt_flat;
         setPruneMode('none') unless (defined $opt_pruneModeString);
     } elsif ( exists $suffixes{'.tool'} ) {
         $packageType = 'TOOL';
-        $Projects{'.tool'}{'Trunk'} = 1;
+        $Projects{'.tool'}{Trunk} = 1;
         $singleProject = 1;
         setPruneMode('none') unless (defined $opt_pruneModeString);
 #        $opt_flat = 1;
     } elsif ( scalar (keys %suffixes ) == 1 ) {
+    }
+    #
     #   Some packages are special
+    #
+    if ( $svnRepo =~ m~/Manufacturing(/|$)~ )
+    {
+        Message ("Set Manufacturing Repo style");
+        $opt_flat = 1;
+        setPruneMode('none') unless (defined $opt_pruneModeString);
+    }
     if ( $packageNames[0] =~ m'^br_applet_' )
+    {
-        $opt_flat = 1 unless defined $opt_flat;
+      $opt_flat = 1 unless defined $opt_flat;
+    }
+    foreach  ( @excludeFromImport )
+    {
+         $specialPackages{$_} .= 'protected,';
+    }
     if ( exists $specialPackages{$packageNames[0]} )
+    {
         my $data = $specialPackages{$packageNames[0]};
         if ( index( $data, 'IgnoreProjectBase,' ) >= 0) {
             $opt_ignoreProjectBaseErrors = 1;
             Message ("Ignore ProjectBase Errors");
+        }
+        if ( index( $data, 'IgnoreMakeProject,' ) >= 0) {
+            $opt_ignoreMakeProjectErrors = 1;
+            Message ("Ignore MakeProject Usage");
+        }
+        if ( index( $data, 'utf8,' ) >= 0) {
+            $mustConvertFileNames = 1;
+            Message ("Convert filenames to UTF8");
+        }
+    }
     Message("Package Type: $packageType, $pruneModeString");
+}
                     $versions{$entry}{newSuffix} = 1;
+                }
+            }
+        }
+    }
+    #
+    #   Mark UkHops special points
+    #
+    foreach my $entry ( keys(%versions) ) {
+        foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  ) {
+            next unless ( exists $ukHopsReleases{$rtag_id} );
+            next unless ( $svnRepo =~ m~/ITSO_TRACS$~ );
+            #
+            #   This package is current in a special ukHops release
+            #   Need to handle the differently
+            #
+            my $ukData =  $ukHopsReleases{$rtag_id};
+            # Mark version we want on the trunk
+            # Will calculate tip later
+            if ( $ukData->{trunk} )
+            {
+                #
+                #   Can only place on trunk IFF its a tip
+                #   May have a WIP.
+                #   Solution. Walk to the tip, but only if there is one
+                #             path.
+                #
+                my $end = $entry;
+                my $last;
+                while ( $end )
+                {
+                    $last = $end;
+                    if ( @{$versions{$end}{next}} > 1)
+                    {
+                        Warning ("Uk Release. Preferred trunk is not a tip: $versions{$entry}{vname}");
+                        last;
+                    }
+                    $end = @{$versions{$end}{next}}[0];
+                }
+                $versions{$last}{ukTrunk} = 1 ;
+            }
+            #
+            #   What to do if the version is in more than one release
+            #
+            $versions{$entry}{ukBranch}++;
+            if ( $versions{$entry}{ukBranch} > 1 )
+            {
+                Warning ("Version found in multiple Uk Releases - don't know what to do");
+            }
+            #
+            #   What to do if the package has multiple version in a release
+            #
+            $ukData->{count}++;
+            if ( $ukData->{count} > 1 )
+            {
+                Warning ("Package has multiple versions in the one Uk Release: $versions{$entry}{Releases}{$rtag_id}{rname}");
+            }
+        }
+    }
+    #
     #   Prune
     #   Marks paths to root for all essential packages
     #   Marks the last-N from all essential packages
             my $entry = $_;
             my $count = 0;
             while ( $entry )
+            {
                 last if ( $versions{$entry}{KeepMe} );
-                unless ( $versions{$entry}{isaRipple} )
+#                unless ( $versions{$entry}{isaRipple} )
+                {
                     my $keepFlag = ($count++ < $opt_retaincount);
                     last unless ( $keepFlag );
                     $versions{$entry}{KeepMe} = $keepFlag;
+                }
+        {
             my ($entry) = @_;
             return 0 unless ( exists $versions{$entry} );
             return 0 unless ( $versions{$entry}{last} );
-            return 0 if ( ($pruneMode == 2) && exists $versions{$entry}{KeepMe} );
+#            return 0 if ( ($pruneMode == 2) && exists $versions{$entry}{KeepMe} );
+            return 0 if ( exists $versions{$entry}{KeepMe} );
             return 0 if ( exists $versions{$entry}{Essential} );
             return 0 if ( $versions{$entry}{newSuffix} );
             return 0 if ( $versions{$entry}{newSuffix} && (exists $versions{$entry}{EssentialPath}) );
 #            return 1 if ( exists $versions{$entry}{DeadWood} );
             return 0 if ( exists $versions{$entry}{EssentialSplitPoint} && $versions{$entry}{EssentialSplitPoint} > 1 );
+        #
         calcRippleGroups();
+    }
+    #
+    #   Want some versions to be forced to tip trunk
+    #
+    foreach my $name ( keys %ukHopsTip )
+    {
+        foreach my $entry ( keys(%versions) )
+        {
+            next unless ( $versions{$entry}{name} eq $name  );
+            next unless ( exists $versions{$entry}{Releases}{$ukHopsTip{$name}} );
+            #
+            #   Force this suffix to be the trunk
+            #   Remove all others
+            #
+            foreach my $suffix ( keys %Projects )
+            {
+                delete $Projects{$suffix}{Trunk};
+            }
+            my $suffix = $versions{$entry}{suffix};
+            $Projects{$suffix}{Trunk} = 1;
+        }
+    }
+    #
     #   Calculate best through-path for branches in the tree
     #   Attempt to keep that 'max' version on the mainline
     #   May be modified by -tip=nnnn
+    #
     #   For each leaf (end point), walk backwards and mark each node with the
     #   be recalculated
+    #
     Message ("Calculate Max Version");
     my $maxVersion;
     foreach my $entry ( @endPoints )
+    {
         my $lastSuffix;
         my $forceTip;
         while ( $entry )
             if (!defined($lastSuffix) || ($versions{$entry}{suffix} ne $lastSuffix) )
+            {
                 $maxVersion = '0';
                 $visitId++;
                 $forceTip = ( exists $tipVersions{$versions{$entry}{vname}} );
+                $forceTip = 1 if $versions{$entry}{ukTrunk};
                 delete $tipVersions{$versions{$entry}{vname}};
                 $maxVersion = '999.999.999.999.zzz' if ( $forceTip );
                 $lastSuffix = $versions{$entry}{suffix};
 #print "---Tip Found\n" if $forceTip;
+            }
     #   Delete the created view
     #   Its just a directory, so delete it
+    #
     if ( $data{ViewRoot} && -d $data{ViewRoot})
+    {
-        if ( !$opt_reuse || $rv )
+        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(1) {
     foreach my $rentry ( @{$versions{$entry}{rippleList}} )
+    {
         next unless( exists $versions{$rentry} );
         if ($versions{$rentry}{Processed})
         Message ("Proccessing associated Ripple: " . GetVname($rentry));
         newPackageVersion($rentry);
+    }
+}
+}
 #-------------------------------------------------------------------------------
 # Function        : newPackageVersionBody
+#
 # Description     : Perform the bulk of the work in creating a new PackageVersion
+{
     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
+    #
-    $data->{ViewRoot} = $opt_name ? $opt_name : "$cc_label";
+    $rv = extractFilesFromClearCase( $data, $cc_path, $cc_label );
-    $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
+    return $rv if ( $rv );
-    if ( $opt_preserveProjectBase )
-    {
+    #
-        my $cc_vob = $cc_path;
+    #   Developers have been slack
-        $cc_vob =~ s~^/~~;
-        $cc_vob =~ s~/.*~~;
-        $data->{ViewPath} =  $data->{ViewRoot} . '/' . $cc_vob;
+    #       Sometime the mark the source path as 'GMTPE2005'
-        Message ("Preserving Project Base");
+    #       Sometimes as 'GMTPE2005/Package/Fred/Jill/Harry'
-    }
+    #
-    $data->{ViewPath} =~  tr~/~/~s;
+    #   Attempt to suck up empty directories below the specified
-    if ( $opt_reuse && -d $data->{ViewPath}  )
+    #   source path
-    {
+    #
-        Message ("Reusing view: $cc_label");
+    unless ( $opt_preserveProjectBase )
-    }
-    else
+    {
-        my @args;
+        #
-        push (@args, '-view', $opt_name ) if ( defined $opt_name );
-        $rv = JatsToolPrint ( 'jats_ccrelease', '-extractfiles', '-root=.' , '-noprefix',
-                    "-label=$cc_label" ,
+        #   Look in ViewPath
-                    "-path=$cc_path",
+        #   If it contains only ONE directory then we can suck it up
-                    @args
+        #
-                    );
+        my $testDir = findDirWithStuff( $data->{ViewPath} );
-        unless ( -d $data->{ViewPath}  )
+        unless ( $data->{ViewPath} eq $testDir  )
+        {
+            Message ("Adjust Base Dir: $testDir");
-            $data->{errStr} = 'Failed to extract files from CC';
+            $data->{adjustedPath} = $data->{ViewPath};
-            return 2;
+            $data->{ViewPath} = $testDir;
+        }
+    }
+    #
     #   Some really ugly packages make use of a Jats feature called 'SetProjectBase'
     #   Detect such packages as we will need to handle them differently
     #   Can't really handle it on the fly
-    #   All we can do is detct it and report it - at the moment
+    #   All we can do is detect it and report it - at the moment
+    #
     if (detectProjectBaseUsage($data, $cc_path) )
+    {
         unless ( $opt_ignoreProjectBaseErrors )
+        {
             $data->{BadProjectBase}++;
             $data->{errStr} = 'Bad usage of ProjectBase detected';
+            return 4;           # Lets see what the others look like too
-            return 14;
+#            return 14;
+        }
+    }
+    #
+    #   Some really really ugly packgaes make use of the MakeProject directive
+    #   and then use an 'include.txt file to access paths all over the VOB
-    #   Developers have been slack
+    #   The problem is with lines like
+    #           /I ..\..\..\..\..\..\DPG_SWCode\projects\seattle\ddu\component\DTIApp\dsi\inc
+    #   Two problems:
-    #       Sometime the mark the source path as 'GMTPE2005'
+    #       Vob Name is not a part of the migration
-    #       Sometimes as 'GMTPE2005/Package/Fred/Jill/Harry'
+    #       If we 'SuckUp' empty directories then this may break
+    #       the pathing.
+    #   All we can do is detect it and report it - at the moment
+    #
+    if (detectMakeProjectUsage($data, $cc_path) )
+    {
+        unless ( $opt_ignoreMakeProjectErrors )
+        {
+            $data->{BadMakeProject}++;
+            $data->{errStr} = 'Use of MakeProject detected';
-    #   Attempt to suck up empty directories below the specified
+            return 4;           # Lets see what the others look like too
-    #   source path
+#            return 14;
+        }
+    }
+    #
+    #   Some packages have filenames that are need to be converted
+    #
-    unless ( $opt_preserveProjectBase )
+    if ( $mustConvertFileNames  )
+    {
+        $rv = system ( '/home/dpurdie/svn/tools/convmv-1.15/convmv',
+                 '-fiso-8859-1',
+                 '-tutf8',
+                 '-r',
+                 '--notest',
+                 $data->{ViewPath} );
+        if ( $rv )
+        {
+            $data->{errStr} = 'Failed to convert filenames to UTF8';
+            return 14;
+        }
+        #
-        #   Look in ViewPath
+        #   Check to see if our ViewPath has been changed
-        #   If it contains only ONE directory then we can suck it up
+        #   If so, then try to fix it
+        #
-        my $testDir = findDirWithStuff( $data->{ViewPath} );
-        unless ( $data->{ViewPath} eq $testDir  )
+        unless ( -d $data->{ViewPath} )
+        {
-            Message ("Adjust Base Dir: $testDir");
+            Message ("Correct UTF-8 change to ViewPath");
-            $data->{adjustedPath} = $data->{ViewPath};
+            $data->{ViewPath} = encode('UTF-8', $data->{ViewPath}, Encode::FB_DEFAULT);
-            $data->{ViewPath} = $testDir;
+            Warning ("Correct UTF-8 change to ViewPath - FAILED") unless ( -d $data->{ViewPath} );
+        }
+    }
+    #
     #   Have a CC view
     #   Now we can create the SVN package and branching point before we
     #   import the CC data into SVN
+    #
+    {
         $data->{errStr} = 'Failed to determine Rm Reference';
         return 13;
+    }
+######################## Deleted ###############################################
+#
+#
-    #
+#    #
-    #   Add supplemental tags if this version is in a 'Release'
+#    #   Add supplemental tags if this version is in a 'Release'
-    #   But only for some packages - els looks like a mess
+#    #   But only for some packages - else looks like a mess
-    #   Just a solution for the ITSO guys
+#    #   Just a solution for the ITSO guys
-    #
+#    #
-    foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  )
+#    foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  )
-    {
+#    {
-        next unless ( $svnRepo =~ m~/ITSO_TRACS(/|$)~);
+#        next unless ( $svnRepo =~ m~/ITSO_TRACS(/|$)~);
+#
-        my $prog_id = $versions{$entry}{Releases}{$rtag_id}{proj_id};
+#        my $prog_id = $versions{$entry}{Releases}{$rtag_id}{proj_id};
-        Message ("Adding Release Tag:$prog_id:$rtag_id");
+#        Message ("Adding Release Tag:$prog_id:$rtag_id");
+#
-        my $rtext = 'Release_' . saneString($versions{$entry}{Releases}{$rtag_id}{rname});
+#        my $rtext = 'Release_' . saneString($versions{$entry}{Releases}{$rtag_id}{rname});
-        my @comment;
+#        my @comment;
-        push @comment, "Tagged by ClearCase to Subversion import";
+#        push @comment, "Tagged by ClearCase to Subversion import";
-        push @comment, "Project:$prog_id:$versions{$entry}{Releases}{$rtag_id}{pname}";
+#        push @comment, "Project:$prog_id:$versions{$entry}{Releases}{$rtag_id}{pname}";
-        push @comment, "Release:$rtag_id:$versions{$entry}{Releases}{$rtag_id}{rname}";
+#        push @comment, "Release:$rtag_id:$versions{$entry}{Releases}{$rtag_id}{rname}";
+#
-        $data->{ReleaseTag}{$prog_id}{$rtag_id}{name} = $rtext;
+#        $data->{ReleaseTag}{$prog_id}{$rtag_id}{name} = $rtext;
+#
-        $rv = JatsToolPrint ( 'jats_svnlabel' ,
+#        $rv = JatsToolPrint ( 'jats_svnlabel' ,
-                    '-comment', encode('UTF-8', join("\n", @comment), Encode::FB_DEFAULT),
+#                    '-comment', encode('UTF-8', join("\n", @comment), Encode::FB_DEFAULT),
-                    $data->{rmRef},
+#                    $data->{rmRef},
-                    '-clone',
+#                    '-clone',
-                    $rtext,
+#                    $rtext,
-#                    @args,
+##                    @args,
-                    '-author=buildadm',
+#                    '-author=buildadm',
-                     );
+#                     );
-        $data->{ReleaseTag}{$prog_id}{$rtag_id}{eState} = $rv;
+#        $data->{ReleaseTag}{$prog_id}{$rtag_id}{eState} = $rv;
-        $data->{ReleaseTag}{tCount}++;
+#        $data->{ReleaseTag}{tCount}++;
+#
-        if ( $rv )
+#        if ( $rv )
-        {
+#        {
-            $data->{ReleaseTag}{eCount}++;
+#            $data->{ReleaseTag}{eCount}++;
-            Warning("Failed to add Release Tag: $rtext");
+#            Warning("Failed to add Release Tag: $rtext");
-        }
+#        }
-    }
+#    }
+#
+######################## Deleted ###############################################
     Message ("RM Ref: $data->{rmRef}");
     unlink $datafile;
+    #
+#
 # 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} );
         Warning ("(E) INTERNAL ERROR. Package Not Processed: " . GetVname($entry) );
+    }
+    Message ("Packages Relabled: $packageReLabelCount") if ( $packageReLabelCount );
     Message ("All Done");
+}
 #-------------------------------------------------------------------------------
+# Function        : extractFilesFromClearCase
+#
+# Description     : Extract files from ClearCase
+#                   May take a while as we handle nasty errors
+#
+# Inputs          : $data           - Hash of good stuff from newPackageVersionBody
+#                   $cc_path
+#                   $cc_label
+#
+# Returns         : exit code
+#                   Sets up
+#                       $data->{errStr}
+#                       $data->{errCode}
+#                   As per newPackageVersionBody
+#
+sub extractFilesFromClearCase
+{
+    my ($data, $cc_path, $cc_label) = @_;
+    my $tryCount = 0;
+    my $rv = 99;
+    $data->{ViewRoot} = $opt_name ? $opt_name : "$cc_label";
+    $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
+    if ( $opt_preserveProjectBase )
+    {
+        my $cc_vob = $cc_path;
+        $cc_vob =~ s~^/~~;
+        $cc_vob =~ s~/.*~~;
+        $data->{ViewPath} =  $data->{ViewRoot} . '/' . $cc_vob;
+        Message ("Preserving Project Base");
+    }
+    $data->{ViewPath} =~  tr~/~/~s;
+    if ( $opt_reuse && -d $data->{ViewPath}  )
+    {
+        Message ("Reusing view: $cc_label");
+        return 0;
+    }
+    while ( $rv == 99 ) {
+        my @args;
+        push (@args, '-view', $opt_name ) if ( defined $opt_name );
+        $rv = JatsToolPrint ( 'jats_ccrelease', '-extractfiles', '-root=.' , '-noprefix',
+                    "-label=$cc_label" ,
+                    "-path=$cc_path",
+                    @args
+                    );
+        if ( $rv == 10 ) {
+            #
+            #   No files found
+            #   If this is the first time then try really hard to find them
+            #
+            unless ( $tryCount++ )
+            {
+                if ( $opt_relabel )
+                {
+                    $packageReLabelCount++;
+                    $rv = JatsToolPrint('cc2svn_labeldirs',
+                                            '-vob', $cc_path,
+                                            $cc_label,
+                                            );
+                    $data->{DirsLabled} = 100 + $rv;
+                }
+                #
+                #   Second attempt - massage the users path
+                #   We should have labled up to the VOB root so lets
+                #   just use the VOB and not the path
+                #
+                #   If we are not relabeling then we can still do this
+                #   in an attempt to fix user stupidity
+                #
+                $cc_path =~ s~^/~~;
+                $cc_path =~ s~/.*~~;
+                $cc_path = '/' . $cc_path;
+                $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
+                redo;
+            }
+            $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;
+        }
+        #
+        #   Looks good
+        #
+        return 0;
+    };
+    $data->{errStr}  = 'No Files in the extracted view after labeling dirs';
+    $data->{errCode} = '0';
+    return 2;
+}
+#-------------------------------------------------------------------------------
+# Function        : detectMakeProjectUsage
+#
+# Description     : etect and report usage of the MakeProject directive
+#
+# Inputs          : $data               - Ref to a hash of bits
+#                   $cc_path            - Packages cc_path
+#
+# Returns         : true    - Bad usage (Really good usage not detected)
+#                   false   - Good usage detected
+#
+sub detectMakeProjectUsage
+{
+    my ($data, $cc_path) = @_;
+    my $retval = 0;
+    my $eSuf = $opt_ignoreMakeProjectErrors ? '' : 'Error';
+    #
+    #   Find makefile.pl
+    #
+    Message ("Locate JATS makefiles");
+    my $usesMakeProject = 0;
+    my $badIncludeFile = 0;
+    my $search = JatsLocateFiles->new("--Recurse=1",
+                                       "--FilterIn=makefile.pl",
+                                       );
+    my @makefiles = $search->search($data->{ViewRoot});
+    foreach my $file ( @makefiles )
+    {
+#print "---Reading: $workDir/$data->{ViewRoot}/$file\n";
+        if ( open( my $fh, '<', "$data->{ViewRoot}/$file" ) )
+        {
+            my $eof = 0;
+            my $line = '';
+            until ( $eof )
+            {
+                my $in = <$fh>;
+                unless ( defined $in )
+                {
+                    $eof = 1;
+                }
+                else
+                {
+                $in =~ s~\s+$~~;
+                $in =~ s~^\s+~~;
+                $in =~ s~^#.*$~~;
+                $in =~ s~\s*[^\$]#.*$~~;
+                $line .= ' ' if ( $line );
+                $line .= $in;
+                $line =~ s~\s+~ ~g;
+#print "====== '$line'\n";
+                redo unless ( $line =~ m~;$~  );
+                }
+#print "---- $line\n";
+                if ( $line =~ m~^MakeProject~ )
+                {
+                    $usesMakeProject++;
+                    $data->{UsesMakeProject}++;
+                    Warning ("Package uses MakeProject:",
+                             "Line: " . $line,
+                             "Root: " . "$data->{ViewRoot}",
+                             "File: " . "$data->{ViewRoot}/$file",
+                            );
+                    #
+                    #   Extract out the project name
+                    #
+                    my @myArgs;
+                    my $myProjectDir;
+                    my $myProject = "$data->{ViewRoot}/$file";
+                    $myProject =~ s~/[^/]+$~~;
+                    $line =~ s~MakeProject~push \@myArgs,~;
+                    eval $line;
+                    Error("Line did not compiler: $line", "Err: $@" ) if ($@);
+                    shift @myArgs;
+                    foreach ( @myArgs )
+                    {
+                        next if ( m~^--~ );
+                        $myProject .= '/' . $_;
+                        $myProjectDir = $myProject;
+                        $myProjectDir =~ s~/[^/]+$~~;
+                        last;
+                    }
+                    Error ("No project Found") unless ( defined $myProjectDir);
+                    if ( -f "$myProjectDir/include.txt" )
+                    {
+                        Warning ("Co-located 'include.txt' file also found");
+                    }
+                    # The only problem is if the include.txt file
+                    # escapes from the VOB - or even uses the vob root
+                    #
+                    # Examine the include file
+                    # Expect it to look like
+                    #   /I Path
+                    #
+                    #
+                    #   Determine safe level
+                    #   Relative to the include file
+                    #
+                    my $depthPath = $myProjectDir;
+                    my $depth = 0;
+                    Error ("Expect this to work") unless ( $depthPath =~ s~^$data->{ViewRoot}/~~ );
+                    foreach ( split('/', $depthPath) )
+                    {
+                        if ( $_ eq '..' ) {
+                            $depth--;
+                        } else {
+                            $depth++;
+                        }
+                    }
+#print "Depth: $depth, $depthPath\n";
+                    if ( open( my $if, '<', "$myProjectDir/include.txt" ) )
+                    {
+                        while ( <$if> )
+                        {
+                            s~\s+$~~;
+                            s~^\s+~~;
+                            next unless ( $_ );
+                            if ( m~/I\s+(.*)~ )
+                            {
+                                my $path = $1;
+                                $path =~ tr~\\/~/~s;
+                                $path =~ s~\\~/~g;
+#print "Examine: $path\n";
+                                my $minLevel = 0;
+                                my $level = 0;
+                                foreach ( split('/', $path) )
+                                {
+                                    if ( $_ eq '..' )
+                                    {
+                                        $level--;
+                                        $minLevel = $level if ($level < $minLevel);
+                                    }
+                                    else
+                                    {
+                                        $level++;
+                                    }
+                                }
+#print "Min: $minLevel, $level, ($depth + $minLevel)\n";
+                                if ( $depth + $minLevel <= 0)
+                                {
+                                    $badIncludeFile++;
+                                    Warning ("Included path escapes package:",
+                                             "Line: " . $_,
+                                             "File: " . "$myProjectDir/include.txt",
+                                            );
+                                    last;
+                                }
+                            }
+                        }
+                        close $if;
+                    }
+                }
+                $line = '';
+            }
+            close $fh;
+        }
+        else
+        {
+            Warning ("MakeProject$eSuf - Cannot open makefile: $file");
+            $retval = 1;
+        }
+    }
+    #
+    #   Used
+    #   May be improved latter
+    #
+    if ( $usesMakeProject && $badIncludeFile)
+    {
+        Warning ("MakeProject$eSuf - Problem detected");
+        $retval = 1;
+    }
+    #
+    #   Until we have more faith in the detection algorithm
+    #
+    if ( $usesMakeProject )
+    {
+        Warning ("MakeProject$eSuf - Makeproject used. Must check manually");
+        $retval = 1;
+    }
+    return $retval;
+}
+#-------------------------------------------------------------------------------
 # Function        : detectProjectBaseUsage
+#
 # Description     : Detect and report usage of the SetProjectBase directive
+#
 # Inputs          : $data               - Ref to a hash of bits
                 if ( m~^SetProjectBase~ )
+                {
                     $definesProjectBase++;
                     $data->{DefinesProjectBase}++;
-                    Warning ("Package uses SetProjectBase:",
+                    Warning ("Package initialises SetProjectBase:",
                              "Line: " . $_,
                              "Root: " . "$data->{ViewRoot}",
                              "File: " . "$data->{ViewRoot}/$file",
                             );
                         pop @bpaths;
+                    }
                     unless (defined $blevel)
+                    {
                         Warning ("SetProjectBase$eSuf calculation failed - can't find build.pl");
-                        $retval = 1;
+#                        $retval = 1;
+                         $definitionError++;
+                    }
                     else
+                    {
+                        #
                         #   Determine the depth of the view root
 #-------------------------------------------------------------------------------
 # 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
+#
+        }
+    }
     return $me;
+}
+#-------------------------------------------------------------------------------
+# Function        : saneLabel
+#
+# Description     : Generate a sane version label
+#                   Handle suplicates (due to character squishing)
+#                   Cache results for repeatability
+#
+# Inputs          : $entry          - Version info
+#                   $pkgname        - Alternate pkgname (branching)
+#
+# Returns         : Sane string
+#
 sub saneLabel
+{
     my ($entry, $pkgname) = @_;
     my $me;
     $me = $versions{$entry}{vname};
     $pkgname = $versions{$entry}{name} unless ( defined $pkgname );
+    #
+    #   If we have calculated it, then reuse it.
+    #
+    if ( exists $versions{$entry}{saneLabel}{$pkgname} )
+    {
+        return $versions{$entry}{saneLabel}{$pkgname};
+    }
     Error ("Package does have a version string: pvid: $entry")
         unless ( defined $me );
+    #
     #   Convert Wip format (xxxx) into a string that can be used for a label
     $me = $pkgname . '_' . $me;
     $me =~ tr~ ~-~s;
     $me =~ tr~-~-~s;
     $me =~ tr~_~_~s;
+    #
+    #   Due to some sillyness ( package version starting with _ )
+    #   we may get duplicates. Detect and allocate different numbers
+    #
+    if ( exists $saneLabels{$me} )
+    {
+        $saneLabels{$me}++;
+        $me = $me . '.' . $saneLabels{$me};
+        Message ("Duplicate SaneLabel resolved as: $me");
+    }
+    else
+    {
+        $saneLabels{$me} = 0;
+    }
+    #
+    #   Cache value
+    #
+    $versions{$entry}{saneLabel}{$pkgname} = $me;
     return $me;
+}
 sub saneString
+{
     connectRM(\$RM_DB) unless ( $RM_DB );
+    #
     #   Extract data from Release Manager
+    #
+    my $m_sqlstr = "SELECT " .
+                       "pkg.PKG_NAME, " .                                       # row[0]
+                       "pv.PKG_VERSION, " .                                     # row[1]
+                       "pkg.PKG_ID, " .                                         # row[2]
+                       "pv.PV_ID, " .                                           # row[3]
+                       "pv.LAST_PV_ID, " .                                      # row[4]
+                       "pv.MODIFIED_STAMP, " .                                  # row[5]
-    my $m_sqlstr = "SELECT pkg.PKG_NAME, pv.PKG_VERSION, pkg.PKG_ID, pv.PV_ID, pv.LAST_PV_ID, pv.MODIFIED_STAMP, release_manager.PK_RMAPI.return_vcs_tag(pv.PV_ID), amu.USER_NAME, pv.COMMENTS, pv.DLOCKED, pv.CREATOR_ID ".
+                       "release_manager.PK_RMAPI.return_vcs_tag(pv.PV_ID), " .  # row[6]
-                   " FROM RELEASE_MANAGER.PACKAGES pkg, RELEASE_MANAGER.PACKAGE_VERSIONS pv, ACCESS_MANAGER.USERS amu" .
+                       "amu.USER_NAME, " .                                      # row[7]
+                       "pv.COMMENTS, " .                                        # row[8]
+                       "pv.DLOCKED, " .                                         # row[9]
+                       "pv.CREATOR_ID, ".                                       # row[10]
-                   " WHERE pv.PKG_ID = \'$pkg_id\' AND pkg.PKG_ID = pv.PKG_ID AND amu.USER_ID (+) = pv.CREATOR_ID";
+                       "pv.BUILD_TYPE ".                                        # row[11]
+                   " FROM " .
+                        "RELEASE_MANAGER.PACKAGES pkg, " .
+                        "RELEASE_MANAGER.PACKAGE_VERSIONS pv, " .
+                        "ACCESS_MANAGER.USERS amu" .
+                   " WHERE " .
+                        "pv.PKG_ID = \'$pkg_id\' " .
+                        "AND pkg.PKG_ID = pv.PKG_ID " .
+                        "AND amu.USER_ID (+) = pv.CREATOR_ID";
     my $sth = $RM_DB->prepare($m_sqlstr);
     if ( defined($sth) )
+    {
         if ( $sth->execute( ) )
+        {
                     my $vcstag =  $row[6] || 'Unknown';
                     my $created_id =  $row[7] || ($row[10] ? "Userid_$row[10]" :'Unknown');
                     my $comment =  $row[8] || '';
                     my $locked =  $row[9] || 'N';
+                    my $manual = $row[11] || 'M';
+                    #
                     #   Some developers have a 'special' package version
                     #   We really need to ignore them
+                    #
                     $versions{$pv_id}{comment} = $comment;
                     $versions{$pv_id}{locked} = $locked;
                     $versions{$pv_id}{TimeStamp} = str2time( $created );
                     $versions{$pv_id}{Age} = ($now - $versions{$pv_id}{TimeStamp}) / (60 * 60 * 24);
                     $versions{$pv_id}{TooOld} = 1 if ( $opt_age && $opt_age <= $versions{$pv_id}{Age} );
+                    $versions{$pv_id}{BuildType} = $manual;
                     examineVcsTag($pv_id);
+                    #
                     #   Process version number
+                    #
                     my ($suffix, $version, $isaR, $isaWip, $buildVersion ) = massageVersion($pkg_ver, $pkg_name);
                     $versions{$pv_id}{version} = $version;
                     $versions{$pv_id}{buildVersion} = $buildVersion;
-                    $versions{$pv_id}{isaRipple} = 1 if ( $isaR );
                     $versions{$pv_id}{isaWip} = 1 if ( $isaWip );
+                    #
+                    #   New methof for detecting a ripple
+                    #       Don't look at the version number
+                    #       Use RM data
+                    #       Inlude the comment - there are some cases where the comment
+                    #       appears to have been user modified.
+                    #
+#                    $versions{$pv_id}{isaRipple} = 1 if ( $isaR );
+#                    $versions{$pv_id}{isaRipple} = 1 if ( uc($manual) eq 'Y' );
+                    $versions{$pv_id}{isaRipple} = ( $comment =~ m~^Rippled Build~i && ( uc($manual) eq 'Y' ));
+                    #
                     #   Process suffix
+                    #
                     $suffix = 'Unknown' unless ( $suffix );
                     $suffix = lc ($suffix);
                     $versions{$pv_id}{suffix} = $suffix;
+{
     my ($tag) = @_;
     $tag =~ tr~\\/~/~;
     if ( $tag =~ m~^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~CC::\s+~CC::~;
+        $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;
         $tag =~ s~/MASS_Dev/Bus/web~/MASS_Dev_Bus/web~i;
             push @text, '|';
             push @text, 'Subversion';
             push @text, 'Trunk used' if exists $svnData{branches}{trunk} ;
             push @text, 'Labels: ' . scalar keys %{$svnData{tags}} ;
             push @text, 'Branches: ' . scalar keys %{$svnData{branches}} ;
+            push @text, 'Relabled Packages : ' . $packageReLabelCount;
+        }
         push @text, '';
         my $text = join '\l', @text;
         $text =~ s~\|\\l~|~g;
         push @text, '|{N: Not Locked';
         push @text, 'b: Bad Singleton';
         push @text, 'B: Bad VCS Tag';
         push @text, 'D: DeadWood';
         push @text, 'E: Essential Release Version';
+        push @text, 'F: Package directories labled';
         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 .= 'F' if ($versions{$entry}{data}{DirsLabled});
 #        $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}}  ) {
+        foreach my $rtag_id ( keys %{$versions{$entry}{Releases}}  ) {
+            next unless ( exists $ukHopsReleases{$rtag_id} );
-#            push @label, "Release: $versions{$entry}{Releases}{$rtag_id}{rname}";
+            push @label, "Release: $versions{$entry}{Releases}{$rtag_id}{rname}";
-#        }
+        }
         return join ('\n', @label );
+    }
     sub genAttributes
            $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} );
+        }
         #print "ESSENTIAL: $versions{$_}{name} $versions{$_}{vname}\n";
+    }
+    #
     #   Free memory
+    #
     %ScmReleases = ();
     %ScmPackages = ();
     -name=aaa          - Alternate output package name. Test Only
     -[no]log           - Write output to log file. Def: -nolog
     -[no]postimage     - Create image after transger: Def: -post
     -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
 =head1 OPTIONS
 =over 8

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage2.pl – Rev 2026 → 2429