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
3e9b501f
Unverified
Commit
3e9b501f
authored
Oct 09, 2019
by
Yukihiro "Matz" Matsumoto
Committed by
GitHub
Oct 09, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4761 from take-cheeze/fix_4759
Add mrbgem version field to lock file
parents
b68818a8
f7616c42
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
lib/mruby/build.rb
lib/mruby/build.rb
+2
-1
lib/mruby/build/load_gems.rb
lib/mruby/build/load_gems.rb
+1
-0
lib/mruby/gem.rb
lib/mruby/gem.rb
+3
-0
No files found.
lib/mruby/build.rb
View file @
3e9b501f
...
...
@@ -43,7 +43,7 @@ module MRuby
include
Rake
::
DSL
include
LoadGems
attr_accessor
:name
,
:bins
,
:exts
,
:file_separator
,
:build_dir
,
:gem_clone_dir
attr_reader
:libmruby_objs
,
:gems
,
:toolchains
attr_reader
:libmruby_objs
,
:gems
,
:toolchains
,
:gem_dir_to_repo_url
attr_writer
:enable_bintest
,
:enable_test
alias
libmruby
libmruby_objs
...
...
@@ -90,6 +90,7 @@ module MRuby
@enable_test
=
false
@enable_lock
=
true
@toolchains
=
[]
@gem_dir_to_repo_url
=
{}
MRuby
.
targets
[
@name
]
=
self
end
...
...
lib/mruby/build/load_gems.rb
View file @
3e9b501f
...
...
@@ -113,6 +113,7 @@ module MRuby
end
if
lock_enabled?
@gem_dir_to_repo_url
[
gemdir
]
=
url
unless
params
[
:path
]
locks
[
url
]
=
{
'url'
=>
url
,
'branch'
=>
git
.
current_branch
(
gemdir
),
...
...
lib/mruby/gem.rb
View file @
3e9b501f
...
...
@@ -91,6 +91,9 @@ module MRuby
build
.
libmruby_objs
<<
@objs
instance_eval
(
&
@build_config_initializer
)
if
@build_config_initializer
repo_url
=
build
.
gem_dir_to_repo_url
[
dir
]
build
.
locks
[
repo_url
][
'version'
]
=
version
if
repo_url
end
def
setup_compilers
...
...
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