origen_debuggers 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3953a38f824c2c77649cf0059f8176f646396847
-  data.tar.gz: dbf6a2c4c0a22d7aff1ad56468e914216aa5ff65
+  metadata.gz: 316e1fff3e0b232218989db707a3abaf54e7b896
+  data.tar.gz: e788a582944ef7adba01076863360b5679007327
 SHA512:
-  metadata.gz: f18be4760f48bc01f20eb6612a84ddd1cef548e47b9542a5e92558027b622cac8e1c74cba855995520028fe87ec590e71b87f34d16ae3ed2478d9d115643963b
-  data.tar.gz: 155582f087d66bd897e38b211f285ce03537f497e805ecab57fd94079b31181c59891ce7ed6428d69833589e6364f64fe0cde714e1a79785d488002c9064951b
+  metadata.gz: 4f9d2236c2ed8820c478ebaf1477923932c83c994fcd9fdf58eb28aea784edaa110822cae92a8a4f4ed1bb988a1b3caa90fb87511a4262c9bea5822c55cc13d6
+  data.tar.gz: d44485a53359752c8cedb24558838365b49e4991dec063941ba7c9fe9bb843a1b49b6bb3b5d76009fd6c87973dbd3ddcaaa028c92844e9ddf92d64cc76ff3823

data/bin/fix_my_workspace

@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby
+$VERBOSE = nil  # Don't care about world writable dir warnings and the like
+
+if $_fix_my_workspace_version_check
+  $_fix_my_workspace_version = '0.7.0'
+else
+  if File.exist?(File.expand_path('../../lib/origen.rb', __FILE__))
+    # If this script is being run from within an origen-core workspace, use that Origen-core,
+    # not the system-installed origen-core version.
+    $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+    require 'origen'
+  else
+    # Use system-installed Origen (the gem in system Ruby)
+    require 'origen'
+  end
+
+  if !Origen.site_config.gem_manage_bundler
+    puts 'Sorry but you have opted to manage Bundler yourself via your Origen site config, and this means'
+    puts 'that I cannot make certain assumptions about how your workspace is configured.'
+    puts 'You will need to either resolve this problem yourself, or else change the value of'
+    puts 'gem_mange_bundler to true.'
+    puts 'See here for more details on how to do that: http://origen-sdk.org/origen/guides/starting/company/'
+
+  else
+    ENV['BUNDLE_GEMFILE'] = File.join(Origen.root, 'Gemfile')
+    ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
+    ENV['BUNDLE_BIN'] = File.join(Origen.root, 'lbin')
+
+    # Force copy system gems to local gems
+    if Origen.site_config.gem_use_from_system
+      local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
+      gem_dir = Pathname.new(Gem.dir)
+
+      Origen.site_config.gem_use_from_system.each do |gem, version|
+        begin
+          # This will raise an error if the system doesn't have this gem installed, that
+          # will be rescued below
+          spec = Gem::Specification.find_by_name(gem, version)
+
+          local_dir = File.join(local_gem_dir, Pathname.new(spec.gem_dir).relative_path_from(gem_dir))
+          FileUtils.mkdir_p local_dir
+          FileUtils.cp_r("#{spec.gem_dir}/.", local_dir)
+
+          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.cache_file).relative_path_from(gem_dir)))
+          FileUtils.mkdir_p local_file.dirname
+          FileUtils.cp(spec.cache_file, local_file)
+
+          if spec.extension_dir && File.exist?(spec.extension_dir)
+            local_dir = File.join(local_gem_dir, Pathname.new(spec.extension_dir).relative_path_from(gem_dir))
+            FileUtils.mkdir_p local_dir
+            FileUtils.cp_r("#{spec.extension_dir}/.", local_dir)
+          end
+
+          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.spec_file).relative_path_from(gem_dir)))
+          FileUtils.mkdir_p local_file.dirname
+          FileUtils.cp(spec.spec_file, local_file)
+
+        rescue Gem::LoadError
+          # This just means that one of the gems that should be copied from the system
+          # was not actually installed in the system, so nothing we can do about that here
+        end
+      end
+    end
+
+    # Delete lbin
+    FileUtils.rm_rf(ENV['BUNDLE_BIN']) if File.exist?(ENV['BUNDLE_BIN'])
+
+    # Run bundler with correct switches
+    cmd = "bundle install --gemfile #{ENV['BUNDLE_GEMFILE']} --binstubs #{ENV['BUNDLE_BIN']} --path #{ENV['BUNDLE_PATH']}"
+    `chmod o-w #{Origen.root}` # Stops some annoying world writable warnings during install
+    `chmod o-w #{Origen.root}/bin` if File.exist?("#{Origen.root}/bin")
+    `chmod o-w #{Origen.root}/.bin` if File.exist?("#{Origen.root}/.bin")
+
+    # Try again, this time updating the bundle
+    if system(cmd)
+      fixed = true
+    elsif system 'bundle update'
+      fixed = true
+    end
+
+    if File.exist?(ENV['BUNDLE_BIN'])
+      `chmod o-w #{ENV['BUNDLE_BIN']}`
+
+      # Make .bat versions of all executables, Bundler should really be doing this when running
+      # on windows
+      if Origen.os.windows?
+        Dir.glob("#{ENV['BUNDLE_BIN']}/*").each do |bin|
+          unless bin =~ /.bat$/
+            bat = "#{bin}.bat"
+            unless File.exist?(bat)
+              File.open(bat, 'w') { |f| f.write('@"ruby.exe" "%~dpn0" %*') }
+            end
+          end
+        end
+      end
+    end
+
+    system 'origen -v' if fixed
+  end
+end

data/config/version.rb

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

data/lib/origen_debuggers/base.rb

@@ -3,6 +3,24 @@ module OrigenDebuggers
   # This is base class of all debuggers, any methods/attributes
   # defined here will be available to all
   class Base < OrigenTesters::CommandBasedTester
+    # Testers don't listen for callbacks
+    class OnCreateCaller
+      include Origen::Callbacks
+
+      def initialize(tester)
+        @tester = tester
+      end
+
+      def on_create
+        @tester.on_create if @tester.respond_to?(:on_create)
+      end
+    end
+
+    def initialize
+      OnCreateCaller.new(self)
+      super
+    end
+
     # Returns true if the debugger supports JTAG
     def jtag?
       respond_to?(:write_dr)

data/lib/origen_debuggers/j_link.rb

@@ -200,8 +200,7 @@ module OrigenDebuggers
   # NOTE: Specifying a filename in command line
   # will start J-Link Commander in script mode.
   class JLink < Base
-    def initialize
-      super
+    def on_create
       # The minimum time unit is 1ms
       set_timeset('default', 1_000_000)
       @pat_extension = 'jlk'

data/lib/origen_debuggers/p_and_e.rb

@@ -108,8 +108,7 @@ module OrigenDebuggers
   # ----------------------
 
   class PEmicro < Base
-    def initialize
-      super
+    def on_create
       set_timeset('default', 1_000_000)
       @pat_extension = 'mac'
       @comment_char = ';'

data/lib/origen_debuggers/test/dut.rb

@@ -3,8 +3,7 @@ module OrigenDebuggers
     # A simple DUT model used to test the debuggers
     class DUT
       include OrigenJTAG
-      include Origen::Pins
-      include Origen::Registers
+      include Origen::TopLevel
 
       def initialize
         add_pin :tclk

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_debuggers
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: origen_doc_helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: origen_jtag
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.0
 description: 
 email:
 - stephen.f.mfcginty@gmail.com
@@ -73,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/fix_my_workspace
 - config/application.rb
 - config/commands.rb
 - config/development.rb