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

 use JatsProperties;
 use JatsEnv;
 use ConfigurationFile;
 use JatsSvn qw(:All);
 use JatsLocateFiles;
+use JatsBuildFiles;
 use Encode;
 #use Data::Dumper;
 use Fcntl ':flock'; # import LOCK_* constants
 my $opt_workDir = '/work';
 my $opt_vobMap;
 my $opt_preserveProjectBase;
 my $opt_ignoreProjectBaseErrors;
 my $opt_ignoreMakeProjectErrors;
+my $opt_ignoreBuildFileClashes;
 my $opt_forceProjectBase;
 my @opt_limitProjectBase;
 my @opt_mergePaths;
 my $opt_ignoreBadPaths;
 my $opt_delete;
     'rt3070'                          => 'flatVersion',
     'TRACS'                           => 'IgnoreMakeProject,DeleteFiles=*.plg',   # not tested
+    'qtobeapp'                        => 'Trunk=.uk',
+    'br_applets'                      => 'flatTime,LimitProjectBase=/ProjectCD/seattle'.
+                                       ',mergePaths=++:build/**:Sales/**:FarePayment/**:KCM/**:unit_test/**:VP/**:WSF/**'.
+                                       ',processRipples',
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
 #    'daf_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
         $opt_name = $opt_mergePackages;
         @ARGV = qw (
                     linux_kernel_viper
                     linux_kernel_cobra
                 );
+    } elsif ( $opt_mergePackages eq 'seattleBr' ) {
+        $opt_name = 'br_applets';
+        @ARGV = qw (
+                    br_applet_cst
+                    br_applet_gak_wsf
+                    br_applet_gak_wsf_pos
+                    br_applet_obftp_ct
+                    br_applet_obftp_et
+                    br_applet_obftp_kcm
+                    br_applet_obftp_kt
+                    br_applet_obftp_pt
+                    br_applet_obftp_st
+                    br_applet_pftp_ct_brt
+                    br_applet_pftp_ct_vanpool
+                    br_applet_pftp_kcm_dart
+                    br_applet_pftp_kcm_rr
+                    br_applet_pftp_kcm_vanpool
+                    br_applet_pftp_kt
+                    br_applet_pftp_pt_vanpool
+                    br_applet_pftp_st
+                    br_applet_pftp_st_llr
+                    br_applet_pftp_wsf
+                    br_applet_saftp_ct_brt
+                    br_applet_saftp_kcm_rr
+                    br_applet_saftp_st
+                    br_applet_saftp_st_llr
+                    br_applet_tru
+                    br_applet_tvm
+                    unit_test_br_cst
+                    unit_test_br_gak
+                    unit_test_br_kcm_ct_saftp
+                    unit_test_br_obftp
+                    unit_test_br_st_saftp
+                    unit_test_br_vanpool
+                    SalesConfiguration
+                );
     } else
+    {
         Error ("Unknown Merge Package Name: $opt_mergePackages");
+    }
+}
     $versions{$tip}{Tip} = 1 if $tip;
+}
+#
 #   Generate dumps and images
+#       Always create image first - we are doing it after every transfer
+#
-if ( $opt_images )
+if ( $opt_images || 1 )
+{
     createImages();
+}
 if ( $opt_dump )
         if ( index( $data, ',IgnoreMakeProject,' ) >= 0) {
             $opt_ignoreMakeProjectErrors = 1;
             Message ("Ignore MakeProject Usage");
+        }
+        if ( index( $data, ',IgnoreBuildFileClash,' ) >= 0) {
+            $opt_ignoreBuildFileClashes = 1;
+            Message ("Ignoring Build File Clashes");
+        }
         if ( index( $data, ',IgnoreBadPath,' ) >= 0) {
             $opt_ignoreBadPaths = 1;
             Message ("Ignore Bad Paths in makefile Usage");
+        }
         if ( index( $data, ',utf8,' ) >= 0) {
             $mustConvertFileNames = 1;
             Message ("Convert filenames to UTF8");
+        }
+        if ( $data =~ m~,Trunk=(.*?),~ ) {
+            my $tt = $1;
+            $Projects{$tt}{Trunk} = 1;
+            Message ("Force project to trunk: $tt");
+        }
+    }
     Message("Package Type: $packageType, $pruneModeString");
+}
+    }
     else
+    {
+        #
         #   Call worker function
-        #   It will exist on any error so that it can be logged
+        #   It will exit on any error so that it can be logged
+        #
         $rv = newPackageVersionBody( \%data, @_ );
         $globalError = 1 if ( $rv >= 10 );
+    }
+    {
+        #
         #   Create CC view
         #   Import into Subversion View
+        #
-        $rv = extractFilesFromClearCase( $data, $cc_path, $cc_label );
+        $rv = extractFilesFromClearCase( $data, $cc_path, $cc_label, $entry );
         return $rv if ( $rv );
+    }
+    #
     #   Delete specified files from the source tree
+    #
     if ( @opt_deleteFiles )
+    {
         $data->{errStr} = 'Failed to import to SVN';
         return 12;
+    }
+    #
+    #   Some packages generate multiple packages
+    #   Some of these are the result of merging several packages
+    #   so we can only do this detection After the import
+    #
+    #   Detect potential build problems where multiple buildfiles
+    #   exists and cannot be resolved by our build system
+    #
+    #   This is not a show stopper (yet)
+    #
+    if (detectBuildFileClashes($data, 'SvnImportDir'))
+    {
+        unless ( $opt_ignoreBuildFileClashes )
+        {
+            $data->{BuildFileClash}++;
+            Message ("Build File Clash detected");
+        }
+    }
     $versions{$entry}{TagCreated} = 1;
     $firstVersionCreated = $entry unless ( $firstVersionCreated );
+    #
     #   Read in the Rm Reference
     my $inernalErrorCount = 0;
     my $notProcessedCount = 0;
     my $badPathCount = 0;
     my $badProjectBaseCount = 0;
     my $badMakeProjectCount = 0;
+    my $buildFileClashes = 0;
+    #
     #   Display versions that did get captured
+    #
     foreach my $entry ( @processOrder )
+        {
             $processedCount++;
             $badPathCount++ if ($versions{$entry}{data}{BadPath} );
             $badProjectBaseCount++ if ($versions{$entry}{data}{BadProjectBase} );
             $badMakeProjectCount++ if ($versions{$entry}{data}{BadMakeProject} );
+            $buildFileClashes++ if ($versions{$entry}{data}{BuildFileClash} );
             next;
+        }
         my $reason = $versions{$entry}{data}{errStr} || '';
         my $tag = $versions{$entry}{vcsTag}|| 'No Tag';
     Warning ("Multiple source paths", @multiplePaths ) if ( scalar @multiplePaths > 1 );
     Message ("Packages Relabled: $packageReLabelCount") if ( $packageReLabelCount );
     Warning ("Packages with Bad Paths: $badPathCount") if ( $badPathCount );
     Warning ("Packages with Bad ProjectBase: $badProjectBaseCount") if ( $badProjectBaseCount );
     Warning ("Packages with MakeProjects: $badMakeProjectCount") if ( $badMakeProjectCount );
+    Warning ("Build File Clashes Found: $buildFileClashes") if ( $buildFileClashes );
     Warning ("Global Error Detected") if ( $globalError );
     Message ("---- All Done -----");
+}
 #-------------------------------------------------------------------------------
 #                   May take a while as we handle nasty errors
+#
 # Inputs          : $data           - Hash of good stuff from newPackageVersionBody
 #                   $cc_path
 #                   $cc_label
+#                   $entry          - original PV entry
+#
 # Returns         : exit code
 #                   Sets up
 #                       $data->{errStr}
 #                       $data->{errCode}
 #                   As per newPackageVersionBody
+#
 sub extractFilesFromClearCase
+{
-    my ($data, $cc_path, $cc_label) = @_;
+    my ($data, $cc_path, $cc_label, $entry) = @_;
     my $tryCount = 0;
     my $rv = 99;
     $data->{ViewRoot} = ( defined $opt_name && ! defined $opt_mergePackages )? $opt_name : "$cc_label";
     $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
         $data->{ViewPath} =  $data->{ViewRoot} . '/' . $cc_vob;
         Message ("Preserving Project Base");
+    }
     $data->{ViewPath} =~  tr~/~/~s;
+    #
+    #   Some versions are bad and have been manually marked as bad
+    #
+    if ( $opt_reuse && -f "$data->{ViewRoot}/cc2svn_ignore" )
+    {
+        Message ("View specifically ignored");
+        $data->{errStr} = 'View specifically ignored';
+        $data->{errCode} = '0';
+        return 4;               # Will Retain view
+    }
     if ( $opt_reuse && -d $data->{ViewPath}  )
+    {
         Message ("Reusing view: $cc_label");
+        #
+        #   Br applet kludge - can be removed later
+        #   Add some nice data to each view
+#        open (FH, '>' , $data->{ViewRoot} . '/cc2svn_tag' ) || Error ("Cannot open '$data->{ViewRoot}/cc2svn_tag'");
+#        print FH $versions{$entry}{name},' ',$versions{$entry}{vname},"\n";
+#        close FH;
         return 0;
+    }
     while ( $rv == 99 ) {
         my @args;
     $data->{ViewPath} =  $data->{ViewRoot};
     $data->{ViewPath} =~  tr~/~/~s;
     if ( $opt_reuse && -d $data->{ViewPath}  )
+    {
+        #
+        #   Br applet kludge - can be removed later
+        #   Add some nice data to each view
+#        open (FH, '>' , $data->{ViewRoot} . '/cc2svn_tag' ) || Error ("Cannot open '$data->{ViewRoot}/cc2svn_tag'");
+#        print FH $versions{$entry}{name},' ',$versions{$entry}{vname},"\n";
+#        close FH;
         Message ("Reusing view: $import_label");
         return 0;
+    }
+    #
+    #
     #   Detect defined, but not used
+    #
     if ( $usesProjectBase && ! $definesProjectBase )
+    {
-        Warning ("SetProjectBase - Uses ProjectBase without defining it");
+        Warning ("SetProjectBase - Uses Default ProjectBase");
+    }
     if ( ! $usesProjectBase && $definesProjectBase )
+    {
         Warning ("SetProjectBase - Defines ProjectBase without using it");
+    }
     return $retval;
+}
 #-------------------------------------------------------------------------------
+# Function        : detectBuildFileClashes
+#
+# Description     : Scan a directory for multiple buildfiles and conflicts
+#                   Only works for Jats build.pl files - at the moment
+#
+# Inputs          : $data       - PackageVersion Data
+#                   $rootDir    - Directory to scan
+#
+# Returns         : 0                   - All is well
+#                   !0                  - Multiple build files found
+#
+sub detectBuildFileClashes
+{
+    my ($pvdata, $rootDir) = @_;
+    my %data;
+    my $rv = 0;
+Message ('Detect Build File Clashes');
+    my $bscanner = BuildFileScanner ( $rootDir, 'build.pl' );
+    my $count = $bscanner->locate();
+    #
+    #   None found - OK ( but not good )
+    #
+    return $rv unless ( $count );
+    #
+    #   Process all the build files in the tree
+    #
+    $bscanner->scan();
+    my @buildfiles = $bscanner->getMatchList();
+#   DebugDumpData('$bscanner', $bscanner );
+#   DebugDumpData('@buildfiles', \@buildfiles );
+#   exit 99;
+    foreach my $bf ( @buildfiles )
+    {
+        my $bdir = $bf->{dir};
+        my $bname = $bf->{name};
+        my $bversion = $bf->{version};
+Information ("BuildFiles: $bname, $bversion : $bdir");
+        if ( exists ($data{$bname}{count}) && ($data{$bname}{count} > 1) )
+        {
+            Message ("MultipleBuildFiles for $bname ($bversion)");
+            $rv = 1;
+        }
+        $data{$bname}{count}++;
+        push @{$data{$bname}{versions}}, $bversion;
+    }
+    return $rv;
+}
+#-------------------------------------------------------------------------------
 # 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.
+#
         unless ( $opt_repo || $opt_vobMap );
     my $r1 = ($opt_repo || '') . '/' . ($opt_vobMap || '') . '/' . ($opt_repoSubdir || '') ;
     $r1 = 'Import_test/' . $r1 if ( $opt_useTestRepo );
     $r1 =~ s~//~/~g;
     $r1 =~ s~^/~~;
+    $r1 =~ s~/\.$~~;
     $r1 =~ s~/$~~;
     $svnRepo = $opt_repo_base . $r1;
     Message( "Repo URL: $svnRepo");
+}
     #   Process data
     foreach my $entry ( @svnDataItems )
+    {
         my $name;
         my $isaBranch;
-        my $target = $entry->{target};
+        my $target = $entry->{'target'};
         if ( $target =~ m~/tags/(.*)~ ) {
             $name = $1;
             $svnData{tags}{$name} = 1;
         } elsif ( $target =~ m~/branches/(.*)~ )  {
             $name = $1;
         } else {
             $svnData{nonTag}{$target} = 1;
+        }
         my $fromBranch;
-        if ( $entry->{fromPath} =~ m~/trunk$~  ) {
+        if ( $entry->{'copyfrom-path'} =~ m~/trunk$~  ) {
             $fromBranch = 'trunk';
-        } elsif ( $entry->{fromPath} =~ m~/branches/(.*)~ ) {
+        } elsif ( $entry->{'copyfrom-path'} =~ m~/branches/(.*)~ ) {
             $fromBranch = $1;
+        }
         # largest Rev number on branch
         if ( exists $svnData{max} && exists $svnData{max}{$fromBranch} )
+        {
-            if ( $svnData{max}{$fromBranch}{rev} <  $entry->{fromRev} )
+            if ( $svnData{max}{$fromBranch}{rev} <  $entry->{'copyfrom-rev'} )
+            {
-                $svnData{max}{$fromBranch}{rev} =  $entry->{fromRev};
+                $svnData{max}{$fromBranch}{rev} =  $entry->{'copyfrom-rev'};
                 $svnData{max}{$fromBranch}{name} = $name;
+            }
+        }
         else
+        {
-            $svnData{max}{$fromBranch}{rev} =  $entry->{fromRev};
+            $svnData{max}{$fromBranch}{rev} =  $entry->{'copyfrom-rev'};
             $svnData{max}{$fromBranch}{name} = $name;
+        }
+    }
     foreach my $branch ( keys %{$svnData{max}} )
 # Inputs          :
+#
 # Returns         :
+#
 my $entryData;
+my $entryActive;
 sub  ProcessSvnLog
+{
     my ($self, $line ) = @_;
+    $entryActive = '' unless ( defined $entryActive );
+    return unless ( $line );
-#print "----- $line\n";
+#print "----- ($entryActive) $line\n";
     if ( $line =~ m~^<logentry~ ) {
         $entryData = ();
+        $entryActive = 'A';
-    } elsif ( $line =~ m~^\s+revision="(\d+)"~ ) {
+    } elsif ( ($line =~ s~\s*(.+?)="(.*)">(.*)</path>$~~) && ($entryActive eq 'A') ) {
+        #
+        #   Last entry has two items
+        #       Attribute
-        $entryData->{Rev} = $1;
+        #       Data Item
+        #
-    } elsif ( $line =~ m~^\s+copyfrom-path="(.*)"~ ) {
+        $entryData->{$1} = $2;
-        $entryData->{fromPath} = $1;
+        $entryData->{target} = $3;
-    } elsif ( $line =~ m~^\s+copyfrom-rev="(\d+)"~ ) {
+    } elsif ( ($line =~ m~\s*(.*?)="(.*)"~) && ($entryActive eq 'A') ) {
+        #
-        $entryData->{fromRev} = $1;
+        #   Attribute
+        #
-    } elsif ( $line =~ m~\s+action=.*?>(.*)</path~ ) {
-        $entryData->{target} = $1;
+        $entryData->{$1} = $2;
     } elsif ( $line =~ m~</logentry~ ) {
+        $entryActive = '';
-        if ( exists $entryData->{fromPath} )
+        if ( exists $entryData->{'copyfrom-path'} )
+        {
 #            DebugDumpData("Data", $entryData);
             push @svnDataItems, $entryData;
+        }
+    }
     -delete            - Delete SVN package before test
     -[no]relabel       - Attempt to relabel dirs in packages that don't extract
     -testRmDatabase    - Use test database
     -[no]fromSvn       - Also extract packages from SVN
     -[no]testRepo      - Force use of a test repository.
+    -resume            - Resume aborted import (dangerous)
 =head1 OPTIONS
 =over 8

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage.pl – Rev 3045 → 3347