origen 0.9.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755efbb1e342b021bf5148450b3ad3cb79bbc879
-  data.tar.gz: fcd25776a0bd1a57f1129f7bee00606f64b1fed8
+  metadata.gz: a74d6c5e91701aa0a8f1c90b52ae3fc3414b6403
+  data.tar.gz: 5736a47e4479517d364734301c98aa36f099a6a7
 SHA512:
-  metadata.gz: 3e3693c2636eb8bf6c81bae0cff6ad0dd19fdbc74b0a91c6e36a84cfdd7d3a99ad40655dd1a5db838d5879f884e68ad140569dc390387ae5ba1480dbe6867667
-  data.tar.gz: 9cb121fe57e81d395106cffbd27d0518302ff2bd208811cb9a38993007aca4d9edd52aec8938136cee57d1667f628d603dfb1f52c56dd7b7c0c66a65ddd2075d
+  metadata.gz: e5b2083ade87f88644af98ec619de196fd688b49d162c54f89a3af19a71cddcef7a86860e240fd4b07b4ac8c14432991eba7b6b4ed6c845e3760e9552c81bc9f
+  data.tar.gz: dc4cf50f16fab69fe59d6108fb90ed7e5fb840a74d26230f102828820e3c3e83398540f019542368b0b0b32ee68a2c9d896fdee993996bbc89aae0ae1b39f3c2

data/bin/origen

@@ -51,20 +51,32 @@ if origen_root
   ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
   ENV['BUNDLE_BIN'] = File.join(origen_root, 'lbin')
 
-  # Ensure that system gems are copied to the local gem dir every time, this might waste a little bit
-  # of time, but it ensures that any updates to the system gem list are automatically applied which
-  # is helpful in a corporate environment with no sudo access to the Ruby installation
-  #
-  # This is invoked from an external process so that it can step out of this bundled environment
-  # and have visibility of the system gems
-  if Origen.site_config.gem_manage_bundler && Origen.site_config.gem_use_from_system
-    exe = File.expand_path('../copy_system_gems', __FILE__)
-    gems = Origen.site_config.gem_use_from_system.map { |g,v| "#{g} #{v}" }.join(' ')
+  if ARGV.first == 'update'
+    ARGV.shift
     local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
+    updater_dir = Dir.glob("#{local_gem_dir}/gems/origen_updater-*").sort.last
+    exe = File.expand_path('../update', __FILE__)
     require 'bundler'
+
+    args = ARGV.join(' ')
+
+    on_updated_callback = lambda do
+      Bundler.with_clean_env do
+        system "#{exe} #{origen_root} #{updater_dir}/lib/origen_updater/on_updated #{args}"
+      end
+    end
+
+    # This is invoked from an external process so that it can step out of this bundled environment
+    # and have visibility of the system gems
     Bundler.with_clean_env do
-      system "#{exe} #{local_gem_dir} #{gems}"
+      system "#{exe} #{origen_root} #{updater_dir}/lib/origen_updater/update #{args}"
+    end
+
+    # Now fall through and act like 'origen -v'
+    while ARGV.size > 0 do
+      ARGV.pop
     end
+    ARGV << '-v'
   end
 
   # If it looks like a bundled binstub of origen exists, and we have not been invoked through that,
@@ -145,13 +157,7 @@ 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
+          on_updated_callback.call if on_updated_callback
           exec "origen #{ARGV.join(' ')}"
           exit 0
         else
@@ -165,6 +171,7 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
       Bundler.setup
     end
   end
+  on_updated_callback.call if on_updated_callback
   require 'bundler/setup'
   require 'origen'
 else
@@ -172,19 +179,6 @@ else
   require 'origen'
 end
 
-# 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
-# If RGen < 3 is present then abort the process here and execute the rgen bin file instead
-begin
-  require 'rgen'
-  if RGen.version.major == 2
-    exec Gem.ruby, "#{RGen.top}/bin/rgen", *ARGV
-    exit 0
-  end
-rescue LoadError
-  # No problem, RGen not present
-end
-
 begin
   # If this script has been invoked from within an Origen application then open
   # up all commands, if not then only allow the command to create a new Origen

data/bin/update

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+$VERBOSE = nil  # Don't care about world writable dir warnings and the like
+
+require 'pathname'
+#require 'byebug' # Un-comment to debug this file
+
+# Keep a note of the pwd at the time when Origen was first loaded, this is initially used
+# by the site_config lookup.
+$_origen_invocation_pwd ||= Pathname.pwd
+
+load File.expand_path('../../lib/origen/operating_systems.rb', __FILE__)
+load File.expand_path('../../lib/origen/site_config.rb', __FILE__)
+
+origen_root = ARGV.shift
+
+# Force everyone to have a consistent way of installing gems with bundler
+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')
+
+require ARGV.shift
+
+

data/config/version.rb

@@ -1,6 +1,6 @@
 module Origen
   MAJOR = 0
-  MINOR = 9
+  MINOR = 10
   BUGFIX = 1
   DEV = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.1
 platform: ruby
 authors:
 - Stephen McGinty
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 1.6.7.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -346,8 +346,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/copy_system_gems
 - bin/origen
+- bin/update
 - config/application.rb
 - config/boot.rb
 - config/commands.rb
@@ -583,7 +583,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit

data/bin/copy_system_gems

@@ -1,60 +0,0 @@
-#!/usr/bin/env ruby
-$VERBOSE = nil  # Don't care about world writable dir warnings and the like
-#require 'byebug' # Un-comment to debug this file
-require 'fileutils'
-require 'pathname'
-
-local_gem_dir = ARGV.shift
-
-unless ARGV.empty?
-  %w(bin cache extensions gems specifications).each do |subdir|
-    d = "#{local_gem_dir}/#{subdir}"
-    FileUtils.mkdir_p(d) unless File.exist?(d)
-  end
-end
-
-ARGV.each_slice(2) do |gem, version|
-  begin
-    spec = Gem::Specification.find_by_name(gem, version)
-    begin
-      (spec.executables || []).each do |bin|
-        unless File.exist?("#{local_gem_dir}/bin/#{bin}")
-          FileUtils.cp("#{spec.bin_dir}/#{bin}", "#{local_gem_dir}/bin")
-        end
-      end
-      p = Pathname.new(spec.cache_file)
-      unless File.exist?("#{local_gem_dir}/cache/#{p.basename}")
-        FileUtils.cp(spec.cache_file, "#{local_gem_dir}/cache")
-      end
-      if spec.extension_dir && File.exist?(spec.extension_dir)
-        spec.extension_dir =~ /.*extensions(.*)/
-        sub_dir = Pathname.new(Regexp.last_match(1)).dirname.to_s
-        local_ext_dir = "#{local_gem_dir}/extensions/#{sub_dir}"
-        FileUtils.mkdir_p(local_ext_dir) unless File.exist?(local_ext_dir)
-
-        # If the file exists in the extensions directory, skip copying it over.
-        p = Pathname.new(spec.extension_dir)
-        unless File.exist?("#{local_ext_dir}/#{p.basename}")
-          FileUtils.cp_r(spec.extension_dir, local_ext_dir)
-        end
-      end
-
-      # If the file exists in the gem directory, skip copying it over.
-      p = Pathname.new(spec.gem_dir)
-      unless File.exist?("#{local_gem_dir}/gems/#{p.basename}")
-        FileUtils.cp_r(spec.gem_dir, "#{local_gem_dir}/gems")
-      end
-      # If the file exists in the specifications directory, skip copying it over.
-      p = Pathname.new(spec.spec_file)
-      unless File.exist?("#{local_gem_dir}/specifications/#{p.basename}")
-        FileUtils.cp(spec.spec_file, "#{local_gem_dir}/specifications")
-      end
-    rescue
-      puts "Had problems installing #{spec.name} from your system Ruby, proceeding with fingers crossed..."
-    end
-
-  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