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

 my $opt_ignoreProjectBaseErrors;
 my $opt_ignoreMakeProjectErrors;
 my $opt_delete;
 my $opt_recentAge = 14;             # Days
 my $opt_relabel = 0;
+my $opt_protected;
+my $opt_useSvn = 1;
+my $opt_testRmDatabase;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     '.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,',
     'daf_utils_mos'       => ',flat,',
     'mos_packager'        => ',all,',
     'cfmgr-cfmgr'         => ',flat,',
     'ReleaseName'         => ',flat,',
     'reports'             => ',utf8,',
     'cda_imports'         => ',utf8,',
     'cdxforms'            => ',utf8,',
     'db_cda'              => ',utf8,',
+    'CommandServer'       => ',IgnoreMakeProject,',
+    'TDSExporterControl'  => ',IgnoreMakeProject,',
+    'cdagui'              => ',IgnoreMakeProject,',
+    'daf_bvt'                 => ',IgnoreMakeProject,',  # Look OK
+    'daf_dll'                 => ',IgnoreMakeProject,',  # MakeProject not in used makefile
+    'PFTPi'                   => ',IgnoreMakeProject,',  # Looks OK
+    'PFTPu'                   => ',IgnoreMakeProject,',  # Looks OK
+    'WinCEBlocker'            => ',IgnoreMakeProject,',  # Looks OK
+    'WinCEDeviceAutoInject'   => ',IgnoreMakeProject,',  # Looks OK
+    'WinCEReboot'             => ',IgnoreMakeProject,',  # Looks OK
-    # Need to be handled in a special manner
-    # Not done by this utility
-    #
-    'linux_drivers_eb5600'  => ',protected,',
-    'linux_drivers_viper'   => ',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_osa_mos'           => 'IgnoreProjectBase,',
     'daf_utils_mos'         => 'IgnoreProjectBase,',
     'itso_ud'               => 'IgnoreProjectBase,',
 #    'mos_api'               => 'IgnoreProjectBase,',
 #    'mos_fonts'             => 'IgnoreProjectBase,',
 #    'sntp'                  => 'IgnoreProjectBase,',
                 "log!"          => \$opt_log,
                 "delete!"       => \$opt_delete,
                 "postimage!"    => \$opt_postimage,
                 'workdir:s'     => \$opt_workDir,
                 'relabel!'      => \$opt_relabel,
+                'svn!'          => \$opt_useSvn,
+                'testRmDatabase'    => \$opt_testRmDatabase,
                 );
+#
 #   Process help and manual options
+#
 Error("Specify a package as 'name'" ) unless ( defined $ARGV[0] );
 EnvImport('GBE_RM_URL');
 $cwd = Getcwd();
+#
+#   Allow use of the test database
+#   Defaut is live data, but some error recovery stuff can be done via
+#   the test database.
+#
+if ( $opt_testRmDatabase )
+{
+    Warning ("Using Test Database");
+    $ENV{GBE_RM_USERNAME} = 'RELEASE_MANAGER';
+    $ENV{GBE_RM_PASSWORD} = 'RELEASE_MANAGER';
+    $ENV{GBE_RM_LOCATION} = 'jdbc:oracle:thin:@auperaora07.vix.local:1521:RELMANU1';
+}
+#
 #   Init the pruning mode
+#
 setPruneMode( $opt_pruneModeString || 'ripple');
+#
+    #
     #   Going to do serious work
     #   Need to ensure we have more arguments
+    #
+    if ( $opt_protected )
+    {
+        Warning("Protected Package not transferred: $packageNames[0] - $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[0]",
+                "Configured within this program");
         exit 0;
+    }
+    #
     #   Perform all the work in a package specific subdirectory
     if ( $packageNames[0] =~ m'^br_applet_' )
+    {
       $opt_flat = 1 unless defined $opt_flat;
+    }
-    foreach  ( @excludeFromImport )
-    {
-         $specialPackages{$_} .= 'protected,';
-    }
     if ( exists $specialPackages{$packageNames[0]} )
+    {
         my $data = $specialPackages{$packageNames[0]};
         if ( index( $data, ',all' ) >= 0) {
             setPruneMode('none') unless (defined $opt_pruneModeString);
             $timestamp,
             $duration,
             $data{errStr} || ''
             );
     logToFile( $cwd . '/importsummary.txt', ";$line;");
+    #
     #   Sava data
+    #
     $data{errFlags} = $flags;
     $data{duration} = $duration;
     #   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 )) )
+        if ( !$opt_reuse || ($rv && ($rv != 4 && $rv != 12 && $rv != 5 )) )
+        {
             Message ("Delete View: $data{ViewRoot}");
             RmDirTree ($data{ViewRoot} );
+        }
         else
 #                   $entry              - Package entry to process
+#
 # Returns         : Error Code
 #                         0 - All is well
 #                       <10 - Recoverable error
+#                               1 - Bad VCS Tag
+#                               2 - No Files in the extracted view
+#                                   Label not found
+#                                   Failed to extract files from CC
+#                                   No Files in the extracted view after labeling dirs
+#                               3 - Deadwood
+#                               4 - Bad usage of ProjectBase detected
+#                                   Use of MakeProject detected
+#                               5  - Subversion Import disabled
 #                       >10 - Fatal error
+#
 sub newPackageVersionBody
+{
     my ($data, $entry) = @_;
             Message ("Adjust Base Dir: $testDir");
             $data->{adjustedPath} = $data->{ViewPath};
             $data->{ViewPath} = $testDir;
+        }
+    }
+    Message ("BaseDir: $data->{ViewPath}");
+    #
     #   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 detect it and report it - at the moment
+    #
-    if (detectProjectBaseUsage($data, $cc_path) )
+    if (detectProjectBaseUsage($data) )
+    {
         unless ( $opt_ignoreProjectBaseErrors )
+        {
             $data->{BadProjectBase}++;
             $data->{errStr} = 'Bad usage of ProjectBase detected';
+    #
     #   Have a CC view
     #   Now we can create the SVN package and branching point before we
     #   import the CC data into SVN
+    #
+    if ( !$opt_useSvn )
+    {
+            $data->{errStr} = 'Subversion Import disabled';
+            return 5;
+    }
     my @args;
+    #
     #   Calculate args for functions
+    #
 # Function        : detectProjectBaseUsage
+#
 # Description     : Detect and report usage of the SetProjectBase 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 detectProjectBaseUsage
+{
-    my ($data, $cc_path) = @_;
+    my ($data) = @_;
     my $retval = 0;
     my $eSuf = $opt_ignoreProjectBaseErrors ? '' : 'Error';
+    #
     #   Find makefile.pl
     my $definitionError = 0;
     my $search = JatsLocateFiles->new("--Recurse=1",
                                        "--FilterIn=makefile.pl",
                                        );
-    my @makefiles = $search->search($data->{ViewRoot});
+    my @makefiles = $search->search($data->{ViewPath});
     foreach my $file ( @makefiles )
+    {
-        if ( open( my $fh, '<', "$data->{ViewRoot}/$file" ) )
+        if ( open( my $fh, '<', "$data->{ViewPath}/$file" ) )
+        {
             while ( <$fh> )
+            {
                 s~\s+$~~;
                 s~^\s+~~;
                 if ( m~^SetProjectBase~ )
+                {
                     $definesProjectBase++;
                     $data->{DefinesProjectBase}++;
                     Warning ("Package initialises SetProjectBase:",
-                             "Line: " . $_,
+                             "Line : " . $_,
-                             "Root: " . "$data->{ViewRoot}",
+                             "Root : " . "$data->{ViewRoot}",
+                             "Path : " . "$data->{ViewPath}",
-                             "File: " . "$data->{ViewRoot}/$file",
+                             "File : " . "$data->{ViewPath}/$file",
                             );
                     # The only problem is if the user attempts to escape
                     # from the root of the view.
+                    #
                     # Locate the build.pl file
                     # This is the basis for for the directive
+                    #
                     my $blevel;
                     my @bpaths = split ('/', $file );
+                    my $buildFile;
                     while ( @bpaths )
+                    {
                         $bpaths[-1] = 'build.pl';
                         my $bfile = join '/', @bpaths ;
-                        if ( -f "$data->{ViewRoot}/$bfile" )
+                        $buildFile = "$data->{ViewPath}/$bfile";
+                        if ( -f $buildFile )
+                        {
                             $blevel = scalar @bpaths;
                             last;
+                        }
                         pop @bpaths;
+                    }
                     else
+                    {
+                        #
                         #   Determine the depth of the view root
-                        #   This is given by cc_path, but cc_path has a leading /
+                        #
+                        Warning ("Build: $buildFile");
-                        my @cpaths = split ('/', $cc_path );
+                        my $countPath = ($data->{ViewPath} =~ tr~/~/~);
-                        my $clevel = (scalar @cpaths) - 1;
+                        my $countBuild = ($buildFile =~ tr~/~/~);
-                        my $max_up = $blevel - $clevel - 1;
+                        my $max_up = $countBuild - $countPath -1;
                         m~--Up=(\d+)~i;
                         my $ulevel = $1;
                         if ( defined $ulevel )
+                        {
 #print "--- blevel: $blevel\n";
 #print "--- bpaths: @bpaths\n";
 #print "--- ulevel: $ulevel\n";
 #print "--- paths: @paths\n";
 #print "--- plevel: $plevel\n";
-#print "--- cpaths: @cpaths\n";
-#print "--- clevel: $clevel\n";
 #print "--- max_up: $max_up\n";
                             if ( $ulevel > $max_up )
+                            {
                                 Warning ("SetProjectBase escapes view. MaxUp: $max_up, Up: $ulevel");
+#
 sub createImages
+{
     my $filebase = "${packageNames}";
-    open (FH, '>', "$filebase.dot" ) or die "Cannot open output";
+    open (FH, '>', $cwd . "/$filebase.dot" ) or die "Cannot open output";
     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";
         unless ( keys(%ScmRepoMap) >= 0 );
     $opt_vobMap = $ScmRepoMap{$packageNames}{repo}
         if (exists $ScmRepoMap{$packageNames});
+    $opt_protected = $ScmRepoMap{$packageNames}{protected}
+        if (exists $ScmRepoMap{$packageNames}{protected});
+    #
     #   Free the memory
+    #
     %ScmRepoMap = ();
     -[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
+    -testRmDatabase    - Use test database
 =head1 OPTIONS
 =over 8

Subversion Repositories DevTools

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