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

 my $opt_ignoreProjectBaseErrors;
 my $opt_ignoreMakeProjectErrors;
 my $opt_ignoreBuildFileClashes;
 my $opt_forceProjectBase;
 my @opt_limitProjectBase;
+my @opt_selectProjectBase;
 my @opt_mergePaths;
 my $opt_ignoreBadPaths;
 my $opt_delete;
 my $opt_recentAge = 14;             # Days
 my $opt_relabel = 0;
 my $opt_resume;
 my $opt_processRipples = 1;
 my $opt_mergePackages;
 my @opt_deleteFiles;
 my $opt_useTestRepo;
+my $opt_saveCompressed;
+my $opt_skipBuildNameCheck;
+my $opt_deleteLinks;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     'br_applets'                      => 'flatTime,LimitProjectBase=/ProjectCD/seattle'.
                                        ',mergePaths=++:build/**:Sales/**:FarePayment/**:KCM/**:unit_test/**:VP/**:WSF/**'.
                                        ',processRipples',
-    'CDAdministration'                => 'NoRetain,IgnoreMakeProject,XXXXLimitProjectBase=/MASS_Dev_Infra',
+    'CDAdministration'                => 'RetainCompressed,IgnoreMakeProject,SelectProjectBase=MASS_Dev_Infra/DeviceCDManagement/cpp/CDAdministrator:MASS_Dev_Infra/CDAdministrator:MASS_Dev_Infra/CDAdministrator_vt:MASS_Dev_Infra/Cda/java:MASS_Dev_Infra/CDA:MASS_Dev_Infra',
+    'obme'       => ',IgnoreMakeProject,',
+    'apportionment'                    => 'SkipBuildFileCheck',
+    'almgr'                            => 'SkipBuildFileCheck,SelectProjectBase=MASS_Dev_Bus/CBP/al/almgr/cpp:MASS_Dev_Bus/CBP/al/almgr:MASS_Dev_Bus/CBP/al:MASS_Dev_Bus/CBP',
+    'cvm'                              => 'SelectProjectBase=MASS_Dev_Bus/CBP/cvm/cpp:MASS_Dev_Bus/CBP/cvm',
+    'esvrapi'                          => 'SelectProjectBase=MASS_Dev_Bus/CBP/enquiry/esvrapi/cpp:MASS_Dev_Bus/CBP/enquiry/esvrapi',
+    'Validation'                       => 'SelectProjectBase=MASS_Dev_Bus/CBP/validation/validation/cpp:MASS_Dev_Bus/CBP/validation/validation',
+    'txnfilter'                        => 'DeleteLinks,SelectProjectBase=MASS_Dev_Bus/CBP/txnfilter/txnfilter:MASS_Dev_Bus/CBP/txnfilter/cpp:MASS_Dev_Bus/CBP/txnfilter',
+    'card'                       => 'SelectProjectBase=MASS_Dev_Bus/Card/cpp:MASS_Dev_Bus/Card',
+    'cbps'                       => 'SelectProjectBase=MASS_Dev_Bus/CBP/cbps/cpp:MASS_Dev_Bus/CBP/cbps:MASS_Dev_Bus/CBP',
+    'issuercommon'               => 'SelectProjectBase=MASS_Dev_Bus/Issuer/issuerCommon/cpp:MASS_Dev_Bus/Issuer/issuerCommon',
+    'ivp'                        => 'SelectProjectBase=MASS_Dev_Bus/CBP/ivp/ivp/cpp:MASS_Dev_Bus/CBP/ivp/ivp:MASS_Dev_Bus/CBP/ivp:MASS_Dev_Bus/CBP',
+    'daf_transap_mag'            => 'SelectProjectBase=DPG_SWBase/transap/proxy/mag:DPG_SWBase/transap/proxy',
+    'daf_transap_proxyman'       => 'SelectProjectBase=DPG_SWBase/transap/proxymanager',
+    'daf_transap_rkf'            => 'SkipBuildFileCheck',
+    'daf_cd_common'              => 'IgnoreProjectBase',
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
 #    'daf_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
             $opt_AllowMuliplePaths = 1;
             @opt_limitProjectBase = split(':', $1);
             Message ("Limit Project Base: @opt_limitProjectBase");
+        }
+        if ( $data =~ m~,SelectProjectBase=(.*?),~ ) {
+            $opt_AllowMuliplePaths = 1;
+            @opt_selectProjectBase = split(':', $1);
+            Message ("Select Project Base from: @opt_selectProjectBase");
+        }
         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 ( $data =~ m~,DeleteLinks,~ ) {
+            $opt_deleteLinks = 1;
+            Message ("Delete soft links");
+        }
         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, ',IgnoreBuildFileClash,' ) >= 0) {
+        if ( index( $data, ',NoBuildFileCheck,' ) >= 0) {
             $opt_ignoreBuildFileClashes = 1;
             Message ("Ignoring Build File Clashes");
+        }
+        if ( index( $data, ',SkipBuildFileCheck,' ) >= 0) {
+            $opt_skipBuildNameCheck = 1;
+            Message ("Skip Build File Clashes Testing");
+        }
         if ( index( $data, ',IgnoreBadPath,' ) >= 0) {
             $opt_ignoreBadPaths = 1;
             Message ("Ignore Bad Paths in makefile Usage");
+        }
         if ( index( $data, ',NoRetain,' ) >= 0) {
             $opt_reuse = 2;
             Message ("Package Versions not Retained");
+        }
+        if ( index( $data, ',RetainCompressed,' ) >= 0) {
+            $opt_saveCompressed = 1;
+            Message ("Package Versions will be retained as compressed images");
+        }
         if ( $data =~ m~,Trunk=(.*?),~ ) {
             my $tt = $1;
             $Projects{$tt}{Trunk} = 1;
             Message ("Force project to trunk: $tt");
+        }
     #   Delete the created view
     #   Its just a directory, so delete it
+    #
     if ( $data{ViewRoot} && -d $data{ViewRoot})
+    {
+        my $cfile = saneLabel($entry) . '.tgz';
         if ( $opt_reuse == 0 || $opt_reuse == 2 || ($rv && ($rv != 4 && $rv != 12 && $rv != 5 )) )
+        {
             Message ("Delete View: $data{ViewRoot}");
             RmDirTree ($data{ViewRoot} );
+            unlink $cfile;
+        }
         else
+        {
             Message ("Retaining View: $data{ViewRoot}");
+            if ( $opt_saveCompressed )
+            {
+                Message ("Compressing the retained directory");
+                unless ( -f $cfile )
+                {
+                    my $rv = System ('tar', '-czf', $cfile, $data{ViewRoot} );
+                    if ( $rv )
+                    {
+                        Warning("Failed to compress directory");
+                    }
+                }
+                else
+                {
+                    Message ("Reusing compressed file");
+                }
+                RmDirTree ($data{ViewRoot} );
+            }
+        }
+    }
     else
+    {
     my $rv;
     my $vcs_type;
     my $cc_label;
     my $cc_path;
     my $cc_path_original;
+    my $selectDir;
+    #
     #   Init Data
+    #
     $data->{rmRef} = 'ERROR';
+            {
                 $cc_path = $_;
                 last;
+            }
+        }
         if ( $cc_path_original ne $cc_path )
+        {
                 Message ("Package: $versions{$entry}{name}. Forcing CC path to: $cc_path" );
+        }
+    }
         #   Create CC view
         #   Import into Subversion View
+        #
         $rv = extractFilesFromClearCase( $data, $cc_path, $cc_label, $entry );
         return $rv if ( $rv );
+        #
+        #   May need to limit the extracted source tree
+        #   Use the first selected directory that we have
+        #
+        if ( @opt_selectProjectBase )
+        {
+            foreach ( @opt_selectProjectBase )
+            {
+                my $testDir = join('/', $data->{ViewRoot}, $_);
+                if ( -d $testDir )
+                {
+                    $selectDir = $_;
+                    $data->{ViewPath} = $testDir;
+                    last;
+                }
+            }
+            unless ( $selectDir )
+            {
+                Warning ("No directory selected from list");
+            }
+            else
+            {
+                Message ("Selecting Dir: /$selectDir");
+            }
+        }
+    }
+    #
     #   Delete specified files from the source tree
+    #
     if ( @opt_deleteFiles )
             unlink ( join ('/', $data->{ViewRoot}, $rmFile) )|| Warning "Cannot delete: $rmFile";
+        }
+    }
+    #
+    #   Some packages contain softlinks - that break the file scanner
+    #
+    if ( $opt_deleteLinks )
+    {
+        # Not doing anything yet - fixed the JATS find bit
+    }
+    #
     #   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
     #   source path
+    #
-    unless ( $opt_preserveProjectBase || $opt_forceProjectBase || @opt_limitProjectBase)
+    unless ( $opt_preserveProjectBase || $opt_forceProjectBase || @opt_limitProjectBase || $selectDir)
+    {
+        #
         #   Look in ViewPath
         #   If it contains only ONE directory then we can suck it up
+        #
     #   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_skipBuildNameCheck )
+    {
-        unless ( $opt_ignoreBuildFileClashes )
+        if (detectBuildFileClashes($data, 'SvnImportDir'))
+        {
+            unless ( $opt_ignoreBuildFileClashes )
+            {
-            $data->{BuildFileClash}++;
+                $data->{BuildFileClash}++;
-            Message ("Build File Clash detected");
+                Message ("Build File Clash detected");
+            }
+        }
+    }
+    else
+    {
+        Message ('Detect Build File Clashes - skipped');
+    }
     $versions{$entry}{TagCreated} = 1;
     $firstVersionCreated = $entry unless ( $firstVersionCreated );
+    #
         $data->{errStr} = 'View specifically ignored';
         $data->{errCode} = '0';
         return 4;               # Will Retain view
+    }
+    #
+    #   Attempt to reuse compressed file
+    #
+    if ( $opt_reuse )
+    {
+        my $cfile = saneLabel($entry) . '.tgz';
+        if ( -f $cfile )
+        {
+            Message ("Restoring compressed image");
+            my $rv = System ('tar', '-xzf', $cfile );
+            if ( $rv )
+            {
+                Warning("Failed to decompress directory");
+                $data->{errStr} = 'Failed to de-tar compressed image';
+                return 2;
+            }
+            else
+            {
+                my $cc_vob = $cc_path;
+                $cc_vob =~ s~^/~~;
+                $cc_vob =~ s~/.*~~;
+                my $detarPath =  $data->{ViewRoot} . '/' . $cc_vob;
+                Error ("Logic error: Did not de-tar into expected location", $detarPath)
+                    unless ( -d $detarPath  );
+                if ( -d $data->{ViewPath}  )
+                {
+                    # All is good
+                    return 0;
+                }
+                # Recalc ViewPath to the root of the VOB
+                $cc_path =~ s~^/~~;
+                $cc_path =~ s~/.*~~;
+                $cc_path = '/' . $cc_path;
+                $data->{ViewPath} =  $data->{ViewRoot} . $cc_path;
+                return 0;
+            }
+        }
+    }
     if ( $opt_reuse && -d $data->{ViewPath}  )
+    {
         Message ("Reusing view: $cc_label");
+        #
 #-------------------------------------------------------------------------------
 # Function        : saneLabel
+#
 # Description     : Generate a sane version label
-#                   Handle suplicates (due to character squishing)
+#                   Handle duplicates (due to character squishing)
 #                   Cache results for repeatability
+#
 # Inputs          : $entry          - Version info
 #                   $pkgname        - Alternate pkgname (branching)
+#

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage.pl – Rev 3559 → 3832