origen_jtag 0.22.3 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e408b1d8688221c536224742008b1e8816f175f7204a042f6227cfc92a3c938
-  data.tar.gz: 8038f326e6d212978e7f21404319b1178c89d3ee12a01fca74f5abbaa0b9536e
+  metadata.gz: f35598ac42f1777161dd331813478d87b5743bf62129f5d1f2369566274458db
+  data.tar.gz: c253b56dbfbb7ab740506229529750a2cabbc4eab91ca0cb1658e90711ece80f
 SHA512:
-  metadata.gz: db3581cd8d7d7cababf02df48b7f8e3ad7478f657c9c88e8db68e7de88fa95693c107a06e0bc1bf6b7ad7bb0d4d47009283de60744d921db03a36f20347e4b3e
-  data.tar.gz: fa0a8fa73da0f59d2ea3f4fd23a352022b8498c925c901709b7fcc41ac18bc77ce8992aacb4a842eebfaf5803f11e729052d073775abad31eaf3bc3649dbbcfd
+  metadata.gz: 1bf45ebff1da523a2f9d3e236895cca4c17919f120197cd7f931d0d7013079f628a2871a5735b32ddb7409a6159668b179af57471f72035bafd079a68c7ac209
+  data.tar.gz: 964c51ae9af8b23f381f63246cdd80cfb895a2f0ee387425ed39a5d4778ee82520c819bf4092dee7bd298800251a00720e7a8870e4e7992b97be212d031c883b

data/config/application.rb

@@ -1,65 +1,65 @@
-class OrigenJTAGApplication < Origen::Application
-
-  # This file contains examples of some of the most common configuration options,
-  # to see a real production example from a large application have a look at:
-  # sync://sync-15088:15088/Projects/common_tester_blocks/blocks/C90TFS_NVM_tester/tool_data/origen_v2/config/application.rb
-
-  # This information is used in headers and email templates, set it specific
-  # to your application
-  config.name     = "Origen JTAG"
-  config.initials = "OrigenJTAG"
-  # Force naming for gem, done here because JTAG will not automatically convert to
-  # 'jtag' when OrigenJTAG is snakecased
-  self.name = "origen_jtag"
-  self.namespace = "OrigenJTAG"
-  config.rc_url   = "git@github.com:Origen-SDK/origen_jtag.git"
-  config.release_externally = true
-
-  # To enable deployment of your documentation to a web server (via the 'origen web'
-  # command) fill in these attributes.
-  config.web_directory = "git@github.com:Origen-SDK/Origen-SDK.github.io.git/jtag"
-  #config.web_directory = "https://github.com/Origen-SDK/Origen-SDK.github.io.git/jtag"
-  config.web_domain = "http://origen-sdk.org/jtag"
-
-  config.semantically_version = true
-
-  config.lint_test = {
-    # Require the lint tests to pass before allowing a release to proceed
-    run_on_tag: true,
-    # Auto correct violations where possible whenever 'origen lint' is run
-    auto_correct: true, 
-    # Limit the testing for large legacy applications
-    #level: :easy,
-    # Run on these directories/files by default
-    #files: ["lib", "config/application.rb"],
-  }
-
-  # Ensure that all tests pass before allowing a release to continue
-  def validate_release
-    if !system("origen examples") #|| !system("origen specs")
-      puts "Sorry but you can't release with failing tests, please fix them and try again."
-      exit 1
-    else
-      puts "All tests passing, proceeding with release process!"
-    end
-  end
-
-  # Run code coverage when deploying the web site
-  def before_deploy_site
-    Dir.chdir Origen.root do
-      system "origen examples -c"
-      dir = "#{Origen.root}/web/output/coverage"       
-      FileUtils.remove_dir(dir, true) if File.exists?(dir) 
-      system "mv #{Origen.root}/coverage #{dir}"
-    end
-  end
- 
-  # Deploy the website automatically after a production tag
-  def after_release_email(tag, note, type, selector, options)
-    command = "origen web compile --remote --api"
-    Dir.chdir Origen.root do
-      system command
-    end
-  end
-
-end
+class OrigenJTAGApplication < Origen::Application
+
+  # This file contains examples of some of the most common configuration options,
+  # to see a real production example from a large application have a look at:
+  # sync://sync-15088:15088/Projects/common_tester_blocks/blocks/C90TFS_NVM_tester/tool_data/origen_v2/config/application.rb
+
+  # This information is used in headers and email templates, set it specific
+  # to your application
+  config.name     = "Origen JTAG"
+  config.initials = "OrigenJTAG"
+  # Force naming for gem, done here because JTAG will not automatically convert to
+  # 'jtag' when OrigenJTAG is snakecased
+  self.name = "origen_jtag"
+  self.namespace = "OrigenJTAG"
+  config.rc_url   = "git@github.com:Origen-SDK/origen_jtag.git"
+  config.release_externally = true
+
+  # To enable deployment of your documentation to a web server (via the 'origen web'
+  # command) fill in these attributes.
+  config.web_directory = "git@github.com:Origen-SDK/Origen-SDK.github.io.git/jtag"
+  #config.web_directory = "https://github.com/Origen-SDK/Origen-SDK.github.io.git/jtag"
+  config.web_domain = "http://origen-sdk.org/jtag"
+
+  config.semantically_version = true
+
+  config.lint_test = {
+    # Require the lint tests to pass before allowing a release to proceed
+    run_on_tag: true,
+    # Auto correct violations where possible whenever 'origen lint' is run
+    auto_correct: true, 
+    # Limit the testing for large legacy applications
+    #level: :easy,
+    # Run on these directories/files by default
+    #files: ["lib", "config/application.rb"],
+  }
+
+  # Ensure that all tests pass before allowing a release to continue
+  def validate_release
+    if !system("origen examples") #|| !system("origen specs")
+      puts "Sorry but you can't release with failing tests, please fix them and try again."
+      exit 1
+    else
+      puts "All tests passing, proceeding with release process!"
+    end
+  end
+
+  # Run code coverage when deploying the web site
+  def before_deploy_site
+    Dir.chdir Origen.root do
+      system "origen examples -c"
+      dir = "#{Origen.root}/web/output/coverage"       
+      FileUtils.remove_dir(dir, true) if File.exists?(dir) 
+      system "mv #{Origen.root}/coverage #{dir}"
+    end
+  end
+ 
+  # Deploy the website automatically after a production tag
+  def after_release_email(tag, note, type, selector, options)
+    command = "origen web compile --remote --api"
+    Dir.chdir Origen.root do
+      system command
+    end
+  end
+
+end

data/config/boot.rb

@@ -1,24 +1,24 @@
-# This file is used to boot your plugin when it is running in standalone mode
-# from its own workspace - i.e. when the plugin is being developed.
-#
-# It will not be loaded when the plugin is imported by a 3rd party app - in that
-# case only lib/origen_jtag.rb is loaded.
-#
-# Therefore this file can be used to load anything extra that you need to boot
-# the development environment for this app. For example this is typically used
-# to load some additional test classes to use your plugin APIs so that they can
-# be tested and/or interacted with in the console.
-require 'origen_jtag'
-
-module OrigenJTAGDev
-  # Example of how to explicitly require a file
-  # require "origen_jtag_dev/my_file"
-    
-  # Load all files in the lib/origen_jtag_dev directory.
-  # Note that there is no problem from requiring a file twice (Ruby will ignore
-  # the second require), so if you have a file that must be required first, then
-  # explicitly require it up above and then let this take care of the rest.
-  Dir.glob("#{File.dirname(__FILE__)}/../lib/origen_jtag_dev/**/*.rb").sort.each do |file|
-    require file
-  end
-end
+# This file is used to boot your plugin when it is running in standalone mode
+# from its own workspace - i.e. when the plugin is being developed.
+#
+# It will not be loaded when the plugin is imported by a 3rd party app - in that
+# case only lib/origen_jtag.rb is loaded.
+#
+# Therefore this file can be used to load anything extra that you need to boot
+# the development environment for this app. For example this is typically used
+# to load some additional test classes to use your plugin APIs so that they can
+# be tested and/or interacted with in the console.
+require 'origen_jtag'
+
+module OrigenJTAGDev
+  # Example of how to explicitly require a file
+  # require "origen_jtag_dev/my_file"
+    
+  # Load all files in the lib/origen_jtag_dev directory.
+  # Note that there is no problem from requiring a file twice (Ruby will ignore
+  # the second require), so if you have a file that must be required first, then
+  # explicitly require it up above and then let this take care of the rest.
+  Dir.glob("#{File.dirname(__FILE__)}/../lib/origen_jtag_dev/**/*.rb").sort.each do |file|
+    require file
+  end
+end

data/config/commands.rb

@@ -1,130 +1,137 @@
-# This file should be used to extend the origen command line tool with tasks 
-# specific to your application.
-#
-# Also see the official docs on adding commands:
-#   http://origen-sdk.org/origen/guides/custom/commands/
-
-# Map any command aliases here, for example to allow origen -x to refer to a 
-# command called execute you would add a reference as shown below: 
-aliases ={
-#  "-x" => "execute",
-}
-
-# The requested command is passed in here as @command, this checks it against
-# the above alias table and should not be removed.
-@command = aliases[@command] || @command
-
-# Now branch to the specific task code
-case @command
-
-## Run the unit tests  
-when "specs"
-  require "rspec"
-  exit RSpec::Core::Runner.run(['spec'])
-
-when "examples", "test"  
-  Origen.load_application
-  status = 0
-
-  # Pattern generator tests
-  ARGV = %w(jtag_workout -t RH1.rb -e v93k -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t RH1.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t RL1.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(jtag_workout -t RH2.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t RH2_1.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(jtag_workout -t RH4.rb -e v93k -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t RH4.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t RL4.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  
-  ARGV = %w(rww_test -t RH4.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(global_label_test -t RH1.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(full_reg_ovly_cap -t RH4.rb -e uflex.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  # Pattern generator tests -- confirm sub_block instanced jtag gives same results
-  ARGV = %w(jtag_workout -t new_RH1 -e v93k -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t new_RH1 -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t new_RL1 -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(jtag_workout -t new_RH2.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t new_RH2_1.rb -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(jtag_workout -t new_RH4 -e v93k -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t new_RH4 -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-  ARGV = %w(jtag_workout -t new_RL4 -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(rww_test -t new_RH4 -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(global_label_test -t new_RH1 -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(full_reg_ovly_cap -t new_RH4 -e uflex.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(two_port -t new_2port_RH4 -e j750.rb -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(jtag_workout -t new_P1 -e v93k -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(jtag_workout -t new_P4 -e v93k -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  ARGV = %w(jtag_workout -t serial_P1 -e v93k -r approved)
-  load "#{Origen.top}/lib/origen/commands/generate.rb"
-
-  if Origen.app.stats.changed_files == 0 &&
-     Origen.app.stats.new_files == 0 &&
-     Origen.app.stats.changed_patterns == 0 &&
-     Origen.app.stats.new_patterns == 0
-
-    Origen.app.stats.report_pass
-  else
-    Origen.app.stats.report_fail
-    status = 1
-  end
-  puts
-  if @command == "test"
-    Origen.app.unload_target!
-    require "rspec"
-    result = RSpec::Core::Runner.run(['spec'])
-    status = status == 1 ? 1 : result
-  end
-  exit status
-
-# Always leave an else clause to allow control to fall back through to the
-# Origen command handler.
-# You probably want to also add the command details to the help shown via
-# origen -h, you can do this be assigning the required text to @application_commands
-# before handing control back to Origen. Un-comment the example below to get started.
-else
-  @application_commands = <<-EOT
- specs        Run the specs (tests), -c will enable coverage
- examples     Run the examples (tests), -c will enable coverage
- test         Run both specs and examples, -c will enable coverage
-  EOT
-
-end 
+# This file should be used to extend the origen command line tool with tasks 
+# specific to your application.
+#
+# Also see the official docs on adding commands:
+#   http://origen-sdk.org/origen/guides/custom/commands/
+
+# Map any command aliases here, for example to allow origen -x to refer to a 
+# command called execute you would add a reference as shown below: 
+aliases ={
+#  "-x" => "execute",
+}
+
+# The requested command is passed in here as @command, this checks it against
+# the above alias table and should not be removed.
+@command = aliases[@command] || @command
+
+# Now branch to the specific task code
+case @command
+
+## Run the unit tests  
+when "specs"
+  require "rspec"
+  exit RSpec::Core::Runner.run(['spec'])
+
+when "examples", "test"  
+  Origen.load_application
+  status = 0
+
+  # Pattern generator tests
+  ARGV = %w(jtag_workout -t RH1.rb -e v93k -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t RH1.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t RL1.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(jtag_workout -t RH2.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t RH2_1.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(jtag_workout -t RH4.rb -e v93k -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t RH4.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t RL4.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  
+  ARGV = %w(rww_test -t RH4.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(global_label_test -t RH1.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(full_reg_ovly_cap -t RH4.rb -e uflex.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  # Pattern generator tests -- confirm sub_block instanced jtag gives same results
+  ARGV = %w(jtag_workout -t new_RH1 -e v93k -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t new_RH1 -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t new_RL1 -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(jtag_workout -t new_RH2.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t new_RH2_1.rb -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(jtag_workout -t new_RH4 -e v93k -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t new_RH4 -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t new_RL4 -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(rww_test -t new_RH4 -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(global_label_test -t new_RH1 -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(full_reg_ovly_cap -t new_RH4 -e uflex.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(two_port -t new_2port_RH4 -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(jtag_workout -t new_P1 -e v93k -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(jtag_workout -t new_P4 -e v93k -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(jtag_workout -t serial_P1 -e v93k -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  ARGV = %w(chained_devices_test -t new_RH4 -e uflex.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  # defaults to subroutine overlay, check behavior
+  ARGV = %w(chained_devices_test -t new_RH4 -e v93k -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
+  if Origen.app.stats.changed_files == 0 &&
+     Origen.app.stats.new_files == 0 &&
+     Origen.app.stats.changed_patterns == 0 &&
+     Origen.app.stats.new_patterns == 0
+
+    Origen.app.stats.report_pass
+  else
+    Origen.app.stats.report_fail
+    status = 1
+  end
+  puts
+  if @command == "test"
+    Origen.app.unload_target!
+    require "rspec"
+    result = RSpec::Core::Runner.run(['spec'])
+    status = status == 1 ? 1 : result
+  end
+  exit status
+
+# Always leave an else clause to allow control to fall back through to the
+# Origen command handler.
+# You probably want to also add the command details to the help shown via
+# origen -h, you can do this be assigning the required text to @application_commands
+# before handing control back to Origen. Un-comment the example below to get started.
+else
+  @application_commands = <<-EOT
+ specs        Run the specs (tests), -c will enable coverage
+ examples     Run the examples (tests), -c will enable coverage
+ test         Run both specs and examples, -c will enable coverage
+  EOT
+
+end 

data/config/version.rb

@@ -1,7 +1,7 @@
-module OrigenJTAG
-  MAJOR = 0
-  MINOR = 22
-  BUGFIX = 3
-  DEV = nil
-  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
-end
+module OrigenJTAG
+  MAJOR = 0
+  MINOR = 23
+  BUGFIX = 0
+  DEV = nil
+  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
+end