origen 0.33.2 → 0.33.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/version.rb +1 -1
- data/lib/origen.rb +1 -1
- data/lib/origen/generator/flow.rb +1 -1
- data/lib/origen/version_string.rb +15 -3
- data/vendor/lib/models/origen/export1.rb +1 -1
- data/vendor/lib/models/origen/export1/block1.rb +1 -1
- 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: df84c7214237f807371534766be022afc95ba8fe
|
4
|
+
data.tar.gz: 98751baf8dc8fa699ed55fada8c0b347a9b5a07d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dc012d1ca8883e85b04019b3e09355864169da0eb166049053b708abc758c3fab872eeb205aa53d492c36cbd05cc875753b641d5828ebfe21e488e89646aae31
|
7
|
+
data.tar.gz: a206be55eab62f8babecfb3394e0871db316addea6549c4a5d32a7e1743358f5c4bc76f7d54b119e6a531880c142cc96bd186a1aadf2fef4e5b8b23d8fb80c89
|
data/config/version.rb
CHANGED
data/lib/origen.rb
CHANGED
@@ -94,7 +94,7 @@ unless defined? RGen::ORIGENTRANSITION
|
|
94
94
|
if str =~ /^\s\s\s\s\s\s\s*(.*)/
|
95
95
|
(' ' * 20) + Regexp.last_match(1)
|
96
96
|
# http://rubular.com/r/MKmU4xZgO2
|
97
|
-
elsif str =~ /^\s*([^\s]+)\s
|
97
|
+
elsif str =~ /^\s*([^\s]+)\s+(.*)/
|
98
98
|
' ' + Regexp.last_match(1).ljust(19) + Regexp.last_match(2)
|
99
99
|
else
|
100
100
|
str
|
@@ -4,7 +4,7 @@ module Origen
|
|
4
4
|
attr_accessor :top_level
|
5
5
|
|
6
6
|
def create(options = {}, &block)
|
7
|
-
Origen.deprecated 'Origen core will no longer support program generation in v1, add the origen_testers plugin to your application to fix this warning'
|
7
|
+
# Origen.deprecated 'Origen core will no longer support program generation in v1, add the origen_testers plugin to your application to fix this warning'
|
8
8
|
# Refresh the target to start all settings from scratch each time
|
9
9
|
# This is an easy way to reset all registered values
|
10
10
|
Origen.app.reload_target!
|
@@ -29,25 +29,37 @@ module Origen
|
|
29
29
|
!production?
|
30
30
|
end
|
31
31
|
|
32
|
+
alias_method :orig_equal?, :==
|
33
|
+
|
34
|
+
def equal?(version)
|
35
|
+
condition_met?("== #{version}")
|
36
|
+
end
|
37
|
+
alias_method :eq?, :equal?
|
38
|
+
alias_method :==, :equal?
|
39
|
+
|
32
40
|
def less_than?(version)
|
33
41
|
condition_met?("< #{version}")
|
34
42
|
end
|
35
43
|
alias_method :lt?, :less_than?
|
44
|
+
alias_method :<, :less_than?
|
36
45
|
|
37
46
|
def less_than_or_equal_to?(version)
|
38
47
|
condition_met?("<= #{version}")
|
39
48
|
end
|
40
49
|
alias_method :lte?, :less_than_or_equal_to?
|
50
|
+
alias_method :<=, :less_than_or_equal_to?
|
41
51
|
|
42
52
|
def greater_than?(version)
|
43
53
|
condition_met?("> #{version}")
|
44
54
|
end
|
45
55
|
alias_method :gt?, :greater_than?
|
56
|
+
alias_method :>, :greater_than?
|
46
57
|
|
47
58
|
def greater_than_or_equal_to?(version)
|
48
59
|
condition_met?(">= #{version}")
|
49
60
|
end
|
50
61
|
alias_method :gte?, :greater_than_or_equal_to?
|
62
|
+
alias_method :>=, :greater_than_or_equal_to?
|
51
63
|
|
52
64
|
# Returns true if the version is a correctly formatted semantic
|
53
65
|
# or timestamp version number
|
@@ -169,7 +181,7 @@ module Origen
|
|
169
181
|
alias_method :dev, :pre
|
170
182
|
|
171
183
|
def latest?
|
172
|
-
downcase
|
184
|
+
downcase.orig_equal?('trunk') || downcase.orig_equal?('latest')
|
173
185
|
end
|
174
186
|
|
175
187
|
# Returns true if the version is a timestamp format version number
|
@@ -225,11 +237,11 @@ module Origen
|
|
225
237
|
|
226
238
|
elsif condition =~ /^==?\s*(.*)/
|
227
239
|
tag = validate_condition!(condition, Regexp.last_match[1])
|
228
|
-
self
|
240
|
+
self.orig_equal?(tag)
|
229
241
|
|
230
242
|
else
|
231
243
|
tag = validate_condition!(condition, condition)
|
232
|
-
self
|
244
|
+
self.orig_equal?(tag)
|
233
245
|
end
|
234
246
|
end
|
235
247
|
|
@@ -69,7 +69,7 @@ module Origen
|
|
69
69
|
model.add_virtual_pin :relay1
|
70
70
|
model.add_virtual_pin :relay2, packages: { bga: {} }
|
71
71
|
|
72
|
-
model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/
|
72
|
+
model.sub_block :block1, file: 'origen/export1/block1.rb', dir: '/home/stephen/Code/github/origen/vendor/lib/models', lazy: true
|
73
73
|
|
74
74
|
end
|
75
75
|
end
|
@@ -4,7 +4,7 @@ module Origen
|
|
4
4
|
module Export1
|
5
5
|
module Block1
|
6
6
|
def self.extended(model)
|
7
|
-
model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/
|
7
|
+
model.sub_block :x, file: 'origen/export1/block1/x.rb', dir: '/home/stephen/Code/github/origen/vendor/lib/models', lazy: true, base_address: 0x40000000
|
8
8
|
|
9
9
|
end
|
10
10
|
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.33.
|
4
|
+
version: 0.33.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stephen McGinty
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-06-
|
11
|
+
date: 2018-06-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -644,7 +644,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
644
644
|
version: 1.8.11
|
645
645
|
requirements: []
|
646
646
|
rubyforge_project:
|
647
|
-
rubygems_version: 2.6.
|
647
|
+
rubygems_version: 2.6.14.1
|
648
648
|
signing_key:
|
649
649
|
specification_version: 4
|
650
650
|
summary: The Semiconductor Developer's Kit
|