origen 0.6.8 → 0.6.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/origen +7 -0
- data/config/application.rb +1 -1
- data/config/commands.rb +1 -2
- data/config/version.rb +1 -1
- data/lib/origen/application/plugins.rb +2 -5
- data/lib/origen/commands/program.rb +1 -1
- data/lib/origen/regression_manager.rb +21 -2
- data/lib/origen/revision_control/git.rb +1 -0
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9c926e1ebfe3bf41c399fc560bb0ec3ad2479a44
|
4
|
+
data.tar.gz: 6e64ed3fc716c15c4dea3b6c2ab24bdf802d0394
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 29ea680eb81808578c799ee17740c5dbacb2bc125ecbf238c5ca8a9be60c49cebada2cafac48eb6b775835798bee0b2a0b148efc46d43f439a8e52dc42757a03
|
7
|
+
data.tar.gz: 9218d1892cfd068eca58b8660ebd12b984d4783d20e4524ef3d281f3444ccdd2f3a71f952b8f133879e92f9b50b91c7575cdcb3d9c8151c3ae50e3df57701397
|
data/bin/origen
CHANGED
@@ -168,6 +168,13 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
|
|
168
168
|
end
|
169
169
|
end
|
170
170
|
if result
|
171
|
+
# This is a shim to help NXP run regression tests between an old version of an app running
|
172
|
+
# RGen and a new version running Origen
|
173
|
+
origen = File.join(ENV['BUNDLE_BIN'], "origen")
|
174
|
+
rgen = File.join(ENV['BUNDLE_BIN'], "rgen")
|
175
|
+
if File.exist?(rgen) && !File.exist?(origen) && Origen.os.linux?
|
176
|
+
exec "ln -s #{rgen} #{origen}"
|
177
|
+
end
|
171
178
|
exec "origen #{ARGV.join(' ')}"
|
172
179
|
exit 0
|
173
180
|
else
|
data/config/application.rb
CHANGED
@@ -4,7 +4,7 @@ class OrigenCoreApplication < Origen::Application
|
|
4
4
|
|
5
5
|
config.name = "Origen Core"
|
6
6
|
config.initials = "Origen"
|
7
|
-
config.rc_url = "
|
7
|
+
config.rc_url = "git@github.com:Origen-SDK/origen.git"
|
8
8
|
config.semantically_version = true
|
9
9
|
config.release_externally = true
|
10
10
|
config.gem_name = "origen"
|
data/config/commands.rb
CHANGED
@@ -41,13 +41,12 @@ when "examples", "test"
|
|
41
41
|
when "regression"
|
42
42
|
# You must tell the regression manager up front what target will be run within
|
43
43
|
# the block
|
44
|
-
options[:targets] = %w(debug v93k jlink
|
44
|
+
options[:targets] = %w(debug v93k jlink)
|
45
45
|
Origen.regression_manager.run(options) do |options|
|
46
46
|
Origen.lsf.submit_origen_job "generate j750.list -t debug --plugin origen_core_support"
|
47
47
|
Origen.lsf.submit_origen_job "generate v93k_workout -t v93k --plugin none"
|
48
48
|
Origen.lsf.submit_origen_job "generate dummy_name port -t debug --plugin none"
|
49
49
|
Origen.lsf.submit_origen_job "generate jlink.list -t jlink --plugin none"
|
50
|
-
Origen.lsf.submit_origen_job "generate bdm.list -t bdm --plugin none"
|
51
50
|
Origen.lsf.submit_origen_job "compile templates/test/set3 -t debug --plugin none"
|
52
51
|
Origen.lsf.submit_origen_job "compile templates/test/inspections.txt.erb -t debug --plugin none"
|
53
52
|
Origen.lsf.submit_origen_job "program program -t debug --plugin none"
|
data/config/version.rb
CHANGED
@@ -35,6 +35,7 @@ module Origen
|
|
35
35
|
|
36
36
|
# Returns the current plugin's application instance
|
37
37
|
def current
|
38
|
+
return nil if @temporary == :none
|
38
39
|
return nil if @disabled
|
39
40
|
name = @temporary || @current ||= Origen.app.session.origen_core[:default_plugin]
|
40
41
|
find { |p| p.name.to_sym == name } if name
|
@@ -52,11 +53,7 @@ module Origen
|
|
52
53
|
|
53
54
|
def temporary=(name)
|
54
55
|
name = name.to_sym if name
|
55
|
-
|
56
|
-
@temporary = nil
|
57
|
-
else
|
58
|
-
@temporary = name
|
59
|
-
end
|
56
|
+
@temporary = name
|
60
57
|
end
|
61
58
|
|
62
59
|
# Temporarily set the current plugin to nil
|
@@ -55,7 +55,7 @@ _with_doc_tester(options) do
|
|
55
55
|
Origen.app.plugins.temporary = options[:current_plugin] if options[:current_plugin]
|
56
56
|
Origen.environment.temporary = options[:environment] if options[:environment]
|
57
57
|
Origen.target.temporary = options[:target] if options[:target]
|
58
|
-
Origen.app.load_target! # This initial load is required to
|
58
|
+
Origen.app.load_target! # This initial load is required to apply any configuration
|
59
59
|
# options present in the target, it will loaded again before
|
60
60
|
# each generate/compile job
|
61
61
|
|
@@ -54,9 +54,10 @@ module Origen
|
|
54
54
|
# Generate the reference files
|
55
55
|
save_options(options)
|
56
56
|
Origen.with_origen_root(reference_origen_root) do
|
57
|
-
|
57
|
+
disable_origen_version_check do
|
58
58
|
Dir.chdir reference_origen_root do
|
59
59
|
Bundler.with_clean_env do
|
60
|
+
system 'rm -rf lbin'
|
60
61
|
system 'origen -v' # Used to make sure gems install
|
61
62
|
Origen.log.info '######################################################'
|
62
63
|
Origen.log.info 'running regression command in reference workspace...'
|
@@ -85,6 +86,16 @@ module Origen
|
|
85
86
|
end
|
86
87
|
end
|
87
88
|
|
89
|
+
def disable_origen_version_check
|
90
|
+
if Origen.respond_to?(:with_disable_origen_version_check)
|
91
|
+
Origen.with_disable_origen_version_check(all_processes: true) do
|
92
|
+
yield
|
93
|
+
end
|
94
|
+
else
|
95
|
+
yield
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
88
99
|
def summarize_results(options = {})
|
89
100
|
Origen.lsf.build_log
|
90
101
|
stats = Origen.app.stats
|
@@ -243,7 +254,15 @@ module Origen
|
|
243
254
|
if version.downcase == 'last'
|
244
255
|
Origen.app.version_tracker.versions.last
|
245
256
|
elsif version.downcase == 'latest'
|
246
|
-
|
257
|
+
if Origen.app.rc.git?
|
258
|
+
if Origen.app.config.rc_workflow == :gitflow
|
259
|
+
'develop'
|
260
|
+
else
|
261
|
+
'master'
|
262
|
+
end
|
263
|
+
else
|
264
|
+
version
|
265
|
+
end
|
247
266
|
else
|
248
267
|
version
|
249
268
|
end
|
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.
|
4
|
+
version: 0.6.9
|
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-
|
11
|
+
date: 2016-03-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -648,7 +648,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
648
648
|
version: 1.8.11
|
649
649
|
requirements: []
|
650
650
|
rubyforge_project:
|
651
|
-
rubygems_version: 2.
|
651
|
+
rubygems_version: 2.5.1
|
652
652
|
signing_key:
|
653
653
|
specification_version: 4
|
654
654
|
summary: A Semiconductor Developer's Kit
|