Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
b9523d0e
Unverified
Commit
b9523d0e
authored
Feb 12, 2018
by
Yukihiro "Matz" Matsumoto
Committed by
GitHub
Feb 12, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3945 from take-cheeze/fix_dep_core_gems
Fix core dependencies resolving in dependencies gems.
parents
2c84d948
3dc8634d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
13 deletions
+11
-13
lib/mruby/gem.rb
lib/mruby/gem.rb
+11
-13
No files found.
lib/mruby/gem.rb
View file @
b9523d0e
...
...
@@ -323,20 +323,22 @@ module MRuby
@ary
.
empty?
end
def
default_gem_params
dep
if
dep
[
:default
];
dep
elsif
File
.
exist?
"
#{
MRUBY_ROOT
}
/mrbgems/
#{
dep
[
:gem
]
}
"
# check core
{
:gem
=>
dep
[
:gem
],
:default
=>
{
:core
=>
dep
[
:gem
]
}
}
else
# fallback to mgem-list
{
:gem
=>
dep
[
:gem
],
:default
=>
{
:mgem
=>
dep
[
:gem
]
}
}
end
end
def
generate_gem_table
build
gem_table
=
@ary
.
reduce
({})
{
|
res
,
v
|
res
[
v
.
name
]
=
v
;
res
}
default_gems
=
[]
each
do
|
g
|
g
.
dependencies
.
each
do
|
dep
|
unless
gem_table
.
key?
dep
[
:gem
]
if
dep
[
:default
];
default_gems
<<
dep
elsif
File
.
exist?
"
#{
MRUBY_ROOT
}
/mrbgems/
#{
dep
[
:gem
]
}
"
# check core
default_gems
<<
{
:gem
=>
dep
[
:gem
],
:default
=>
{
:core
=>
dep
[
:gem
]
}
}
else
# fallback to mgem-list
default_gems
<<
{
:gem
=>
dep
[
:gem
],
:default
=>
{
:mgem
=>
dep
[
:gem
]
}
}
end
end
default_gems
<<
default_gem_params
(
dep
)
unless
gem_table
.
key?
dep
[
:gem
]
end
end
...
...
@@ -348,11 +350,7 @@ module MRuby
spec
.
setup
spec
.
dependencies
.
each
do
|
dep
|
unless
gem_table
.
key?
dep
[
:gem
]
if
dep
[
:default
];
default_gems
<<
dep
else
default_gems
<<
{
:gem
=>
dep
[
:gem
],
:default
=>
{
:mgem
=>
dep
[
:gem
]
}
}
end
end
default_gems
<<
default_gem_params
(
dep
)
unless
gem_table
.
key?
dep
[
:gem
]
end
gem_table
[
spec
.
name
]
=
spec
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment