origen 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2daf3de9eed406194f48f3fe3b3955edaea1a65
-  data.tar.gz: 04a5d37c42ca594238a4264f6a2944c201966343
+  metadata.gz: 9c926e1ebfe3bf41c399fc560bb0ec3ad2479a44
+  data.tar.gz: 6e64ed3fc716c15c4dea3b6c2ab24bdf802d0394
 SHA512:
-  metadata.gz: 8ce464539eb86eac9a0593c0757fa0ebf9fc63bede8230e803eb7acef8b07a51ab8b7f8c3a28b581a3e9315738813bcab27a3f00d61a9e72dafdffce41da4971
-  data.tar.gz: 94f3df26fd5ca0b4bdd53cf5d4626d100e7a28dc3a497f1bf2cd0aaa6c7a8536ec44beda18f29b4a58c4712bec2e7802fdc476d0807e0c66df88c195effbea4a
+  metadata.gz: 29ea680eb81808578c799ee17740c5dbacb2bc125ecbf238c5ca8a9be60c49cebada2cafac48eb6b775835798bee0b2a0b148efc46d43f439a8e52dc42757a03
+  data.tar.gz: 9218d1892cfd068eca58b8660ebd12b984d4783d20e4524ef3d281f3444ccdd2f3a71f952b8f133879e92f9b50b91c7575cdcb3d9c8151c3ae50e3df57701397

data/bin/origen

@@ -168,6 +168,13 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
           end
         end
         if result
+          # This is a shim to help NXP run regression tests between an old version of an app running
+          # RGen and a new version running Origen
+          origen = File.join(ENV['BUNDLE_BIN'], "origen")
+          rgen = File.join(ENV['BUNDLE_BIN'], "rgen")
+          if File.exist?(rgen) && !File.exist?(origen) && Origen.os.linux?
+            exec "ln -s #{rgen} #{origen}"
+          end
           exec "origen #{ARGV.join(' ')}"
           exit 0
         else

data/config/application.rb

@@ -4,7 +4,7 @@ class OrigenCoreApplication < Origen::Application
 
   config.name = "Origen Core"
   config.initials = "Origen"
-  config.rc_url = "ssh://git@github.com:Origen-SDK/origen.git"
+  config.rc_url = "git@github.com:Origen-SDK/origen.git"
   config.semantically_version = true
   config.release_externally = true
   config.gem_name = "origen"

data/config/commands.rb

@@ -41,13 +41,12 @@ when "examples", "test"
 when "regression"
   # You must tell the regression manager up front what target will be run within
   # the block
-  options[:targets] = %w(debug v93k jlink bdm)
+  options[:targets] = %w(debug v93k jlink)
   Origen.regression_manager.run(options) do |options|
     Origen.lsf.submit_origen_job "generate j750.list -t debug --plugin origen_core_support"
     Origen.lsf.submit_origen_job "generate v93k_workout -t v93k --plugin none"
     Origen.lsf.submit_origen_job "generate dummy_name port -t debug --plugin none"
     Origen.lsf.submit_origen_job "generate jlink.list -t jlink --plugin none"
-    Origen.lsf.submit_origen_job "generate bdm.list -t bdm --plugin none"
     Origen.lsf.submit_origen_job "compile templates/test/set3 -t debug --plugin none"
     Origen.lsf.submit_origen_job "compile templates/test/inspections.txt.erb -t debug --plugin none"
     Origen.lsf.submit_origen_job "program program -t debug --plugin none"

data/config/version.rb

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

data/lib/origen/application/plugins.rb

@@ -35,6 +35,7 @@ module Origen
 
       # Returns the current plugin's application instance
       def current
+        return nil if @temporary == :none
         return nil if @disabled
         name = @temporary || @current ||= Origen.app.session.origen_core[:default_plugin]
         find { |p| p.name.to_sym == name } if name
@@ -52,11 +53,7 @@ module Origen
 
       def temporary=(name)
         name = name.to_sym if name
-        if name == :none
-          @temporary = nil
-        else
-          @temporary = name
-        end
+        @temporary = name
       end
 
       # Temporarily set the current plugin to nil

data/lib/origen/commands/program.rb

@@ -55,7 +55,7 @@ _with_doc_tester(options) do
   Origen.app.plugins.temporary = options[:current_plugin] if options[:current_plugin]
   Origen.environment.temporary = options[:environment] if options[:environment]
   Origen.target.temporary = options[:target] if options[:target]
-  Origen.app.load_target!  # This initial load is required to appply any configuration
+  Origen.app.load_target!  # This initial load is required to apply any configuration
   # options present in the target, it will loaded again before
   # each generate/compile job
 

data/lib/origen/regression_manager.rb

@@ -54,9 +54,10 @@ module Origen
           # Generate the reference files
           save_options(options)
           Origen.with_origen_root(reference_origen_root) do
-            Origen.with_disable_origen_version_check(all_processes: true) do
+            disable_origen_version_check do
               Dir.chdir reference_origen_root do
                 Bundler.with_clean_env do
+                  system 'rm -rf lbin'
                   system 'origen -v'  # Used to make sure gems install
                   Origen.log.info '######################################################'
                   Origen.log.info 'running regression command in reference workspace...'
@@ -85,6 +86,16 @@ module Origen
       end
     end
 
+    def disable_origen_version_check
+      if Origen.respond_to?(:with_disable_origen_version_check)
+        Origen.with_disable_origen_version_check(all_processes: true) do
+          yield
+        end
+      else
+        yield
+      end
+    end
+
     def summarize_results(options = {})
       Origen.lsf.build_log
       stats = Origen.app.stats
@@ -243,7 +254,15 @@ module Origen
       if version.downcase == 'last'
         Origen.app.version_tracker.versions.last
       elsif version.downcase == 'latest'
-        version
+        if Origen.app.rc.git?
+          if Origen.app.config.rc_workflow == :gitflow
+            'develop'
+          else
+            'master'
+          end
+        else
+          version
+        end
       else
         version
       end

data/lib/origen/revision_control/git.rb

@@ -314,6 +314,7 @@ module Origen
         unless initialized?
           Origen.log.debug "Initializing Git workspace at #{local}"
           git 'init'
+          git 'remote remove origin', verbose: false, check_errors: false
           git "remote add origin #{remote}"
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -648,7 +648,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Semiconductor Developer's Kit