WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/jats_update_release.pl

 use warnings;
 use JatsEnv;
 use JatsError;
 use JatsSystem;
 use JatsRmApi;
+use ArrayHashUtils;
 use DBI;
 use Getopt::Long;
 use Pod::Usage;                             # required for help support
 use Storable qw (dclone);
 my $opt_rootdir;
 my @opt_filters;
 my $opt_projectdir;
 my $opt_releasedir;
 my $opt_test;
+my @opt_addFilters;
+my @opt_delFilters;
+#
 #   Constants
+#
 my $CONFFILE = ".updateRelease";
+#
 #   The directory we copy to.
+#
 my $projectDestDir;
+#
 #   Configuration file vars
+#
 my @confFilters;
 my $writeConf = 0;
+my %filtersUsed;
 # -------------------------------------------------------------------------
 sub GetYesNo
+#
 # -------------------------------------------------------------------------
                 "help:+"            => \$opt_help,              # flag, multiple use allowed
                 "manual:3"          => \$opt_help,              # flag, multiple use allowed
                 "verbose:+"         => \$opt_verbose,           # flag
                 "sbomid|sbom_id=s"  => \@opt_sbom_ids,          # multiple numbers
                 "filter=s"          => \@opt_filters,           # multiple strings
+                "addfilter=s"       => \@opt_addFilters,        # multiple strings
+                "delfilter=s"       => \@opt_delFilters,        # multiple strings
                 "rootdir=s"         => \$opt_rootdir,           # string
                 "projectdir=s"      => \$opt_projectdir,        # string
                 "releasedir=s"      => \$opt_releasedir,        # string
                 "test"              => \$opt_test,              # flag
                 );
 # validate config and command line options
 if ( $#opt_filters > -1 && $#confFilters > -1 )
+{
     Message("Filters supplied on Command line", @opt_filters);
     Message("Filters in release configuration file", @confFilters);
-    if ( !GetYesNo("Replace Config Filters with command line Filters, be carefull as this may change the copy rules") )
+    if ( !GetYesNo("Replace Config Filters with command line Filters, be careful as this may change the copy rules") )
+    {
         Error("Script terminated by user.");
+    }
-    @confFilters = @opt_filters;
+    @confFilters = ();
+    foreach my $element (@opt_filters) {
+        UniquePush (\@confFilters, $_ ) foreach  ( split(/,/, $element));
+    }
     $writeConf = 1;
+}
 elsif ( $#opt_filters > -1 && $#confFilters == -1 )
+{
     Message("Filters supplied on Command line will be written to config file for release", @opt_filters);
-    @confFilters = @opt_filters;
+    @confFilters = ();
+    foreach my $element (@opt_filters) {
+        UniquePush (\@confFilters, $_ ) foreach  ( split(/,/, $element));
+    }
     $writeConf = 1;
+}
 elsif ( $#opt_filters == -1 && $#confFilters > -1 )
+{
     Message("Filters loaded from config file for release will be used", @confFilters) if ( IsVerbose(1) );
 elsif ( $#opt_filters == -1 && $#confFilters == -1 )
+{
     Error("No Filters supplied on command line or release config file");
+}
+if ( @opt_addFilters )
+{
+    Message ("Adding command line filters to the release config file");
+    foreach my $element (@opt_addFilters) {
+        UniquePush (\@confFilters, $_ ) foreach  ( split(/,/, $element));
+    }
+    $writeConf = 1;
+}
+if ( @opt_delFilters )
+{
+    Message ("Deleting command line filters to the release config file");
+    foreach my $element (@opt_delFilters) {
+        ArrayDelete (\@confFilters, $_ ) foreach  ( split(/,/, $element));
+    }
+    $writeConf = 1;
+}
 Message("Copying packages from $ENV{GBE_DPKG} to $projectDestDir");
 if ( ! -d $projectDestDir )
+{
     if ( defined($opt_test) )
                     # the filelist array of files to copy
                     foreach my $filter ( @confFilters )
+                    {
                         foreach my $srcPath ( glob("$srcDir/$filter") )
+                        {
+                            next unless ( -f $srcPath );
                             $foundFiltered = 1;
+                            $filtersUsed{$filter} = 1;
-                            my $srcFile = basename($srcPath);
+                            my $dstFile = basename($srcPath);
+                            my $srcFile = $srcPath;
+                            $srcFile =~ s~^$srcDir/~~;
-                            push(@filelist, $srcFile) if ( ! -f "$dstDir/$srcFile" )
+                            push(@filelist, $srcFile) if ( ! -f "$dstDir/$dstFile" );
+                        }
+                    }
                     # if no files found using filters then issue warning
                     if ( $foundFiltered == 0 )
+                    {
                         Warning("No Files found for Package Version $PKG_NAME/$PKG_VERSION using supplied filters");
+                    }
-                    #else we have found filtered files but they may already exist and if so filelist may be empty, so check it b4 doing anything
+                    # else we have found filtered files but they may already exist
+                    # if so filelist may be empty, so check it b4 doing anything
                     elsif ( $#filelist > -1 )
+                    {
                         Message("Copying files for package $PKG_NAME version $PKG_VERSION");
                         if ( defined($opt_test) )
+                        {
+                {
                     # However if srcDir does not exist but pkgDir does exist then the package version is missing which maybe an issue
                     Warning("Missing Version $PKG_VERSION for Package $PKG_NAME in dpkg_archive");
+                }
+            }
+            #
+            #   Report filter elements that where not used.
+            #
+            my @notUsed;
+            foreach my $filter ( @confFilters )
+            {
+                next if ( exists $filtersUsed{$filter} );
+                push @notUsed, $filter
+            }
+            Warning ("Unused filter rules:", @notUsed )
+                if ( @notUsed );
+        }
         else
+        {
             Error("No Boms found for Deployment Manager SBomId(s) " . join(",", @opt_sbom_ids) );
+        }
                        - from the Deployment Manager Project Name
     -releasedir=xxx    - Override the project release directory name that normally
                        - comes from the Deployment Manager Project Release Name
     -filter=xxx        - Specifies a shell wildcard used to filter package files to copy
                        - Can be specified multiple times to use multiple filters
+    -addfilter=xxx     - Add a new filter to the existing filter set
+    -delfilter=xxx     - Delete a filter from the existing filter set
     -test              - Just log actions without copying files.
     -verbose           - Enable verbose output
 =head1 OPTIONS
 If the option is specified it must be used with the -projectdir option and must be a directory
 name that exists in the projectdir.
 Additionally if used to populate a release then it must always be used to update the release.
-=item B<-filter=xxx>
+=item B<-filter=xxx[,yyy]>
-This option specifies a shell wildcard filter rule that is used to determine which files are
+This option specifies a comma separated list of shell wildcard filter rule that
-copied from package version directory in GBE_DPKG to the release directory.  This can be
+is used to determine which files are copied from package version directory in
+GBE_DPKG to the release directory. This can be supplied multiple times to
-supplied multiple times to specify rules for copying.
+specify rules for copying.
 This must be specified on the command line the first time this command is run against a release
 and packages are copied to the project/release directory.  These values are then written to a
 config file in the project/release directory so the same values can be used on subsequent runs.
 In these subsequent runs this option need not be specified as the config items will be used, however
 The values of these will depend on what builds are required for each project.  Some examples are
 --filter='*-SOLARIS10_SPARC64-[DP].pkg.gz'
 --filter='*-SOLARIS10_SPARC86-[DP].pkg.gz'
 --filter='*-SOLARIS10_X64-[DP].pkg.gz'
 --filter='*-SOLARIS10_X86-[DP].pkg.gz'
---filter='*-WIN32.exe'
+--filter='*-WIN32.exe,*.deb'
+--filter='scripts/*.sh'
+=item B<-addFilter=xxx[,yyy]>
+This option allows new filters to be added to an existing set of filters. This
+option can be specified multiple times.
+=item B<-delFilter=xxx[,yyy]>
+This option deletes one or more filter rules from an existing set of filters. This
+option can be specified multiple times.
 =item B<-test>
 This option will display what would be copied without actually copying anything

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/jats_update_release.pl – Rev 361 → 3987