lib/origen/generator/job.rb in origen-0.60.7 vs lib/origen/generator/job.rb in origen-0.60.8

- old
+ new

@@ -52,10 +52,11 @@ # If the pattern name has been overridden by an interator use that return @output_pattern_filename if @output_pattern_filename if !@pattern && !@output_file_body fail 'Sorry the output_pattern is not available until the job has been run' end + body = @output_file_body ? @output_file_body : File.basename(@pattern, '.rb') output_prefix + body + output_postfix + split_number + output_extension end # This can be modified at runtime by the pattern generator in response to @@ -153,11 +154,11 @@ if Origen.running_simulation? Origen.log.start_job(strip_dir_and_ext(@requested_pattern), :simulator) else Origen.log.start_job(strip_dir_and_ext(@requested_pattern), :pattern_generator) end - Origen.generator.pattern.reset # Resets the pattern controller ready for a new pattern + Origen.generator.pattern.reset # Resets the pattern controller ready for a new pattern # Give the app a chance to handle pattern dispatch skip = false Origen.app.listeners_for(:before_pattern_lookup).each do |listener| skip ||= !listener.before_pattern_lookup(@requested_pattern) end @@ -188,10 +189,10 @@ @pattern = Origen.generator.pattern_finder.find(@requested_pattern, @options) if @pattern.is_a?(Hash) @output_file_body = @pattern[:output] @pattern = @pattern[:pattern] end - load @pattern unless @pattern == :skip # Run the pattern + load @pattern unless @pattern == :skip # Run the pattern end end end rescue Exception => e # Whoever has aborted the job is responsible for cleaning it up