origen 0.7.13 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a2ffd1baf04606a1952e522d9190b9c9c0e038a
-  data.tar.gz: a27a278c0fdb4f16281b1d5db83e91c52e1c08e0
+  metadata.gz: 40391053371e047fa27346b149db5b2ff484918a
+  data.tar.gz: 3f50782d9a9a343ed66b4a7394617f17abf0142e
 SHA512:
-  metadata.gz: f79c467226a03fcd2fe8a386d655e6d34601d5f0176de6fdbd96da5d3fead88c560a3443c57ed2c883acb1a775b246fd33c9ed506ae7edf9dc96825f024ea76e
-  data.tar.gz: cc795d2f261f34a84ac224fa4e0582cfc64fa21d49be533fb0dadbbe61878922ecbd6b28d6ebb08aea49520b8ddb5abdcbcb7c618ecfd79b8a067acb01d869e0
+  metadata.gz: 346f223195d1f35d701b68939c50d4af4f83e2860bc3f831a06e34f9b4c1eb1f22b5ac4b67c9fbcad545e97557c985716a5c0e8314914824bd7d64026d4184ae
+  data.tar.gz: 25dac8be070f239281329c89a6b45ac480ca2105513c82b71fa7be66ad6f5961441e4f2da3ca7f5285544af9326e66623e57d00e2b5009743599c5eec0229746

data/bin/origen

@@ -238,25 +238,32 @@ begin
 rescue Exception => e
   unless e.is_a?(SystemExit) && e.status == 0
     puts
-    puts e.message unless e.is_a?(SystemExit)
     if Origen.app_loaded?
+      puts "COMPLETE CALL STACK"
+      puts "-------------------"
+      puts e.message unless e.is_a?(SystemExit)
+      puts e.backtrace
+
+      puts
+      puts "APPLICATION CALL STACK"
+      puts "----------------------"
+      puts e.message unless e.is_a?(SystemExit)
       # Only print out the application stack trace by default, if verbose logging is
       # enabled then output the full thing
       e.backtrace.each do |line|
         path = Pathname.new(line)
         if path.absolute?
-          if Origen.log.level == :verbose || (line =~ /^#{Origen.root}/ && line !~ /^#{Origen.root}\/lbin/)
+          if line =~ /^#{Origen.root}/ && line !~ /^#{Origen.root}\/lbin/
             puts line 
           end
         else
-          if Origen.log.level == :verbose
-            puts line
-          else
-            puts line unless line =~ /^.\/lbin/
-          end
+          puts line unless line =~ /^.\/lbin/
         end
       end
     else
+      puts "COMPLETE CALL STACK"
+      puts "-------------------"
+      puts e.message unless e.is_a?(SystemExit)
       puts e.backtrace
     end
     exit 1

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 7
-  BUGFIX = 13
+  BUGFIX = 14
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/helpers/url.rb

@@ -4,6 +4,22 @@ module Origen
       # Helper methods that are available to all templates
       module Helpers
 
+        def self.archive_name=(val)
+          @archive_name = val
+        end
+
+        def self.archive_name
+          @archive_name
+        end
+
+        def generate_hard_links?
+          !!archive_name
+        end
+
+        def archive_name
+          Origen::Generator::Compiler::Helpers.archive_name
+        end
+
         def current_path
           path(options[:top_level_file].to_s.sub(/^.*\/templates\/web/, '').sub(/\..*$/, ''))
         end
@@ -15,7 +31,7 @@ module Origen
         # Like current_url except always returns the latest version of the url and
         # not one with an embedded production version
         def current_latest_url
-          current_url.sub(_version, 'latest')
+          current_url.sub(_archive, 'latest')
         end
 
         def path(p)
@@ -27,7 +43,7 @@ module Origen
           elsif Origen.app.deployer.deploy_to_git?
             "#{root_path}#{p}"
           else          
-            "#{root_path}/#{_version}#{p}"
+            "#{root_path}/#{_archive}#{p}"
           end
         end
 
@@ -43,17 +59,11 @@ module Origen
           domain.sub /#{root_path}$/, ''
         end
 
-        def _version
-          # Special case for Origen core..
-          if Origen.top == Origen.root
-            version = Origen.version
+        def _archive
+          if generate_hard_links?
+            archive_name.to_s.gsub(".", "_")
           else
-            version = Origen.app.version
-          end
-          if version.development?
             'latest'
-          else
-            version.to_s.gsub(".", "_")
           end
         end
 

data/lib/origen/application/configuration.rb

@@ -65,13 +65,19 @@ module Origen
         @compile_only_dot_erb_files = true
         # Functions used here since Origen.root is not available when this is first instantiated
         @output_directory = -> { "#{Origen.root}/output" }
-        @reference_directory = -> { "#{Origen.root}/.ref" }
+        @reference_directory = lambda do
+          if Origen.config.output_directory.to_s =~ /(\\|\/)output(\\|\/)/
+            Origen.config.output_directory.to_s.sub(/(\\|\/)output(\\|\/)/, '\1.ref\2')
+          else
+            "#{Origen.root}/.ref"
+          end
+        end
         @release_directory = -> { Origen.root }
         @release_email_subject = false
         @log_directory = -> { "#{Origen.root}/log" }
         @pattern_name_translator = ->(name) { name }
         @pattern_directory = -> { "#{Origen.root}/pattern" }
-        @pattern_output_directory = -> { "#{Origen.root}/output/patterns" }
+        @pattern_output_directory = -> { Origen.app.config.output_directory }
         @history_file = -> { "#{Origen.root}/doc/history" }
         @default_lsf_action = :clear
         @proceed_with_pattern = ->(_name) { true }

data/lib/origen/commands/new.rb

@@ -69,7 +69,7 @@ md5 = "#{tmp}/md5#{version}"
 if File.exist?(tmp_dir) && File.exist?(md5)
   old_sig = File.read(md5)
   hash = Digest::MD5.new
-  Dir["#{tmp_dir}/**/*"].each do |f|
+  Dir["#{tmp_dir}/**/{*,.*}"].each do |f|
     hash << File.read(f) unless File.directory?(f)
   end
   new_sig = hash.hexdigest
@@ -99,7 +99,7 @@ unless all_present
   end
 
   hash = Digest::MD5.new
-  Dir["#{tmp_dir}/**/*"].each do |f|
+  Dir["#{tmp_dir}/**/{*,.*}"].each do |f|
     hash << File.read(f) unless File.directory?(f)
   end
   File.open(md5, 'w') { |f| f.write(hash.hexdigest) }

data/lib/origen/commands/web.rb

@@ -40,7 +40,11 @@ The following options are available:
     opts.on('-t', '--target NAME', String, 'Override the default target, NAME can be a full path or a fragment of a target file name') { |t| options[:target] = t }
     opts.on('-r', '--remote', 'Use in conjunction with the compile command to deploy files to a remote web server') {  options[:remote] = true }
     opts.on('-a', '--api', 'Generate API documentation after compiling') {  options[:api] = true }
-    opts.on('--archive ID', String, 'Archive the documents after compiling or deploying remotely') {  |id| options[:archive] = id }
+    opts.on('--archive ID', String, 'Archive the documents after compiling or deploying remotely') do |id|
+      options[:archive] = id
+      require "#{Origen.top}/helpers/url"
+      Origen::Generator::Compiler::Helpers.archive_name = id
+    end
     opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
     opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
     opts.on('--no-serve', "Don't serve the website after compiling without the remote option") { options[:no_serve] = true }

data/lib/origen/generator/flow.rb

@@ -22,7 +22,9 @@ module Origen
         if sub_flow
           interface = Origen.interface
           opts = Origen.generator.option_pipeline.pop || {}
+          Origen.interface.startup(options) if Origen.interface.respond_to?(:startup)
           interface.instance_exec(opts, &block)
+          Origen.interface.shutdown(options) if Origen.interface.respond_to?(:shutdown)
           if Origen.tester.doc?
             Origen.interface.flow.stop_section
           end
@@ -32,7 +34,10 @@ module Origen
           interface = Origen.reset_interface(options)
           Origen.interface.set_top_level_flow
           Origen.interface.flow_generator.set_flow_description(Origen.interface.consume_comments)
+          options[:top_level] = true
+          Origen.interface.startup(options) if Origen.interface.respond_to?(:startup)
           interface.instance_eval(&block)
+          Origen.interface.shutdown(options) if Origen.interface.respond_to?(:shutdown)
           interface.close(flow: true)
         end
       end

data/lib/origen/generator/job.rb

@@ -59,11 +59,25 @@ module Origen
       end
 
       def output_pattern_directory
-        Origen.file_handler.output_directory
+        @output_pattern_directory ||= begin
+          dir = Origen.app.config.pattern_output_directory
+          if tester.respond_to?(:subdirectory)
+            dir = File.join(dir, tester.subdirectory)
+          end
+          FileUtils.mkdir_p(dir) unless File.exist?(dir)
+          dir
+        end
       end
 
       def reference_pattern_directory
-        Origen.file_handler.reference_directory
+        @reference_pattern_directory ||= begin
+          dir = Origen.file_handler.reference_directory
+          if tester.respond_to?(:subdirectory)
+            dir = File.join(dir, tester.subdirectory)
+          end
+          FileUtils.mkdir_p(dir) unless File.exist?(dir)
+          dir
+        end
       end
 
       def output_prefix

data/lib/origen/generator/pattern.rb

@@ -220,7 +220,11 @@ module Origen
         c2 'GENERATED:'
         c2 "  Time:    #{Origen.launch_time}"
         c2 "  By:      #{Origen.current_user.name}"
-        c2 "  Command: origen g #{job.requested_pattern} -t #{Origen.target.file.basename}"
+        l = "  Command: origen g #{job.requested_pattern} -t #{Origen.target.file.basename}"
+        if Origen.environment && Origen.environment.file
+          l += " -e #{Origen.environment.file.basename}"
+        end
+        c2(l)
         c2 '*' * 75
         c2 'ENVIRONMENT:'
         c2 '  Application'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.7.14
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -652,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit