Changeset 37068 for branches/eam_branches/ipp-ops-20130712/ippScripts/scripts/dist_bundle.pl

Timestamp:

Jul 17, 2014, 12:36:19 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) from trunk

Location:

branches/eam_branches/ipp-ops-20130712

Files:

• . (modified) (1 prop)
• ippScripts/scripts/dist_bundle.pl (modified) (4 diffs, 1 prop)

branches/eam_branches/ipp-ops-20130712/ippScripts/scripts/dist_bundle.pl

@@ -67 +67 @@
                       );
 my %empty_cleaned = ();
-
-
+my %empty_cleaned = ();
 
 # Look for programs we need
@@ -496 +495 @@
     } elsif ($stage eq "stack") {
         $type = $stack_cleaned{$rule};
-    } elsif ($stage eq "sky" or $stage eq 'skycal' or $stage eq 'stack_summary') {
+    } elsif ($stage eq "sky" or $stage eq 'skycal' or $stage eq 'stack_summary' or $stage eq 'ff') {
         $type = $empty_cleaned{$rule};
+    } elsif ($stage eq "skycal") {
+        $type = $skycal_cleaned{$rule};
     } else {
         &my_die("$stage is not a valid stage", $component, $PS_EXIT_CONFIG_ERROR);
@@ -588 +589 @@
         # stack_summary stage does not use a config dump file.
         return build_stack_summary_file_list($path_base, \@file_list);
+    } elsif ($stage eq "ff") {
+        if ($component eq 'summary') {
+            # full force summary does not use a config dump file. Cobble together a file list
+            return build_ff_summary_file_list($path_base, \@file_list);
+        } else {
+            $config_file_rule = "PSPHOT.SKY.CONFIG";
+        }
     } else {
         &my_die("$stage is not a valid stage", $component, $PS_EXIT_CONFIG_ERROR);
@@ -742 +750 @@
 }
 
+# psphotFullForceSummary does not produce a config dump file cobble together a file list
+sub build_ff_summary_file_list {
+    my ($path_base, $file_list) = @_;
+
+    my %cmf ;
+    $cmf{file_rule} = "SOURCES";
+    $cmf{name} = "$path_base.cmf";
+    push @$file_list, \%cmf;
+
+    my %log;
+    $log{file_rule} = "LOG";
+    $log{name} = "$path_base.log";
+    push @$file_list, \%log;
+
+    return $file_list;
+}
+
 sub my_die
 {