WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/LOCAL/cc2svn_importpackage3.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_fileList;
 my $opt_ccbase;
 my $opt_preserveProjectBase;
 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_extractFromSvn;
 my $opt_AllowMuliplePaths = 1;      #29-Nov-2012
 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;
+my $count_BadPaths = 0;
+my $opt_IgnoreBadSourcePath;
+my $opt_forceSuck;
+my $opt_noVCS;
 ################################################################################
 #   List of Projects Suffixes and Branch Names to be used within SVN
+#
 #       Name        - Name of branch for the project
     '.pmb'      => { Name => 'Pietermaritzburg' },
     '.vps'      => { Name => 'VixPayments' },
     '.ncc'      => { Name => 'NSWClubCard' },
     '.rm'       => { Name => 'Rome' },
     '.vss'      => { Name => 'SmartSite' },
+    '.ssts'     => { Name => 'SydneySchoolbus' },
     'unknown'   => { Name => 'UnknownProject' },
     '.ebr'      => { Name => 'eBrio' , Trunk => 1 },
     '.mas'      => { Name => 'Mass'  , Trunk => 1 },
     '.cr'       => { Name => 'Core'  , Trunk => 1 },
     '.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,',
     'Dataman'             => ',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
     'ftp'                   => ',SetProjectBase,',
     'ddu_app_manager'       => ',SetProjectBase,IgnoreMakeProject,',
     'ddu_afc'               => ',SetProjectBase,IgnoreMakeProject,',
     'ddu_dog'               => ',SetProjectBase,IgnoreMakeProject,ForceProjectBase=/DPG_SWCode/projects/seattle/ddu,',
     'pcv_final_wce'                 => 'IgnoreMakeProject', # MakeProject Tested on at least one
     'pcv_wce'                       => 'IgnoreMakeProject', # MakeProject Tested on at least one
     'WinCEDeviceUpgrade'            => 'IgnoreMakeProject', # MakeProject Tested on at least one
     'scil'                          => 'LimitProjectBase=/DPG_SWCode/projects/seattle/tvm',
     'daf_br_compiler_support'       => 'ForceProjectBase=/DPG_SWBase/daf_br_compiler/support',
+    '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,LimitProjectBase=/LMOS/linux/drivers'.
+    'LinuxDrivers'                  => 'flatTime,processRipples,LimitProjectBase=/LMOS/linux/drivers'.
                                        ',mergePaths=modules:bcp4600:cobra:eb5600:etx86:tp5600:viper',
-    'flashCopier'              => 'flatTime,LimitProjectBase=/LMOS/tools/flashCopier'.
+    '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',
+    'serpent'                         => 'flatTime,processRipples,LimitProjectBase=/LMOS/linux/kernel'.
+                                         ',mergePaths=serpent-common:common:cobra:viper',
+    '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',
+    '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',
+    'altp'                  => 'SelectProjectBase=MASS_Dev_Bus/CBP/al/altp/cpp:MASS_Dev_Bus/CBP/al/altp',
+    'cfm'                   => 'SelectProjectBase=MASS_Dev_Bus/CBP/cfm/cpp:MASS_Dev_Bus/CBP/cfm',
+    'enqdef'                => 'SelectProjectBase=MASS_Dev_Bus/CBP/enquiry/enqdef',
+    'expstat'               => 'SelectProjectBase=MASS_Dev_Bus/CBP/expstat/cpp:MASS_Dev_Bus/CBP/expstat',
+    'olsenqxdr'             => 'SelectProjectBase=MASS_Dev_Bus/CBP/enquiry/olsenqxdr/cpp:MASS_Dev_Bus/CBP/enquiry/olsenqxdr',
+    'olseod'                => 'SelectProjectBase=MASS_Dev_Bus/CBP/olseod/olseod/cpp:MASS_Dev_Bus/CBP/olseod/olseod:MASS_Dev_Bus/CBP/olseod',
+    'streamer'              => 'SelectProjectBase=MASS_Dev_Bus/CBP/streamer/cpp:MASS_Dev_Bus/CBP/streamer',
+    'tgen'                  => 'SelectProjectBase=MASS_Dev_Bus/CBP/tgen/cpp:MASS_Dev_Bus/CBP/tgen',
+    'daf_transap_ultralight'=> 'flatTime,processRipples,mergePaths=++',
+#    'daf_cardshark'        => 'flatTime,processRipples,mergePaths=++',
+    'emv_raw_cs'            => 'flatTime,processRipples,SelectProjectBase=DPG_SWBase/emv_cs/emv_raw_cs/cpf:DPG_SWBase/emv_cs/emv_raw_cs'.
+                                    ',mergePaths=++:linux/**:win32/**',
+    'OpManCronJob'          => 'SkipBuildFileCheck',
+    'issuertest'            => 'SelectProjectBase=MASS_Dev_Bus/Issuer/test/IssuerTest:MASS_Dev_Bus/Issuer/test/cpp:MASS_Dev_Bus/Card/test/cpp:MASS_Dev_Bus/Card/test/cpp',
+    'obits_simulator'       => 'IgnoreMakeProject',
+    'application'           => 'IgnoreMakeProject,SelectProjectBase=MASS_Dev_Bus/Application',
+    'FinCommon'             => 'SkipBuildFileCheck,SelectProjectBase=MASS_Dev_Bus/Financial',
+    'FinRun'                => 'SkipBuildFileCheck,SelectProjectBase=MASS_Dev_Bus/Financial',
+    'olstxnstream'          => 'SelectProjectBase=MASS_Dev_Infra/core_olstxnstream',
+    'product'               => 'SkipBuildFileCheck,SelectProjectBase=MASS_Dev_Bus/Product',
+    'oracen-bei-patch'      => 'RetainCompressed',
+    'oracen-patch'          => 'RetainCompressed',
+    'pcv'                   => 'IgnoreMakeProject',
+    'summarisation'         => 'SkipBuildFileCheck',
+    'AVMApplicationEngine'  => 'IgnoreMakeProject',
+    'ESL'                   => 'IgnoreMakeProject',
+    'daf_br_oar'            => 'IgnoreProjectBase',         # Look OK
+    'daf_br'                => 'RetainCompressed,IgnoreProjectBase,IgnoreMakeProject,SelectProjectBase=DPG_SWBase/daf_br:DPG_SWBase/br',    # Look OK
+    'daf_dti'               => 'IgnoreProjectBase,SelectProjectBase=DPG_SWBase/dti;DPG_SWBase',
+    'OcpGui'                => 'IgnoreMakeProject',
+    'ssu5000'               => 'ForceProjectBase=/DPG_SWCode',
+    'obftp'                 => 'IgnoreMakeProject,IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
+    'saftp'                 => 'IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
+    'PFTPp'                 => 'IgnoreMakeProject,ForceProjectBase=/DPG_SWCode',        # Need to test
+    'ocp5000'               => 'ForceProjectBase=/DPG_SWCode,RetainCompressed,IgnoreMakeProject', # Need to test
+    'SPOS'                  => 'ForceProjectBase=/DPG_SWCode',
+    'gak6000'               => 'ForceProjectBase=/DPG_SWCode,IgnoreProjectBase',
+    'gak5000'               => 'ForceProjectBase=/DPG_SWCode,IgnoreProjectBase,IgnoreBadPath',
+    'hcp5000'               => 'IgnoreMakeProject,ForceProjectBase=/DPG_SWCode,RetainCompressed,IgnoreBadSourcePath',
+    'agents_unit'           => 'IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
+    'tp5000'                => 'noVCS,IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
+    'vcp5000'               => 'IgnoreProjectBase,ForceProjectBase=/DPG_SWCode',
+    'MetrixOra'             => 'Trunk=.sea,ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples',
+    'oracs'                 => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/oracs:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
+    'oradacw'               => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/oradacw:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
+    'orabocw'               => 'ForceSuck,ForceProjectBase=/MASS_Dev_Bus,IgnoreBadSourcePath,NoProcessRipples,SelectProjectBase=MASS_Dev_Bus/web/patches/orabocw:MASS_Dev_Bus/web/patches:MASS_Dev_Bus/web',
     'icl'                   => 'IgnoreProjectBase,',
     'itso'                  => 'IgnoreProjectBase,',
 #    'daf_osa_mos'           => 'IgnoreProjectBase,',
     'itso_ud'               => 'IgnoreProjectBase,',
 #    'mos_api'               => 'IgnoreProjectBase,',
 #    'mos_fonts'             => 'IgnoreProjectBase,',
 #    'sntp'                  => 'IgnoreProjectBase,',
 #    'time_it'               => 'IgnoreProjectBase,',
+    'MOS'      => 'RetainCompressed,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',
+            },
+    'serpent'   => {
+        'linux_kernel_viper_2.6.24.6.0000.cots' => 'common:viper',
+        'linux_kernel_viper_2.6.24.6.1000.cots' => 'serpent-common:cobra:viper',
+    },
+);
+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' },
 my $globalError;
 my @unknownProjects;
 my %knownProjects;
 my $badSingletonCount = 0;
 my @flatOrder;
-my $flatMode;
+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
+                '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:1"       => \$opt_reuse,         # Reuse ClearCase views 0:None, 1=Retain, 2=Use+Delete
+                '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,
                 # File list support
-                'filelist:s'    => \$opt_fileList,      # A list of CC tags
+                'filelist:s'        => \$opt_fileList,      # A list of CC tags
-                'subdir:s'      => \$opt_repoSubdir,    # Subdir within repo
+                'subdir:s'          => \$opt_repoSubdir,    # Subdir within repo
-                'ccbase:s'      => \$opt_ccbase,        # ClearCase Base for CC Tags
+                'ccbase:s'          => \$opt_ccbase,        # ClearCase Base for CC Tags
+                'testRepo!'         => \$opt_useTestRepo,
+                'novcs'             => \$opt_noVCS,
                 );
+#
 #   Process help and manual options
+#
 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
-        $opt_name = $opt_mergePackages;
-    } elsif ( $opt_mergePackages eq 'flashCopier' )
+    } 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
+                );
+    } elsif ( $opt_mergePackages eq 'serpent' ) {
+        $opt_name = $opt_mergePackages;
+        @ARGV = qw (
+                    linux_kernel_viper
+                    linux_kernel_cobra
+                );
+    } elsif ( $opt_mergePackages eq 'emv_raw_cs_merge' ) {
+        $opt_name = 'emv_raw_cs';
+        @ARGV = qw (
+                    emv_raw_cs
+                    emv_raw_cs-w32
+                );
+    } 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");
+    }
+}
 #    @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);
+    }
     my $tip = $flatOrder[-1];
     $versions{$tip}{Tip} = 1 if $tip;
+}
+#
 #   Generate dumps and images
+#
-if ( $opt_images )
+if ( $opt_images || 1 )
+{
     createImages();
+}
 if ( $opt_dump )
+    {
         newProject();
         foreach my $entry (@flatOrder )
+        {
             newPackageVersion( $entry, $versions{$entry}{suffix} );
-            unless ( $globalError )
-            {
-                getSvnData();
-                createImages();
-            }
+        }
+    }
     else
+    {
         processBranch(@allStartPoints);
             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, ',NoProcessRipples,' ) >= 0) {
+            $opt_processRipples = 0;
+            Message ("Disable Processing of ripples");
+        }
+        if ( index( $data, ',noVCS,' ) >= 0) {
+            $opt_noVCS = 1;
+            Message ("Use of ClearCase disabled.");
+        }
         if ( index( $data, ',SetProjectBase,' ) >= 0) {
             $opt_preserveProjectBase = 1;
             $opt_ignoreProjectBaseErrors = 1;
             Message ("Preserving ProjectBase");
         if ( index( $data, ',AllowMultiPath,' ) >= 0) {
             $opt_AllowMuliplePaths = 1;
             Message ("Allowing Multiple Paths");
+        }
+        if ( index( $data, ',IgnoreBadSourcePath,' ) >= 0) {
+            $opt_IgnoreBadSourcePath = 1;
+            Message ("Ignore Source Paths tagged as Bad");
+        }
         if ( $data =~ m~,ForceProjectBase=(.*?),~ ) {
             $opt_forceProjectBase = $1;
             $opt_AllowMuliplePaths = 1;
             Message ("Force Project Base: $opt_forceProjectBase");
+        }
         if ( $data =~ m~,LimitProjectBase=(.*?),~ ) {
             $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, ',ForceSuck,' ) >= 0) {
+            $opt_forceSuck = 1;
+            Message ("Force sucking empty directories");
+        }
         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, ',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, ',utf8,' ) >= 0) {
             $mustConvertFileNames = 1;
             Message ("Convert filenames to UTF8");
+        }
+        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");
+        }
+    }
     Message("Package Type: $packageType, $pruneModeString");
+}
+            {
                 my $ep = $versions{$entry};
                 unless ( $ep->{last} || $ep->{next}[0] )
+                {
 #                    if (  $ep->{isaWip}  )
-                    if ( (exists $ep->{badVcsTag} && $ep->{badVcsTag}) || $ep->{isaWip}  )
+                    if ( (!$opt_IgnoreBadSourcePath  && (exists $ep->{badVcsTag}  && $ep->{badVcsTag})) || $ep->{isaWip} )
+                    {
                         $ep->{badSingleton} = 1;
                         $reprocess = 1;
                         $badSingletonCount++;
             calcLinks()
                 if ( $reprocess );
+        }
+        #
+        #   True Patches show up as singletons - they have no parent
+        #   Need to create strands of patches to be glued onto the base
+        #
+        unless( $opt_fileList ){
+            my %patchTree;
+            my $patchSeen;
+            Message ("Creating patch threads");
+            foreach my $entry ( sort {$versions{$a}{version} cmp $versions{$b}{version}} @startPoints )
+            {
+                my $ep = $versions{$entry};
+                next unless ( defined $ep->{buildVersion} );
+                my $suffix = $ep->{name} . $ep->{suffix};
+                my ($major, $minor, $patch, $build) = @{$ep->{buildVersion}};
+                my $patchBase = sprintf ("%3.3d.%3.3d.%3.3d.$suffix", $major, $minor, $patch);
+                if ( defined $ep->{buildVersion} )
+                {
+                    if ( $ep->{isaPatch} )
+                    {
+                        push @{$patchTree{$patchBase}}, $entry;
+                        $ep->{patchRoot} = $patchBase;
+                        $patchSeen++;
+                    }
+                }
+            }
+            my %patchRoot;
+            if ($patchSeen)
+            {
+                foreach my $entry ( sort {$versions{$a}{version} cmp $versions{$b}{version}} keys %versions )
+                {
+                    my $ep = $versions{$entry};
+                    next if ( $ep->{isaPatch} );
+                    next unless ( defined $ep->{buildVersion} );
+                    my $suffix = $ep->{name} . $ep->{suffix};
+                    my ($major, $minor, $patch, $build) = @{$ep->{buildVersion}};
+                    my $patchBase = sprintf ("%3.3d.%3.3d.%3.3d.$suffix", $major, $minor, $patch);
+                    if ( defined $patchRoot{$patchBase})
+                    {
+                        Warning ("Multiple Patch Roots identified", $versions{$patchRoot{$patchBase}}{vname},$ep->{vname}, "Both hash to: " . $patchBase );
+                    }
+                    else
+                    {
+                        $patchRoot{$patchBase} = $entry;
+                    }
+                }
+#DebugDumpData('%patchRoot', \%patchRoot );
+                foreach  ( keys %patchTree )
+                {
+                    my $last;
+                    foreach my $entry ( sort {$versions{$a}{version} cmp $versions{$b}{version}} @{$patchTree{$_}} )
+                    {
+                        if ( $last )
+                        {
+                            $versions{$last}{MakeTree} = 1;
+                            push @{$versions{$last}{next}}, $entry;
+                            $reprocess = 1;
+                        }
+                        else
+                        {
+                            # First entry in thread.
+# print "--- Patch Branch $versions{$entry}{vname}\n";
+                            $versions{$entry}{branchPoint} = 2;
+                            my $patchBase = $versions{$entry}{patchRoot};
+                            my $patchBaseEntry = $patchRoot{$patchBase};
+                            if ( $patchBase )
+                            {
+                                if ( defined($patchBaseEntry) && exists ($versions{$patchBaseEntry}) )
+                                {
+                                    push @{$versions{$patchBaseEntry}{next}}, $entry;
+#    Message( "Attaching ",$versions{$entry}{version}," to $patchBase");
+                                }
+                                else
+                                {
+    Message( "Cannot Attach ",$versions{$entry}{version}," to $patchBase" );
+                                    Warning ("Cannot attach thread. No base version");
+                                }
+                            }
+                        }
+                        $last = $entry;
+                    }
+                }
+            }
+            calcLinks()
+                if ( $reprocess );
+        }
+#DebugDumpData('$verions', \%versions );
+        #
         #   Create simple trees out of the chains
         #   Tree is based on suffix (project) and version
+        #
+        {
             my %trees;
+            }
             foreach  ( keys %trees )
+            {
                 my $last;
-                foreach my $entry ( sort { $versions{$a}{version} cmp $versions{$b}{version}  } @{$trees{$_}} )
+                foreach my $entry ( sort {$versions{$a}{version} cmp $versions{$b}{version}} @{$trees{$_}} )
+                {
                     if ( $last )
+                    {
                         $versions{$last}{MakeTree} = 1;
                         push @{$versions{$last}{next}}, $entry;
     #   Display warnings about Bad Essential Packages
+    #
     $allSvn = 1;
     foreach my $entry ( keys(%versions) )
+    {
+        markDpkgArchive($entry);
         $rippleCount++ if ( exists($versions{$entry}{isaRipple}) && $versions{$entry}{isaRipple} );
         $allSvn = 0 unless ( $versions{$entry}{isSvn} );
         next unless ( exists $versions{$entry}{Essential}  );
         next unless ( $versions{$entry}{badVcsTag}  );
         push @badEssentials, $entry;
-        Warning ("BadVCS Essential: " . GetVname($entry))
+        Warning ("BadVCS Essential: " . GetVname($entry));
+    }
+    #
     #   All done
+    #
+    {
         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
+#
             $createBranch = 1;
             $createSuffix = 1 if $versions{$entry}{newSuffix};
+        }
         newPackageVersion( $entry );
-        unless ( $globalError )
-        {
-            getSvnData();
-            createImages();
-        }
 no warnings "recursion";
         processBranch (@{$versions{$entry}{next}});
+    }
+}
+    }
     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 );
+    }
     #   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 || -f "more/$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
+    {
         Message ("No view to delete");
+    }
+    #
+    #   Create pretty pictures
+    #
+    unless ( $rv )
+    {
+        getSvnData();
+        createImages();
+    }
     if($opt_processRipples)
+    {
+        #
         #   If this version has any 'ripples' then process them while we have the
             Message ("Proccessing associated Ripple: " . GetVname($rentry));
             newPackageVersion($rentry);
+        }
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : newPackageVersionBody
+#
     my $rv;
     my $vcs_type;
     my $cc_label;
     my $cc_path;
     my $cc_path_original;
+    my $selectDir;
+    #
     #   Init Data
+    #
     $data->{rmRef} = 'ERROR';
 #        $data->{errStr} = 'Package is DeadWood';
 #        return 3;
 #    }
+    #
+    #   Check for a handcrafted substitute package
-    #   Determine version information
+    #       May have been created with gen_cots
+    #
-    $data->{tag} = $versions{$entry}{vcsTag} || '';
+    testDpkgArchive($entry);
-    if ( $versions{$entry}{badVcsTag} )
+    if (extractFilesFromStore($data, $entry) )
+    {
-        Warning ("Error: Bad VcsTag for: " . GetVname($entry),
-                 "Tag: $data->{tag}" );
+        Message ("Using package from store");
-        $data->{errStr} = 'VCS Tag Marked as Bad';
-        return 1;
+    }
+    else
+    {
+        #
+        #   Determine version information
+        #
+        if ($opt_IgnoreBadSourcePath)
+        {
+            # Ignore versions tagged with a bad source path
+            #   Will expect that the Vob will be forced
+            #   Hope that we have a label
+            delete $versions{$entry}{badVcsTag};
+        }
-    $data->{tag} =~ m~^(.+?)::(.*?)(::(.+))?$~;
-    $vcs_type = $1;
-    $cc_label = $4;
-    $cc_path = $2;
-    $cc_path = '/' . $cc_path;
-    $cc_path =~ tr~\\/~/~s;
-    $cc_path_original = $cc_path;
-    #
-    #   Correct well known path mistakes in CC paths
-    #
-    if ( $vcs_type eq 'CC' )
-    {
-        $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_../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
+        $data->{tag} = $versions{$entry}{vcsTag} || '';
-            || $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
+        if ( $versions{$entry}{badVcsTag} )
-            || $versions{$entry}{name} =~ m/^ERGxml$/i
-            || $versions{$entry}{name} =~ m/^ERGoradacw$/i
-            || $versions{$entry}{name} =~ m/^ERGtru$/i
-            )
+        {
+            Warning ("Error: Bad VcsTag for: " . GetVname($entry),
-            $cc_path = '/MREF_Package';
+                     "Tag: $data->{tag}" );
+            $data->{errStr} = 'VCS Tag Marked as Bad';
+            return 1;
+        }
+        $data->{tag} =~ m~^(.+?)::(.*?)(::(.+))?$~;
+        $vcs_type = $1;
+        $cc_label = $4;
+        $cc_path = $2;
+        $cc_path = '/' . $cc_path;
+        $cc_path =~ tr~\\/~/~s;
+        $cc_path_original = $cc_path;
+        #
+        #   Process IgnoreBadSourcePath
+        #
-        if (   $versions{$entry}{name} =~ m/^tp5000_MUG$/i )
+        if ($opt_IgnoreBadSourcePath)
+        {
+            if (($vcs_type eq 'UC') || (length($cc_label) < 1))
+            {
+                $versions{$entry}{badVcsTag} = 98;
+                Warning ("Error: Bad VcsTag for: " . GetVname($entry),
+                         "Tag: $data->{tag}" );
+                $data->{errStr} = 'VCS Tag Marked as Bad - and has no label';
+                return 1;
+            }
+        }
+        #
+        #   Correct well known path mistakes in CC paths
+        #
+        if ( $vcs_type eq 'CC' )
+        {
+            $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_../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 =~ s~/DPG_SWBase/Services~/DPG_SWBase/services~i;
+            $cc_path = '/MASS_Dev_Bus/Application' if ( $versions{$entry}{name} eq 'application');
+            $cc_path = '/MASS_Dev_Bus/Product'     if ( $versions{$entry}{name} eq 'product');
+            $cc_path = '/MASS_Dev_Bus/Financial'   if ( $versions{$entry}{name} eq 'FinRun');
+            $cc_path = '/MASS_Dev_Bus' if ( $cc_path =~ m~/MASS_Dev_Bus/ImageCapture(/|$)~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
-            if ( $versions{$entry}{version} =~ m~vtk$~ )
+                || $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';
+                }
+            }
-        $cc_path = $opt_forceProjectBase
+            $cc_path = $opt_forceProjectBase
-            if ( $opt_forceProjectBase );
+                if ( $opt_forceProjectBase );
-        foreach ( @opt_limitProjectBase )
+            foreach ( @opt_limitProjectBase )
-        {
-            if ( $cc_path =~ m~$_~ )
+            {
+                if ( $cc_path =~ m~$_~ )
+                {
-                $cc_path = $_;
+                    $cc_path = $_;
-                last;
+                    last;
+                }
+            }
+            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";
-        if ( $cc_path_original ne $cc_path )
+        if ( $vcs_type eq 'SVN' )
+        {
+            $rv = extractFilesFromSubversion( $data, $entry );
+            return $rv if ( $rv );
+        }
+        else
+        {
+            #
+            #   Create CC view
+            #   Import into Subversion View
+            #
-                Message ("Package: $versions{$entry}{name}. Forcing CC path to: $cc_path" );
+            $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");
+                }
+            }
+        }
+    }
-#print "--- Path: $cc_path, Label: $cc_label\n";
+    #
+    #   Delete specified files from the source tree
+    #
-    if ( $vcs_type eq 'SVN' )
+    if ( @opt_deleteFiles )
+    {
+        my @args;
+        foreach my $delFileSpec ( @opt_deleteFiles )
+        {
+            Message ("Deleting files that match: $delFileSpec");
+            push @args, "--FilterIn=$delFileSpec";
+        }
-        $rv = extractFilesFromSubversion( $data, $entry );
+        my $search = JatsLocateFiles->new("--Recurse=1", @args );
+        my @rmFiles = $search->search($data->{ViewRoot});
-        return $rv if ( $rv );
+        foreach my $rmFile ( @rmFiles )
+        {
+            Information("Deleting: $rmFile");
+            unlink ( join ('/', $data->{ViewRoot}, $rmFile) )|| Warning "Cannot delete: $rmFile";
+        }
+    }
+    #
+    #   Some packages contain softlinks - that break the file scanner
-    else
+    #
+    if ( $opt_deleteLinks )
+    {
-        #
-        #   Create CC view
-        #   Import into Subversion View
+        # Not doing anything yet - fixed the JATS find bit
-        #
-        $rv = extractFilesFromClearCase( $data, $cc_path, $cc_label );
-        return $rv if ( $rv );
+    }
+    #
     #   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) && ! $opt_forceSuck)
+    {
+        #
         #   Look in ViewPath
         #   If it contains only ONE directory then we can suck it up
+        #
+    #
     #   Check for bad source paths
+    #
     if (detectBadMakePaths($data) )
+    {
+        $count_BadPaths++;
         unless ( $opt_ignoreBadPaths )
+        {
             $data->{BadPath}++;
             $data->{errStr} = 'Bad Paths in Makefile';
             return 4;           # Lets see what the others look like too
         RmDirTree ('SvnImportDir');
+    }
     push @args, "-branch=$currentBranchName" if ( defined $currentBranchName );
     my $datafile = "importdata.$import_label.properties";
+    my @mergeArg;
-    push (@args, "-mergePaths", join(',', @opt_mergePaths) ) if ( @opt_mergePaths );
+    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';
         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)
+    #
+    unless ( $opt_skipBuildNameCheck )
+    {
+        if (detectBuildFileClashes($data, 'SvnImportDir'))
+        {
+            unless ( $opt_ignoreBuildFileClashes )
+            {
+                $data->{BuildFileClash}++;
+                Message ("Build File Clash detected");
+            }
+        }
+    }
+    else
+    {
+        Message ('Detect Build File Clashes - skipped');
+    }
     $versions{$entry}{TagCreated} = 1;
     $firstVersionCreated = $entry unless ( $firstVersionCreated );
+    #
     #   Read in the Rm Reference
 #                   Perform the calculation to determine the details of
 #                   the branch point. The work will only be done when its
 #                   needed. This will avoid the creation of branchpoints
 #                   that are not used.
+#
-# Inputs          : $entry                  Entry being processed
+# Inputs          : $entry          - Entry being processed
 #                   $author         - Who done it
 #                   $date           - When
+#
 # Returns         :
+#
+    #
     #   Create target name
+    #
     my $tgt_label;
+    if ($versions{$entry}{isaPatch} )
+    {
+        my $parent = $versions{$entry}{last};
+        my $pver = $versions{$parent}{vname};
+        $tgt_label = 'Patching_' . $pver;
+    }
-    if ( $forceNewProject || $versions{$entry}{newSuffix} || $createSuffix || !defined $src_label )
+    elsif ( $forceNewProject || $versions{$entry}{newSuffix} || $createSuffix || !defined $src_label )
+    {
+        #
         #   Create target name based on project
+        #
         return if ( $singleProject );
+            #
             if ( $Projects{$suffix}{Trunk} )
+            {
                 # This project can use the trunk, if it has not been allocated.
                 $ProjectTrunk = $suffix unless ( defined $ProjectTrunk );
+#                Message ("ProjectTrunk allocated to: $ProjectTrunk");
+                #
                 #   If this package has multiple instances of the potential
                 #   trunk, then don't place either of them on the trunk as it
                 #   may cause confusion
+                #
+    #
     #   Save branch name for use when populating sandbox
+    #
     $currentBranchName = $tgt_label;
+#    Message ("Setting currentBranchName: $currentBranchName");
+    #
     #   Perform the branch
+    #
     if ( defined $src_label )
     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 ("Packages not processed: $notProcessedCount") if ( $notProcessedCount );
     Warning ("Internal Errors: $inernalErrorCount") if ( $inernalErrorCount );
     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 Ignored Bad Paths: $badPathCount") if ( $count_BadPaths );
     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
+    #   Use touch cc2svn_ignore - to create file
+    #
+    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
+    }
+    #
+    #   Attempt to reuse compressed file
+    #
+    if ( $opt_reuse )
+    {
+        my $cfile = saneLabel($entry) . '.tgz';
+        if ( -f "more/$cfile" ) {
+            $cfile = "more/$cfile";
+        }
+        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;
+                unless ( -d $detarPath  )
+                {
+                    Warning ("Logic error: Did not de-tar into expected location", $detarPath)
+                }
+                else
+                {
+                    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");
+        #
+        #   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 ) {
+    while ( ($rv == 99)  && ! $opt_noVCS) {
         my @args;
         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",
+    #
     #   Create a nice name for the import
+    #
     my $import_label = saneLabel($entry);
-    $data->{ViewRoot} = $opt_name ? $opt_name : $import_label;
+    $data->{ViewRoot} = ( defined $opt_name && ! defined $opt_mergePackages )? $opt_name : $import_label;
     $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;
+    }
+    #
+    #
     return 0;
+}
 #-------------------------------------------------------------------------------
+# Function        : extractFilesFromStore
+#
+# Description     : Extract files from Store
+#                   Local directory under dpkgExtract
+#
+# Inputs          : $data           - Hash of good stuff from newPackageVersionBody
+#                   $entry          - All the PV information
+#
+# Returns         : exit code
+#                       1 - Files found
+#                       0 - Not found
+#
+sub extractFilesFromStore
+{
+    my ($data, $entry ) = @_;
+    #
+    #   Create a nice name for the import
+    #
+    my $import_label = saneLabel($entry);
+    $data->{ViewRoot} = ( defined $opt_name && ! defined $opt_mergePackages )? $opt_name : $import_label;
+    $data->{ViewPath} =  'dpkgExtract/' . $data->{ViewRoot};
+    $data->{ViewPath} =~  tr~/~/~s;
+    if ( -d $data->{ViewPath}  )
+    {
+        $data->{fromStore} = 1;
+        Message ("Reusing Stored view: $import_label");
+        return 1;
+    }
+    #
+    #   Not found in store
+    #
+    delete $data->{ViewRoot};
+    delete $data->{ViewPath};
+    return 0;
+}
+#-------------------------------------------------------------------------------
+# Function        : testDpkgArchive
+#
+# Description     : Indicate if the package exists in dpkg_archive
+#
+# Inputs          :
+#
+# Returns         :
+#
+sub testDpkgArchive
+{
+    my ($entry) = @_;
+    my $vname = $versions{$entry}{vname};
+    if ( -d join('/', $ENV{GBE_DPKG}, $packageNames, $vname )) {
+        Message ("Version found in dpkg_archive");
+    } else {
+        Message ("Version NOT found in dpkg_archive");
+    }
+}
+#-------------------------------------------------------------------------------
+# Function        : markDpkgArchive
+#
+# Description     : Indicate if the package exists in dpkg_archive
+#
+# Inputs          :
+#
+# Returns         :
+#
+sub markDpkgArchive
+{
+    my ($entry) = @_;
+    my $vname = $versions{$entry}{vname};
+    my $path = join('/', $ENV{GBE_DPKG}, $packageNames, $vname );
+    delete $versions{$entry}{dpkgArchive};
+    if ( -d $path ) {
+        $versions{$entry}{dpkgArchive} = $path;
+    }
+}
+#-------------------------------------------------------------------------------
 # Function        : detectMakeProjectUsage
+#
 # Description     : etect and report usage of the MakeProject directive
+#
 # Inputs          : $data               - Ref to a hash of bits
+                    {
+                        #
                         #   Determine the depth of the view root
+                        #
                         Warning ("Build: $buildFile");
+                        #
+                        #   Whats the file for
+                        #
+                        if (open (BF, '<', $buildFile ))
+                        {
+                            while ( <BF> )
+                            {
+                                s~\s+$~~;
+                                if ( m~\s*BuildName~ )
+                                {
+                                    Warning ("BuildName: $_");
+                                    last;
+                                }
+                            }
+                            close BF;
+                        }
+                        #
+                        #   Determine the depth of the view root
+                        #
                         my $countPath = ($data->{ViewPath} =~ tr~/~/~);
                         my $countBuild = ($buildFile =~ tr~/~/~);
                         my $max_up = $countBuild - $countPath -1;
                         m~--Up=(\d+)~i;
+    #
     #   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};
+        next unless ( defined($bname) );
+Information ("BuildFiles: $bname, $bversion : $bdir");
+        if ( exists ($data{$bname}{count}) && ($data{$bname}{count} >= 1) )
+        {
+            Warning ("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.
+#
 #-------------------------------------------------------------------------------
 # 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)
+#
+                    #
                     #   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}{name} = $pkg_name;
                     $versions{$pv_id}{pvid} = $pv_id;
                     $versions{$pv_id}{vname} = $pkg_ver;
                     $versions{$pv_id}{vcsTag} = $vcstag;
                     $versions{$pv_id}{created} = $created;
                     examineVcsTag($pv_id);
+                    #
                     #   Process version number
+                    #
-                    my ($suffix, $version, $isaR, $isaWip, $buildVersion ) = massageVersion($pkg_ver, $pkg_name);
+                    my ($suffix, $version, $isaR, $isaWip, $buildVersion, $isaPatch ) = massageVersion($pkg_ver, $pkg_name);
                     $versions{$pv_id}{version} = $version;
                     $versions{$pv_id}{buildVersion} = $buildVersion;
                     $versions{$pv_id}{isaWip} = 1 if ( $isaWip );
+                    $versions{$pv_id}{isaPatch} = 1 if ( $isaPatch );
+                    # Remove entries that address themselves
+                    push (@{$versions{$last_pv_id}{next}}, $pv_id) unless ($pv_id == $last_pv_id || $last_pv_id == 0 || $isaPatch) ;
+                    #
-                    #   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.
+                    #
     my ($major, $minor, $patch, $build, $suffix);
     my $result;
     my $buildVersion;
     my $isaRipple;
     my $isaWIP;
+    my $isaPatch;
     $build = 0;
 #print "--- $name, $version\n";
     $version =~ s~^_~~;
     $version =~ s~^${name}_~~;
     #   xxxxxxxxx.nnnn.cots
+    #
     if ( $version =~ m~(.*)\.cots$~ ) {
         my $cots_base = $1;
         $suffix = '.cots';
-        if ( $version =~ m~(.*?)\.([0-9]{4})\.cots$~ )
+        if ( $version =~ m~(.*?)\.([0-9]{4,5})\.cots$~ )
+        {
             $result = $1 . sprintf (".%4.4d", $2) . $suffix;
+        }
         else
+        {
             $result = $cots_base . '.0000.cots';
+        }
+        if ( $result =~ m~(.*)\.(\d+)(\d\d\d)\.cots$~ )
+        {
+            $buildVersion = [$1, 0 , $2, $3 ];
+        }
+    }
+    #
     #   Convert version into full form for comparisions
     #       nnn.nnn.nnn.[p]nnn.xxx
     #       nnn.nnn.nnn.[p]nnn-xxx
         $minor = $2;
         $patch = $3;
         $build = $4;
         $suffix = defined $6 ? ".$6" : '';
         $isaRipple = 0;
+        $isaPatch = 1;
+    }
+    #
     #       nn.nnn.nnnnn.xxx
     #       nn.nnn.nnnnn-xxx
     #       nnn.nnn.nnnx.xxx
         $major = $1;
         $minor = $2;
         $patch = 0;
         $suffix = $3;
+    }
+    #
+    #       nnn.nnn.c.xxx
+    #
+    elsif ( $version =~ m~^(\d+)\.(\d+)\.(\w)(\.\w+)$~ ) {
+        $major = $1;
+        $minor = $2;
+        $patch = ord($3);
+        $suffix = $4;
+    }
+    #
     #       nnn.nnn.nnnz
+    #
     elsif ( $version =~ m~^(\d+)\.(\d+)\.(\d+)([a-z])$~ ) {
+    #
     #       ???REV=???
+    #
     elsif ( $version =~ m~REV=~ ) {
         $suffix = '.cots';
-        $result = $version . '.0000.cots';
+        $result = $version . '.000000.cots';
+    }
+    #
     #   Wip Packages
     #   (nnnnnn).xxx
     #   Should be essential, but want to sort very low
+    #
     elsif ($version =~ m~\((.*)\)(\..*)?~) {
         $suffix = $2 || '';
-        $result = "000.000.000.000$suffix";
+        $result = "000.000.000.00000$suffix";
         $isaWIP = 1;
+    }
+    #
     #   !current
+    #
     elsif ($version eq '!current' || $version eq 'current_$USER' || $version eq 'current' || $version eq 'beta' || $version eq 'latest' || $version eq 'beta.cr' || $version eq 'CREATE') {
         $suffix = '';
-        $result = "000.000.000.000$suffix";
+        $result = "000.000.000.00000$suffix";
         $isaWIP = 1;
+    }
+    #
     #   Also WIP: FINRUN.103649.BEI.WIP
     elsif ($version =~ m~(\.[a-zA-Z]+)\.WIP$~) {
         $suffix = lc($1);
-        $result = "000.000.000.000$suffix";
+        $result = "000.000.000.00000$suffix";
         $isaWIP = 1;
+    }
+    #
     #   Also ERGOFSSLS190100_015
         $patch = $3;
         $build = $4;
         $suffix = $5 || '.sls';
         $isaRipple = 0;
+    }
+    #
+    #   nnnn
+    #
+    elsif ($version =~ m~[0-9]{4}~) {
+        $suffix = '';
+        $major = 0;
+        $minor = 0;
+        $patch = $version;
+        $build = 0;
+    }
+    #
     #   Stuff we don't yet handle
+    #
     else  {
         Warning ("Unknown version number: $name,$version");
             $major = 0;
             $minor = 0;
             $patch = 0;
+        }
-        $result = sprintf("%3.3d.%3.3d.%3.3d.%3.3d%s", $major,$minor,$patch,$build,$suffix || '.0000');
+        $result = sprintf("%3.3d.%3.3d.%3.3d.%5.5d%s", $major,$minor,$patch,$build,$suffix || '.0000');
         $buildVersion = [ $major, $minor, $patch, $build ];
+    }
     $suffix = lc( $suffix );
     if ( exists $suffixFixup{$suffix} )
+    {
         $suffix = $suffixFixup{$suffix} ;
+    }
-    return ($suffix, $result, $isaRipple, $isaWIP, $buildVersion );
+    return ($suffix, $result, $isaRipple, $isaWIP, $buildVersion, $isaPatch );
+}
 #-------------------------------------------------------------------------------
 # Function        : vcsCleanup
+#
+#
 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";
+        #
         if ( scalar @multiplePaths > 1 )
+        {
             push @text, '|';
             push @text, 'Multiple Paths';
+            if ( $opt_AllowMuliplePaths )
+            {
+                push @text, 'Multiple Paths allowed:' . scalar @multiplePaths . ' found';
+            }
+            else
+            {
-            push @text, @multiplePaths;
+                push @text, @multiplePaths;
+            }
+        }
+        #
         #   Bad essentials
+        #
         push @text, 'Creation Date: yyyy-mm-dd';
         push @text, '(Coded information)';
         push @text, '|{Code';
         push @text, '|{N: Not Locked';
         push @text, 'b: Bad Singleton';
-        push @text, 'd: A dependency';
         push @text, 'B: Bad VCS Tag';
+        push @text, 'd: Package in dpkg_archive';
         push @text, 'D: DeadWood';
-        push @text, 'e: Essential BOM Version';
         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, 'p: Is a Patch';
         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';
     sub genLabelText
+    {
         my ($entry) = @_;
         my @label;
+        if ( $opt_fileList ) {
+            push @label, $versions{$entry}{realLabel};
+        } else {
-        push @label, $versions{$entry}{name} if ( $multiPackages );
+            push @label, $versions{$entry}{name} if ( $multiPackages );
-        push @label, $versions{$entry}{vname};
+            push @label, $versions{$entry}{vname};
+        }
 #        push @label, $entry;       # Add PVID
         push @label, substr( $versions{$entry}{created}, 0, 10); #  2008-02-19
 #        push @label, 'V=' . $versions{$entry}{maxVersion};
 #        push @label, 'B=' . $versions{$entry}{svnBranchTip} if ( exists $versions{$entry}{svnBranchTip} );
-        my $reason = '';
-        if (exists $versions{$entry}{Essential})
-        {
-            $reason = 'E';
-            if (exists $versions{$entry}{Reason})
-            {
-                if ( $versions{$entry}{Reason} =~ m~bom~ )
-                {
-                    $reason = 'e';
-                }
-                if ( $versions{$entry}{Reason} =~ m~Depend~ )
-                {
-                    $reason .= 'd';
-                }
-            }
-        }
         my $stateText = '';
         $stateText .= 'N' if ($versions{$entry}{locked} eq 'N');
         $stateText .= 'b' if (exists $versions{$entry}{badSingleton});
         $stateText .= 'B' if (exists $versions{$entry}{badVcsTag});
         $stateText .= 'G' if (exists $versions{$entry}{GluedIn});
         $stateText .= 't' if (exists $versions{$entry}{MakeTree});
-#        $stateText .= 'E' if (exists $versions{$entry}{Essential});
+        $stateText .= 'E' if (exists $versions{$entry}{Essential});
-        $stateText .= $reason if ( $reason );
+        $stateText .= 'd' if (exists $versions{$entry}{dpkgArchive});
         $stateText .= 'D' if (exists $versions{$entry}{DeadWood});
+        $stateText .= 'p' if ( $versions{$entry}{isaPatch} );
         $stateText .= 'R' if ( $versions{$entry}{isaRipple} );
         $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} );
     $opt_vobMap = $ScmRepoMap{$packageNames}{repo}
         if (exists $ScmRepoMap{$packageNames});
     $opt_protected = $ScmRepoMap{$packageNames}{protected}
         if (exists $ScmRepoMap{$packageNames}{protected});
+    $opt_vobMap = '' if ( $opt_repoSubdir );
+    #
     #   Free the memory
+    #
     %ScmRepoMap = ();
+    #
     #   Calculate Target Repo
+    #
     Warning ("No VOB Mapping found")
-        unless ($opt_vobMap);
+        unless ($opt_vobMap || ($opt_repoSubdir && $opt_repo));
     Error("No repository specified. ie -repo=DevTools or -repo=COTS")
         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;
-    Verbose( "Repo URL: $svnRepo");
+    Message( "Repo URL: $svnRepo");
+}
 #-------------------------------------------------------------------------------
 # Function        : getEssenialPackageVersions
         next unless ( exists  $pkg_ids{ $ScmPackages{$_}{pkgid} } );
         push @EssentialPackages, $_;
         Error ("Essential Package Version not in extracted Release Manager Data: $_")
             unless ( exists $versions{$_} );
         $versions{$_}{Essential} = 1;
-        $versions{$_}{Reason} = $ScmPackages{$_}{Reason} if exists $ScmPackages{$_}{Reason}  ;
         # Retain which RM Release this package-version is the tip
         # Release of
         foreach my $rtag_id ( @{$ScmPackages{$_}{'release'}} )
+        {
+    #
     #   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}{$fromBranch} )
+        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;
+        }
+    }
         next if ( m~^\s*\#~ );
         my @data = split( /\s+/, $_);
 #print "@data\n";
         if ( @data == 3 )
+        {
+#print "--- $data[2]\n";
+            my $pkg_name;
+            my $pkg_ver;
-            $data[2] =~ m~^(.*)_(.*)~;
+            if ($data[2] =~ m~^(.*)[_](.*)~ ) {
-            my $pkg_name = $1;
+                $pkg_name = $1;
-            my $pkg_ver = $2;
+                $pkg_ver = $2;
+                if ( $pkg_ver =~ m~[0-9]+~ ) {
-            $pkg_ver =~ s~^[a-zA-Z]\.*~~;
+                    $pkg_ver =~ s~^[a-zA-Z]\.*~~;
+                }
+            } else {
+                $pkg_name = $data[2];
+                $pkg_ver = '0.0.0';
+            }
 print "$data[2] : $pkg_name, $pkg_ver\n";
 #           Expecting Clearcase format:
 #               2011-08-30T13:49:21+08
 #               2010-11-16T03:24:34Z
     -[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
     -filelist=path     - Use named list of files
+    -ccbase=VOB        - Clearcase Vob to use for filelist
     -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_importpackage3.pl – Rev 2764 → 4003