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

 my $opt_help = 0;
 my $opt_manual = 0;
 my $opt_verbose = 0;
 my $opt_repo_base = 'AUPERASVN01/';
 my $opt_repo = '';
+my $opt_repoSubdir = '';
 my $opt_flat;
 my $opt_test;
-my $opt_reuse;
+my $opt_reuse = 0;
 my $opt_age;
 my $opt_dump = 0;
 my $opt_images = 0;
 my $opt_retaincount = 2;
 my $opt_pruneModeString;
 my $opt_preserveProjectBase;
 my $opt_ignoreProjectBaseErrors;
 my $opt_ignoreMakeProjectErrors;
 my $opt_forceProjectBase;
 my @opt_limitProjectBase;
+my @opt_mergePaths;
 my $opt_ignoreBadPaths;
 my $opt_delete;
 my $opt_recentAge = 14;             # Days
 my $opt_relabel = 0;
 my $opt_protected;
 my $opt_useSvn = 1;
 my $opt_testRmDatabase;
 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_PatchIsaRipple;
 ################################################################################
 #   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,processRipples,No-PatchIsaRipple,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',
+    'dams_gen1'                      => 'flatTime,LimitProjectBase=/LMOS/apps/dams'.
+                                       ',mergePaths=+:tp5600:eb5600:pcp5700:core:doc'.
+                                       ',processRipples',
+    'linux_day0fs_gen1'            => 'flatTime,LimitProjectBase=/LMOS/linux/filesystems/day0-fs'.
+                                       ',mergePaths=+:tp5600:eb5600:pcp5700:etx86:common'.
+                                       ',processRipples',
+    'linux_kernel_gen1'               => 'flatTime,mergePaths=,processRipples,LimitProjectBase=/LMOS/linux/kernel',
+    'rt3070'                          => 'flatVersion',
+    'TRACS'                           => 'IgnoreMakeProject,DeleteFiles=*.plg',   # not tested
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
 #    'daf_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
 #    'mos_fonts'             => 'IgnoreProjectBase,',
 #    'sntp'                  => 'IgnoreProjectBase,',
 #    'time_it'               => 'IgnoreProjectBase,',
 );
+my %mergePathExtended = (
+    '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',
+            },
+);
+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
 my $globalError;
 my @unknownProjects;
 my %knownProjects;
 my $badSingletonCount = 0;
 my @flatOrder;
+my $flatMode = 0;
 my $pruneMode;
 my $pruneModeString;
 my $threadId = 0;
 my $threadCount;
 my %tipVersions;
 our $GBE_RM_URL;
 my $UNIX = $ENV{'GBE_UNIX'};
 my $result = GetOptions (
-                "help+"             => \$opt_help,          # flag, multiple use allowed
+                'help+'             => \$opt_help,          # flag, multiple use allowed
-                "manual:3"          => \$opt_help,
+                'manual:3'          => \$opt_help,
-                "verbose:+"         => \$opt_verbose,       # Versose
+                'verbose:+'         => \$opt_verbose,       # Versose
-                "repository:s"      => \$opt_repo,          # Name of repository
+                'repository:s'      => \$opt_repo,          # Name of repository
                 'rbase:s'           => \$opt_repo_base,     # Base of the repo
-                "flat!"             => \$opt_flat,          # Flat structure
+                'flat!'             => \$opt_flat,          # Flat structure
-                "test!"             => \$opt_test,          # Test operations
+                'test!'             => \$opt_test,          # Test operations
-                "reuse!"            => \$opt_reuse,         # Reuse ClearCase views
+                'reuse:1'           => \$opt_reuse,         # Reuse ClearCase views 0:None, 1=Retain, 2=Use+Delete
-                "age:i"             => \$opt_age,           # Only recent versions
+                'age:i'             => \$opt_age,           # Only recent versions
-                "dump:1"            => \$opt_dump,          # Dump Data
+                'dump:1'            => \$opt_dump,          # Dump Data
-                "images:1"          => \$opt_images,        # Create DOT images
+                'images:1'          => \$opt_images,        # Create DOT images
-                "retain:i"          => \$opt_retaincount,   # Retain N packages
+                'retain:i'          => \$opt_retaincount,   # Retain N packages
-                "pruneMode:s"       => \$opt_pruneModeString,
+                'pruneMode:s'       => \$opt_pruneModeString,
-                "listtags:i"        => \$opt_listTags,
+                'listtags:i'        => \$opt_listTags,
-                "name:s"            => \$opt_name,          # Alternate output
+                'name:s'            => \$opt_name,          # Alternate output
-                "tip:s"             => \@opt_tip,           # Force tip version(s)
+                'tip:s'             => \@opt_tip,           # Force tip version(s)
-                "log!"              => \$opt_log,
+                'log!'              => \$opt_log,
-                "delete!"           => \$opt_delete,
+                'delete!'           => \$opt_delete,
-                "postimage!"        => \$opt_postimage,
+                '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,
                 );
+#
 #   Process help and manual options
+#
 #   Init the pruning mode
+#
 setPruneMode( $opt_pruneModeString || 'ripple');
+#
+#   Detect Merge Package Request
+#   These use pre-configured bits
+#
+if ( $opt_mergePackages )
+{
+    if ( $opt_mergePackages eq 'LinuxDrivers' )
+    {
+        $opt_name = $opt_mergePackages;
+        @ARGV = qw (linux_drivers_eb5600
+                    linux_drivers_viper
+                    linux_drivers_cobra
+                    linux_drivers_etx86
+                    linux_drivers_tp5600);
+#                    linux_drivers_bcp4600
+    } elsif ( $opt_mergePackages eq 'flashCopier' ) {
+        $opt_name = $opt_mergePackages;
+        @ARGV = qw (
+                flash_copier_eb5600
+                flash_copier_pcp5700
+                flash_copier_tp5600
+                );
+    } elsif ( $opt_mergePackages eq 'u-boot' ) {
+        $opt_name = $opt_mergePackages;
+        @ARGV = qw (
+                u-boot
+                u-boot-hk
+                );
+    } elsif ( $opt_mergePackages eq 'dams_gen1' ) {
+        $opt_name = $opt_mergePackages;
+        @ARGV = qw (
+                    dams_eb5600
+                    dams_pcp5700
+                    dams_tp5600
+                );
+    } elsif ( $opt_mergePackages eq 'linux_day0fs_gen1' ) {
+        $opt_name = $opt_mergePackages;
+        @ARGV = qw (
+                    linux_day0fs_eb5600
+                    linux_day0fs_tp5600
+                    linux_day0fs_etx86
+                );
+    } elsif ( $opt_mergePackages eq 'linux_kernel_gen1' ) {
+        $opt_name = $opt_mergePackages;
+        @ARGV = qw (
+                    linux_kernel_etx86
+                    linux_kernel_tp5600
+                    linux_kernel_eb5600
+                    linux_kernel_bcp4600
+                );
+    } else
+    {
+        Error ("Unknown Merge Package Name: $opt_mergePackages");
+    }
+}
 #   Get data for all packages
+#
 foreach my $packageName ( @ARGV )
+{
     next unless ( $packageName );
 if ( $opt_flat )
+{
 #    @flatOrder = sort {$versions{$a}{version} cmp $versions{$b}{version}} keys(%versions);
 #    @flatOrder = sort {$versions{$a}{created} cmp $versions{$b}{created}} keys(%versions);
+    if ( $flatMode == 1 ) {
+        Message ("Flat import. Sorted by TimeStamp");
+        @flatOrder = sort {$versions{$a}{TimeStamp} cmp $versions{$b}{TimeStamp}} keys(%versions);
+    } elsif ( $flatMode == 2 ) {
+        Message ("Flat import. Sorted by Version");
+        # Only iff all the bits are numeric
+        sub sortCotsVersion
+        {
+            my @va = split '\.', $versions{$a}{vname};
+            my @vb = split '\.', $versions{$b}{vname};
+            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];
+                }
+                else
+                {
+                    $rv = $va[$ii] cmp $vb[$ii];
+                }
+                return $rv if ( $rv );
+            }
+            return $rv;
+        }
+        @flatOrder = sort sortCotsVersion keys(%versions);
+#        @flatOrder = sort {$versions{$a}{vname} cmp $versions{$b}{vname}} keys(%versions);
+    } else {
-    @flatOrder = sort {$a <=> $b} keys(%versions);
+        @flatOrder = sort {$a <=> $b} keys(%versions);
+    }
     my $tip = $flatOrder[-1];
     $versions{$tip}{Tip} = 1 if $tip;
+}
+#
     #   Going to do serious work
     #   Need to ensure we have more arguments
+    #
     if ( $opt_protected )
+    {
-        Warning("Protected Package not transferred: $packageNames[0] - $opt_protected",
+        Warning("Protected Package not transferred: $packageNames - $opt_protected",
                 "See cc2svn_protected.txt for details");
         exit 0;
+    }
     if ( $noTransfer )
+    {
-        Warning("Protected Package not transferred: $packageNames[0]",
+        Warning("Protected Package not transferred: $packageNames",
                 "Configured within this program");
         exit 0;
+    }
+    #
         $opt_flat = 1;
         setPruneMode('none') unless (defined $opt_pruneModeString);
+    }
-    if ( $packageNames[0] =~ m'^br_applet_' )
+    if ( $packageNames =~ m'^br_applet_' )
+    {
       $opt_flat = 1 unless defined $opt_flat;
+    }
-    if ( exists $specialPackages{$packageNames[0]} )
+    if ( exists $specialPackages{$packageNames} )
+    {
-        my $data = ',' . $specialPackages{$packageNames[0]} . ',';
+        my $data = ',' . $specialPackages{$packageNames} . ',';
         if ( index( $data, ',all' ) >= 0) {
             setPruneMode('none') unless (defined $opt_pruneModeString);
+        }
-        if ( index( $data, 'protected,' ) >= 0) {
+        if ( index( $data, ',protected,' ) >= 0) {
             $noTransfer = 1;
+        }
-        if ( index( $data, 'flat,' ) >= 0) {
+        if ( index( $data, ',flat,' ) >= 0) {
             $opt_flat = 1;
+        }
+        if ( index( $data, ',flatTime,' ) >= 0) {
+            Message ("Flatten import tree. Sort by Time");
+            $opt_flat = 1;
+            $flatMode = 1;          # By Time
+            $opt_processRipples = 0;
+        }
+        if ( index( $data, ',flatVersion,' ) >= 0) {
+            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;
+        }
-        if ( index( $data, 'SetProjectBase,' ) >= 0) {
+        if ( index( $data, ',SetProjectBase,' ) >= 0) {
             $opt_preserveProjectBase = 1;
             $opt_ignoreProjectBaseErrors = 1;
             Message ("Preserving ProjectBase");
+        }
-        if ( index( $data, 'AllowMultiPath,' ) >= 0) {
+        if ( index( $data, ',AllowMultiPath,' ) >= 0) {
             $opt_AllowMuliplePaths = 1;
             Message ("Allowing Multiple Paths");
+        }
+        if ( index( $data, ',PatchIsaRipple,' ) >= 0) {
+            $opt_PatchIsaRipple = 1;
+            Message ("Treating Patch as a ripple");
+        }
         if ( $data =~ m~,ForceProjectBase=(.*?),~ ) {
             $opt_forceProjectBase = $1;
             $opt_AllowMuliplePaths = 1;
             Message ("Force Project Base: $opt_forceProjectBase");
+        }
-        if ( $data =~ m~,LimitProjectBase=(.*),~ ) {
+        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) {
+        if ( index( $data, ',IgnoreProjectBase,' ) >= 0) {
             $opt_ignoreProjectBaseErrors = 1;
             Message ("Ignore ProjectBase Errors");
+        }
-        if ( index( $data, 'IgnoreMakeProject,' ) >= 0) {
+        if ( index( $data, ',IgnoreMakeProject,' ) >= 0) {
             $opt_ignoreMakeProjectErrors = 1;
             Message ("Ignore MakeProject Usage");
+        }
-        if ( index( $data, 'IgnoreBadPath,' ) >= 0) {
+        if ( index( $data, ',IgnoreBadPath,' ) >= 0) {
             $opt_ignoreBadPaths = 1;
             Message ("Ignore Bad Paths in makefile Usage");
+        }
-        if ( index( $data, 'utf8,' ) >= 0) {
+        if ( index( $data, ',utf8,' ) >= 0) {
             $mustConvertFileNames = 1;
             Message ("Convert filenames to UTF8");
+        }
+    }
+    {
         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
+#
+        {
             newProject();
             $createBranch = 1;
             $createSuffix = 1 if $versions{$entry}{newSuffix};
+        }
         newPackageVersion( $entry );
 no warnings "recursion";
         processBranch (@{$versions{$entry}{next}});
+    }
+}
     Message ("------------------------------------------------------------------" );
     Message ("Package $processCount of $processTotal");
     Message ("New package-version: " . GetVname($entry) . " Tag: " . $versions{$entry}{vcsTag} );
+#    if ( $versions{$entry}{rippleList} )
+#    {
+#        Message ("Version has ripples");
+#        foreach my $rentry ( @{$versions{$entry}{rippleList}} )
+#        {
+#            Message ("  -- ". GetVname($rentry));
+#        }
+#    }
+    #
     #   Detect user abort
+    #
     if ( -f $cwd . '/stopfile' )
+    {
     #   Delete the created view
     #   Its just a directory, so delete it
+    #
     if ( $data{ViewRoot} && -d $data{ViewRoot})
+    {
-        if ( !$opt_reuse || ($rv && ($rv != 4 && $rv != 12 && $rv != 5 )) )
+        if ( $opt_reuse == 0 || $opt_reuse == 2 || ($rv && ($rv != 4 && $rv != 12 && $rv != 5 )) )
+        {
             Message ("Delete View: $data{ViewRoot}");
             RmDirTree ($data{ViewRoot} );
+        }
         else
     else
+    {
         Message ("No view to delete");
+    }
+    #
-    #   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.
+    #   Create pretty pictures
+    #
-if(1) {
+    unless ( $rv )
-    foreach my $rentry ( @{$versions{$entry}{rippleList}} )
+    {
-        next unless( exists $versions{$rentry} );
+        getSvnData();
+        createImages();
+    }
+    if($opt_processRipples)
+    {
+        #
+        #   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 ($versions{$rentry}{Processed})
+        foreach my $rentry ( @{$versions{$entry}{rippleList}} )
+        {
+            next unless( exists $versions{$rentry} );
+            if ($versions{$rentry}{Processed})
+            {
-            Warning ("Ripple Processed before main entry");
+                Warning ("Ripple Processed before main entry");
-            $versions{$rentry}{rippleProcessed} = 1;
+                $versions{$rentry}{rippleProcessed} = 1;
-        }
+            }
-        Message ("Proccessing associated Ripple: " . GetVname($rentry));
+            Message ("Proccessing associated Ripple: " . GetVname($rentry));
-        newPackageVersion($rentry);
+            newPackageVersion($rentry);
+        }
+    }
-}
+}
 #-------------------------------------------------------------------------------
 # Function        : newPackageVersionBody
+#
         $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
+    }
     push @args, "-branch=$currentBranchName" if ( defined $currentBranchName );
     my $datafile = "importdata.$import_label.properties";
+    my @mergeArg;
+    push (@mergeArg, "-mergePaths", join(',', @opt_mergePaths) ) if ( @opt_mergePaths );
+    if ( exists $mergePathExtended{$packageNames}  )
+    {
+        my $eentry = $mergePathExtended{$packageNames};
+        if ( exists $eentry->{$import_label} )
+        {
+            @opt_mergePaths = split(':', $eentry->{$import_label});
+            Message("New MergePath Info: @opt_mergePaths");
+            #
+            #   Args take effect next version
+            #   In this version have no merging - reset the image
+            #
+            @mergeArg = ();
+        }
+    }
     $rv = JatsToolPrint ( 'jats_svn', 'import', '-reuse' ,
                     "-package=$svnRepo/$packageNames",
                     "-dir=$data->{ViewPath}",
                     "-label=$import_label",
                     "-datafile=$datafile",
                     @args,
+                    @mergeArg,
                      );
     if ( $rv )
+    {
         $data->{errStr} = 'Failed to import to SVN';
+{
     my ($data, $cc_path, $cc_label) = @_;
     my $tryCount = 0;
     my $rv = 99;
-    $data->{ViewRoot} = $opt_name ? $opt_name : "$cc_label";
+    $data->{ViewRoot} = ( defined $opt_name && ! defined $opt_mergePackages )? $opt_name : "$cc_label";
     $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
     if ( $opt_preserveProjectBase && !$opt_forceProjectBase )
+    {
         my $cc_vob = $cc_path;
         return 0;
+    }
     while ( $rv == 99 ) {
         my @args;
-        push (@args, '-view', $opt_name ) if ( defined $opt_name );
+        push (@args, '-view', $opt_name ) if ( defined $opt_name && ! defined $opt_mergePackages );
         $rv = JatsToolPrint ( 'jats_ccrelease', '-extractfiles', '-root=.' , '-noprefix',
                     "-label=$cc_label" ,
                     "-path=$cc_path",
                     @args
                     );
+                    #
                     #   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) ;
                     $versions{$pv_id}{version} = $version;
                     $versions{$pv_id}{buildVersion} = $buildVersion;
                     $versions{$pv_id}{isaWip} = 1 if ( $isaWip );
+                    #
-                    #   New methof for detecting a ripple
+                    #   New method 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.
+                    #
+#
 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});
+    #
     #   Free the memory
+    #
     %ScmRepoMap = ();
+    #
     Warning ("No VOB Mapping found")
         unless ($opt_vobMap);
     Error("No repository specified. ie -repo=DevTools or -repo=COTS")
         unless ( $opt_repo || $opt_vobMap );
-    my $r1 = ($opt_repo || '') . '/' . ($opt_vobMap || '');
+    my $r1 = ($opt_repo || '') . '/' . ($opt_vobMap || '') . '/' . ($opt_repoSubdir || '') ;
+    $r1 =~ s~//~/~g;
     $r1 =~ s~^/~~;
     $r1 =~ s~/$~~;
     $svnRepo = $opt_repo_base . $r1;
-    Verbose( "Repo URL: $svnRepo");
+    Message( "Repo URL: $svnRepo");
+}
 #-------------------------------------------------------------------------------
 # Function        : getEssenialPackageVersions

Subversion Repositories DevTools

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