origen 0.6.10 → 0.6.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7bc05ce80cf8dbb49257a0404534b56e35f3797d
4
- data.tar.gz: 2321b97e205cbe7e223f934709a108230dda3f49
3
+ metadata.gz: f5ecd5584b0d993e95fa5296fc6f81b1abe2ae1e
4
+ data.tar.gz: 5e773cb1e1cc7f5ee5a0b6036d79efc9904a6ae8
5
5
  SHA512:
6
- metadata.gz: 2f14688cacfc54cac53718cca2be0c04740d154b95b02945e0885667f1a3a019956ed85aaa4815bfaee714b94a6a976062e0b785e740f1913e2911c38a527ed1
7
- data.tar.gz: 514e41944f2b6deaa564f88809b0cabf1b7d3773a7e9776c9bf3112ca16709a5e813f615fd858dffd30c0e1f4a402384bd008e6101a38010de560515d1ab96e0
6
+ metadata.gz: 0bd1947af05b3065b5015f8d30029518cdd9f19082a6c8feb5cdf86389b1837bf07363115de6c90fbeb685c60102d9ff07a611543457e693d88f069d0d4921ec
7
+ data.tar.gz: 1733de2d675956e3fba37e923da2809f9a0003124d910627d7570cdf5538107d68642b050f3d388d3b6b2c48b11617aff8a4c27b9176a5fd2df6841ac5dcb484
data/bin/origen CHANGED
@@ -195,6 +195,19 @@ else
195
195
  require "origen"
196
196
  end
197
197
 
198
+ # This is a shim to help NXP run regression tests between an old version of an app running
199
+ # RGen and a new version running Origen
200
+ # If RGen < 3 is present then abort the process here and execute the rgen bin file instead
201
+ begin
202
+ require "rgen"
203
+ if RGen.version.major == 2
204
+ exec Gem.ruby, "#{RGen.top}/bin/rgen", *ARGV
205
+ exit 0
206
+ end
207
+ rescue LoadError
208
+ # No problem, RGen not present
209
+ end
210
+
198
211
  begin
199
212
  # If this script has been invoked from within an Origen application then open
200
213
  # up all commands, if not then only allow the command to create a new Origen
data/config/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Origen
2
2
  MAJOR = 0
3
3
  MINOR = 6
4
- BUGFIX = 10
4
+ BUGFIX = 11
5
5
  DEV = nil
6
6
 
7
7
  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
@@ -58,12 +58,12 @@ module Origen
58
58
  Dir.chdir reference_origen_root do
59
59
  Bundler.with_clean_env do
60
60
  system 'rm -rf lbin'
61
- system 'origen -v' # Used to make sure gems install
61
+ system 'bundle exec origen -v' # Used to make sure gems install
62
62
  Origen.log.info '######################################################'
63
63
  Origen.log.info 'running regression command in reference workspace...'
64
64
  Origen.log.info '######################################################'
65
65
  Origen.log.info
66
- system 'origen regression'
66
+ system 'bundle exec origen regression'
67
67
  end
68
68
  end
69
69
  end
@@ -121,7 +121,7 @@ module Origen
121
121
  Origen.log.flush
122
122
  Dir.chdir reference_origen_root do
123
123
  Bundler.with_clean_env do
124
- system 'origen save all'
124
+ system 'bundle exec origen save all'
125
125
  end
126
126
  end
127
127
  FileUtils.rm_rf "#{reference_origen_root}/output"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: origen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.10
4
+ version: 0.6.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen McGinty
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-15 00:00:00.000000000 Z
11
+ date: 2016-03-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport