origen 0.7.15 → 0.7.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 5515909ec26db7a8a2f402e66f46972f79ff4d62
4
- data.tar.gz: f338f5a5fad2f8a92ba5035e7670a692e6bda8c4
3
+ metadata.gz: fc93f967f28eb0d57d81a0b0d92d6431ef9deb8a
4
+ data.tar.gz: 9e36b2e5b8a3a5496e90458f13f41d0532996f0d
5
5
  SHA512:
6
- metadata.gz: 9386d160c9873e09742484e479b5ebde00332a106e20d52a3907a5c8a93ef567ef45e9e7fe2a8c9e5fcb6431de1e52e7dd05f386c1093f53a3bb3d99857ced92
7
- data.tar.gz: 74f6309577983523713fc70b08bacc6cd06bba02bb6b8864e803e20b0dd02892a728faec5729c1a84a9d8db3dc97eb110c0b9c3092716110355d8bf4e51bce04
6
+ metadata.gz: 8cd7a721554cf1228d4456802632a5267f909bb1ce68ee6e80eb82cab17c0444efe9751f3a0c855bc4efb5a9ba491f117d03a376ba750d0c2432c92e66054e1c
7
+ data.tar.gz: 9ecf9f6883e79dfdb617900505195cfc833d0e48642491f7f495812449e03fc4b06adffbf4b4a8b8b317a782a4d00e70e333bafadf4995569df5593bd692d04a
data/config/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Origen
2
2
  MAJOR = 0
3
3
  MINOR = 7
4
- BUGFIX = 15
4
+ BUGFIX = 16
5
5
  DEV = nil
6
6
 
7
7
  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
@@ -50,7 +50,8 @@ module Origen
50
50
  else
51
51
  if options[:build_reference]
52
52
  @reference_tag = version_to_tag(options[:version] || get_version(options))
53
- setup_reference_workspace
53
+ # passing the options for regression to the setup reference workspace method.
54
+ setup_reference_workspace(options)
54
55
  # Generate the reference files
55
56
  save_options(options)
56
57
  Origen.with_origen_root(reference_origen_root) do
@@ -58,7 +59,8 @@ module Origen
58
59
  Dir.chdir reference_origen_root do
59
60
  Bundler.with_clean_env do
60
61
  system 'rm -rf lbin'
61
- system 'bundle exec origen -v' # Used to make sure gems install
62
+ system 'origen -v' # Used to make sure gems install
63
+ system 'bundle install' # Make sure bundle updates the necessary config/gems required for Origen.
62
64
  Origen.log.info '######################################################'
63
65
  Origen.log.info 'running regression command in reference workspace...'
64
66
  Origen.log.info '######################################################'
@@ -178,11 +180,27 @@ module Origen
178
180
  end
179
181
  end
180
182
 
181
- def setup_reference_workspace
183
+ def setup_reference_workspace(options)
182
184
  if ws.reference_workspace_set?
183
- @reference_workspace = ws.reference_workspace
185
+ # If the reference workspace option is true, overwrite the @reference_workspace accessor
186
+ if options[:reference_workspace]
187
+ @reference_workspace = options[:reference_workspace]
188
+ # Build the new reference workspace now.
189
+ unless File.exist?(@reference_workspace)
190
+ highlight { Origen.log.info 'Building reference workspace...' }
191
+ ws.build(@reference_workspace)
192
+ end
193
+ ws.set_reference_workspace(@reference_workspace)
194
+ else
195
+ @reference_workspace = ws.reference_workspace
196
+ end
184
197
  else
185
- @reference_workspace = get_reference_workspace
198
+ if options[:reference_workspace]
199
+ # If the reference workspace option is true, overwrite the @reference_workspace accessor
200
+ @reference_workspace = options[:reference_workspace]
201
+ else
202
+ @reference_workspace = get_reference_workspace
203
+ end
186
204
  unless File.exist?(@reference_workspace)
187
205
  highlight { Origen.log.info 'Building reference workspace...' }
188
206
  ws.build(@reference_workspace)
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.7.15
4
+ version: 0.7.16
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-06-09 00:00:00.000000000 Z
11
+ date: 2016-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -652,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
652
652
  version: 1.8.11
653
653
  requirements: []
654
654
  rubyforge_project:
655
- rubygems_version: 2.4.5
655
+ rubygems_version: 2.2.2
656
656
  signing_key:
657
657
  specification_version: 4
658
658
  summary: The Semiconductor Developer's Kit