diff options
| author | Hiroshi Mimaki <[email protected]> | 2020-06-05 12:42:56 +0900 |
|---|---|---|
| committer | Hiroshi Mimaki <[email protected]> | 2020-06-05 12:42:56 +0900 |
| commit | 81d340e0421daf39a8208a0181d6a54e726db134 (patch) | |
| tree | 18cefdd763a716dbd27c23bfdf98ffa2135f7624 /lib | |
| parent | f9d113f7647121f8578742a2a9ac256ece365e3f (diff) | |
| parent | 4e40169ed6d200918e542aa8d8e64634794e1864 (diff) | |
| download | mruby-81d340e0421daf39a8208a0181d6a54e726db134.tar.gz mruby-81d340e0421daf39a8208a0181d6a54e726db134.zip | |
Merge master.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mruby/build.rb | 3 | ||||
| -rw-r--r-- | lib/mruby/source.rb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 5c7832dff..8154b2b19 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -336,7 +336,8 @@ EOS puts " Binaries: #{@bins.join(', ')}" unless @bins.empty? unless @gems.empty? puts " Included Gems:" - @gems.map do |gem| + gems = @gems.sort_by { |gem| gem.name } + gems.each do |gem| gem_version = " - #{gem.version}" if gem.version != '0.0.0' gem_summary = " - #{gem.summary}" if gem.summary puts " #{gem.name}#{gem_version}#{gem_summary}" diff --git a/lib/mruby/source.rb b/lib/mruby/source.rb index 5819a322b..a305c7b04 100644 --- a/lib/mruby/source.rb +++ b/lib/mruby/source.rb @@ -6,7 +6,9 @@ module MRuby ROOT = Pathname.new(File.expand_path('../../../',__FILE__)) # Reads a constant defined at version.h - MRUBY_READ_VERSION_CONSTANT = Proc.new { |name| ROOT.join('include','mruby','version.h').read.match(/^#define #{name} +"?([\w\. ]+)"?$/)[1] } + MRUBY_READ_VERSION_CONSTANT = Proc.new do |name| + ROOT.join('include','mruby','version.h').read.match(/^#define #{name} +"?([\w\. ]+)"?\r?$/)[1] + end MRUBY_RUBY_VERSION = MRUBY_READ_VERSION_CONSTANT['MRUBY_RUBY_VERSION'] MRUBY_RUBY_ENGINE = MRUBY_READ_VERSION_CONSTANT['MRUBY_RUBY_ENGINE'] |