webruby 0.2.7 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6513c6c3002e5e95c2c5a19b60dec1243224216
-  data.tar.gz: f682702ae1a94714e2b6a35a62efa8f9f07803d3
+  metadata.gz: 5ae51afdb9e0aef9e5430812d690ffc12580215b
+  data.tar.gz: fab77c8d867c4dbd1460b80a1e3a12036b13b38f
 SHA512:
-  metadata.gz: 76d40913b69ff80303589bf22895a590723d8c245ee47f9afa4578f084ea58cee89bb09dcfc6c83b2aa7238e7b7e2078f8900d69446319fae80c8fc812b95a90
-  data.tar.gz: f0c76941cd3b514e667cb86e352bc225e762a01604f78e515ab4ef34b80c5149acc4cd616a43a2727e4ed2437eb8b6909b73dfdd7a0933c1d2d3c287579ffb03
+  metadata.gz: 6f2ded3c9b62ea5ffb83acd1b64158e91e7edb661ec4b02b4afc02656b7f71b9528357746de88b01fc644abec0cbc73c373e7fde381db4a9407c0df278c09aed
+  data.tar.gz: a8f236d5863c46a631f3fb8c138886ae27efb715098f4790fc1ca0c8aa337c971ca1d0c4bcf1f4c1da6470f813b3aa9f803ce9604a13593899d9bf778990d427

data/lib/webruby/environment.rb

@@ -1,6 +1,5 @@
 BASE_DIR = File.expand_path(File.join(File.dirname(__FILE__),
                                       %w[.. ..]))
-EMSCRIPTEN_DIR = File.join(BASE_DIR, %w[modules emscripten])
 MRUBY_DIR = File.join(BASE_DIR, %w[modules mruby])
 DRIVER_DIR = File.join(BASE_DIR, %w[driver])
 SCRIPTS_DIR = File.join(BASE_DIR, %w[scripts])
@@ -10,7 +9,31 @@ def root
   MRUBY_DIR
 end
 
+EMSCRIPTEN_DIR = ENV["EMSCRIPTEN"]
+unless EMSCRIPTEN_DIR
+  # Read ~/.emscripten if needed
+  if File.exists?("~/.emscripten")
+    File.read("~/.emscripten").each do |line|
+      m = line.match(/EMSCRIPTEN_ROOT='([^']+)'/)
+      if m
+        EMSCRIPTEN_DIR = m[1]
+      end
+    end
+    ENV["EMSCRIPTEN"] = EMSCRIPTEN_DIR
+  end
+end
+
+unless EMSCRIPTEN_DIR && EMSCRIPTEN_DIR.length > 0
+  puts <<__EOF__
+WARNING: We found out that you have not configured emscripten. Please
+install emsdk followings steps at http://kripken.github.io/emscripten-site/
+and rerun this command later.
+__EOF__
+  exit(1)
+end
+
 EMCC = File.join(EMSCRIPTEN_DIR, 'emcc')
+EMXX = File.join(EMSCRIPTEN_DIR, 'em++')
 EMLD = File.join(EMSCRIPTEN_DIR, 'emcc')
 EMAR = File.join(EMSCRIPTEN_DIR, 'emar')
 
@@ -25,13 +48,6 @@ LIBMRUBY = "mruby/emscripten/lib/libmruby.a"
 MRBTEST = "mruby/emscripten/test/mrbtest"
 MRBC = "mruby/host/bin/mrbc"
 
-# the new le32-unknown-nacl triple has a limitation which will break
-# mruby build, we have to resort to the old i386 triple.
-ENV['EMCC_LLVM_TARGET'] = 'i386-pc-linux-gnu'
-
-# Use our emscripten directory
-ENV['EMSCRIPTEN'] = EMSCRIPTEN_DIR
-
 # TODO: change this to a gem dependency
 MRUBYMIX = File.join(BASE_DIR, %w[modules mrubymix bin mrubymix])
 

data/lib/webruby/rake/files.rake

@@ -32,37 +32,21 @@ file "#{Webruby.build_dir}/app.o" => "#{Webruby.build_dir}/app.c" do |t|
   sh "#{EMCC} #{EMCC_CFLAGS} #{require_flag} #{Webruby::App.config.cflags.join(' ')} #{Webruby.build_dir}/app.c -o #{Webruby.build_dir}/app.o"
 end
 
-file "#{Webruby.build_dir}/link.js" =>
-  ["#{Webruby.build_dir}/app.o", :libmruby] +
-  Webruby.gem_js_files do |t|
+file "#{Webruby.build_dir}/#{Webruby::App.config.output_name}" =>
+     ["#{Webruby.build_dir}/app.o", :libmruby] + Webruby.gem_js_files do |t|
   func_arg = Webruby.get_exported_arg("#{Webruby.build_dir}/functions",
                                       Webruby::App.config.loading_mode,
                                       [])
+  runner_arg = Webruby::App.config.append_file ? "--post-js #{Webruby::App.config.append_file}" : ""
 
-  sh "#{EMLD} #{Webruby.build_dir}/app.o #{Webruby.build_dir}/#{LIBMRUBY} #{Webruby::App.config.static_libs.join(' ')} -o #{Webruby.build_dir}/link.js #{Webruby.gem_js_flags} #{func_arg} #{Webruby::App.config.ldflags.join(' ')} #{Webruby::App.config.optimization_flag}"
-end
-
-append_file_deps = Webruby::App.config.append_file ?
-    [Webruby::App.config.append_file] : []
-
-file "#{Webruby.build_dir}/#{Webruby::App.config.output_name}" =>
-  ["#{Webruby.build_dir}/link.js"] + append_file_deps do |t|
-  sh "cat #{Webruby.build_dir}/link.js > #{Webruby.build_dir}/#{Webruby::App.config.output_name}"
-  if Webruby::App.config.append_file
-    sh "echo '' >> #{Webruby.build_dir}/#{Webruby::App.config.output_name}"
-    sh "cat #{Webruby::App.config.append_file} >> #{Webruby.build_dir}/#{Webruby::App.config.output_name}"
-  end
-end
-
-file "#{Webruby.build_dir}/mrbtest.bc" => :libmruby_test do |t|
-  sh "cp #{Webruby.build_dir}/#{MRBTEST} #{Webruby.build_dir}/mrbtest.bc"
+  sh "#{EMLD} #{Webruby.build_dir}/app.o #{Webruby.object_files.join(' ')} #{Webruby::App.config.static_libs.join(' ')} -o #{Webruby.build_dir}/#{Webruby::App.config.output_name} #{Webruby.gem_js_flags} #{func_arg} #{Webruby::App.config.ldflags.join(' ')} #{Webruby::App.config.optimization_flag} #{runner_arg}"
 end
 
 file "#{Webruby.build_dir}/mrbtest.js" =>
-  ["#{Webruby.build_dir}/mrbtest.bc"] + Webruby.gem_test_js_files do |t|
+  [:libmruby_test] + Webruby.gem_test_js_files do |t|
   # loading mode 0 is necessary for mrbtest
   func_arg = Webruby.get_exported_arg("#{Webruby.build_dir}/functions",
                                       0, ['main'])
 
-  sh "#{EMLD} #{Webruby.build_dir}/mrbtest.bc #{Webruby::App.config.static_libs.join(' ')} -o #{Webruby.build_dir}/mrbtest.js -s TOTAL_MEMORY=33554432 #{Webruby.gem_test_js_flags} #{func_arg} #{Webruby::App.config.ldflags.join(' ')} #{Webruby::App.config.optimization_flag}"
+  sh "#{EMLD} #{Webruby.test_object_files.join(' ')} #{Webruby.object_files.join(' ')} #{Webruby::App.config.static_libs.join(' ')} -o #{Webruby.build_dir}/mrbtest.js -s TOTAL_MEMORY=33554432 #{Webruby.gem_test_js_flags} #{func_arg} #{Webruby::App.config.ldflags.join(' ')} #{Webruby::App.config.optimization_flag}"
 end

data/lib/webruby/rake/general.rake

@@ -17,5 +17,5 @@ task :default => :js
 task :js => "#{Webruby.build_dir}/#{Webruby::App.config.output_name}"
 
 task :mrbtest => "#{Webruby.build_dir}/mrbtest.js" do |t|
-  sh "node #{Webruby.build_dir}/mrbtest.js"
+  sh "cd #{Webruby.build_dir} && node mrbtest.js"
 end

data/lib/webruby/rake/mruby.rake

@@ -18,6 +18,7 @@ MRuby::Toolchain.new(:emscripten) do |conf|
     cc.flags.push(*#{Webruby::App.config.cflags.inspect})
   end
 
+  conf.cxx.command = '#{EMLD}'
   conf.linker.command = '#{EMLD}'
   conf.archiver.command = '#{EMAR}'
 end

data/lib/webruby/utility.rb

@@ -39,6 +39,20 @@ module Webruby
       Webruby::App.config.entrypoint
     end
 
+    def object_files
+      (Dir.glob("#{full_build_dir}/mruby/emscripten/src/**/*.o") +
+       Dir.glob("#{full_build_dir}/mruby/emscripten/mrblib/**/*.o") +
+       Dir.glob("#{full_build_dir}/mruby/emscripten/mrbgems/**/*.o"))
+        .reject { |f|
+        f.end_with? "gem_test.o"
+      }
+    end
+
+    def test_object_files
+      (Dir.glob("#{full_build_dir}/mruby/emscripten/test/**/*.o") +
+       Dir.glob("#{full_build_dir}/mruby/emscripten/mrbgems/**/gem_test.o"))
+    end
+
     def rb_files
       Dir.glob("#{File.dirname(entrypoint_file)}/**")
     end

data/modules/mruby/AUTHORS

@@ -17,3 +17,17 @@ Original Authors "mruby developers" are:
    Jun Hiroe
    Narihiro Nakamura
    Yuichi Nishiwaki
+   Tatsuhiko Kubo
+   Takeshi Watanabe
+   Yuki Kurihara
+   specified non-profit corporation mruby Forum
+   Kazuaki Tanaka
+   Hiromasa Ishii
+   Hiroshi Mimaki
+   Satoshi Odawara
+   Mitsubishi Electric Micro-Computer Application Software Co.,Ltd.
+   Hiroyuki Matsuzaki
+   Yuhei Okazaki
+   Manycolors, Inc.
+   Shota Nakano
+   Yuichi Osawa

data/modules/mruby/CONTRIBUTING.md

@@ -14,6 +14,8 @@ things in mind before submitting your pull request:
 * Don't mix several features or bug-fixes in one pull request
 * Create a meaningful commit message
 * Explain your change (i.e. with a link to the issue you are fixing)
+* Use mrbgem to provide non ISO features (classes, modules and methods) unless
+  you have a special reason to implement them in the core
 
 ## Coding conventions
 
@@ -31,8 +33,9 @@ mruby should be highly portable to other systems and compilers. For this it is
 recommended to keep your code as close as possible to the C99 standard
 (http://www.open-std.org/jtc1/sc22/WG14/www/docs/n1256.pdf).
 
-Although we target C99, Visual C++ is also an important target for mruby. For this
-reason a declaration of a local variable has to be at the beginning of a scope block.
+Although we target C99, Visual C++ is also an important target for mruby. For
+this reason a declaration of a local variable has to be at the beginning of a
+scope block.
 
 #### Reduce library dependencies to a minimum
 
@@ -56,8 +59,8 @@ Use C++ style comments only for temporary comment e.g. commenting out some code
 
 ### Ruby code
 
-Parts of the standard library of mruby are written in the Ruby programming language
-itself. Please note the following hints for your Ruby code:
+Parts of the standard library of mruby are written in the Ruby programming
+language itself. Please note the following hints for your Ruby code:
 
 #### Comply with the Ruby standard (ISO/IEC 30170:2012)
 

data/modules/mruby/INSTALL

@@ -1,34 +1,51 @@
 * Prerequisites
-  
-  1. Make sure you have bison (http://www.gnu.org/software/bison/) installed in your system. 
+
+  1. Make sure you have bison (http://www.gnu.org/software/bison/) installed in
+     your system.
   2. Make sure you have ruby installed in your system (required to build).
 
+
 * Compilation and Installation
 
   1. Run make in the top directory.
 
-     This command will create a build directory with a directory for the host environment
-     and one for each crossbuild environment based on the settings in the build_config.rb 
-     file.
+     This command will create a build directory with a directory for the host
+     environment and one for each crossbuild environment based on the settings
+     in the build_config.rb file.
 
-     Assuming a default build, each of the environment directories will have the following 
-     important directories:
+     Assuming a default build, each of the environment directories will have
+     the following important directories:
 
        * bin - The binary executables for this environment
        * lib - The libraries for this environment
 
-     You can find the header files in the include directory at the root of the project.
+     You can find the header files in the include directory at the root of the
+     project.
 
-     You can directory invoke 'minirake' as the following.
+     You can directly invoke 'minirake' with the following command:
 
-        $ ruby ./minirake
+         $ ruby ./minirake
 
 If an error occurs when compiling mruby, it will be helpful for others if you
 send a detailed report to the developers that includes the error log, machine,
 and OS type.
 
 
-* Porting to other platforms
+* Adding existing gems
+
+Gems from the [list of mruby gems](http://www.mruby.org/libraries/) can be
+added by adding their respective GitHub URLs to build_config.rb. For example,
+to add implementations of the File and IO Ruby core classes to mruby, insert
+the following in build_config.rb under the comment section `Use mrbgems`:
+
+    conf.gem :git => 'git@github.com:iij/mruby-io.git', :branch => 'master'
 
+Afterwards, re-run:
+
+    ruby ./minirake
+
+
+* Porting to other platforms
 
 That's all.
+

data/modules/mruby/MITL

@@ -1,20 +1,20 @@
-Copyright (c) 2013 mruby developers
+Copyright (c) 2014 mruby developers
 
-Permission is hereby granted, free of charge, to any person obtaining a 
-copy of this software and associated documentation files (the "Software"), 
-to deal in the Software without restriction, including without limitation 
-the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the 
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in 
+The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 

data/modules/mruby/Makefile

@@ -1,18 +1,17 @@
 # mruby is using Rake (http://rake.rubyforge.org) as a build tool.
-# We provide a minimalistic version called minirake inside of our 
+# We provide a minimalistic version called minirake inside of our
 # codebase.
 
 RAKE = ruby ./minirake
 
-.PHONY : all
 all :
 	$(RAKE)
+.PHONY : all
 
-.PHONY : test
 test : all
 	$(RAKE) test
+.PHONY : test
 
-.PHONY : clean
 clean :
 	$(RAKE) clean
-
+.PHONY : clean

data/modules/mruby/README.md

@@ -1,28 +1,28 @@
-# !!Notice!!
-    This is a preliminary release for internal team review.
-    The URLs and addresses described below are not available yet.
-    The official release will be announced later.
-    Any suggestions for modification are welcome.
-    Delays in replies are to be expected. Sorry in advance.
-
-[![Build Status](https://travis-ci.org/mruby/mruby.png?branch=master)](https://travis-ci.org/mruby/mruby)
+[![Build Status][build-status-img]][travis-ci]
 
 ## What's mruby
 
-mruby is the lightweight implementation of the Ruby language complying to (part of)
-the [ISO standard](http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579). 
-mruby can be linked and embedded within your application.  We provide the interpreter program "mruby" and 
-the interactive mruby shell "mirb" as examples.  You can also compile Ruby programs into compiled byte code
-using the mruby compiler "mrbc".  All those tools reside in "bin" directory.  The "mrbc" is also able to
-generate compiled byte code in a C source file.  You can check the "mrbtest" program under the "test" directory.
+mruby is the lightweight implementation of the Ruby language complying to (part
+of) the [ISO standard][ISO-standard].  Its syntax is Ruby 1.9 compatible.
+
+mruby can be linked and embedded within your application.  We provide the
+interpreter program "mruby" and the interactive mruby shell "mirb" as examples.
+You can also compile Ruby programs into compiled byte code using the mruby
+compiler "mrbc".  All those tools reside in the "bin" directory.  "mrbc" is
+also able to generate compiled byte code in a C source file, see the "mrbtest"
+program under the "test" directory for an example.
 
-This achievement was sponsored by the Regional Innovation Creation R&D Programs of
-the Ministry of Economy, Trade and Industry of Japan.
+This achievement was sponsored by the Regional Innovation Creation R&D Programs
+of the Ministry of Economy, Trade and Industry of Japan.
 
 
 ## How to get mruby
 
-The mruby distribution files can be found in the following site:
+The stable version 1.1.0 of mruby can be downloaded via the following URL:
+
+  https://github.com/mruby/mruby/archive/1.1.0.zip
+
+The latest development version of mruby can be downloaded via the following URL:
 
   https://github.com/mruby/mruby/zipball/master
 
@@ -31,30 +31,24 @@ following command:
 
     $ git clone https://github.com/mruby/mruby.git
 
-There are some other branches under development. Try the following
-command and see the list of branches:
-
-    $ git branch -r
-
 
 ## mruby home-page
 
-mruby's website is not launched yet but we are actively working on it.
-
-The URL of the mruby home-page will be:
+The URL of the mruby home-page is:
 
   http://www.mruby.org/
 
 
 ## Mailing list
 
-To subscribe to the mruby mailing list....[T.B.D.]
+We don't have mailing list, use GitHub forum <http://github.com/mruby/mruby>.
 
 
-## How to compile and install
+## How to compile and install (mruby and gems)
 
 See the INSTALL file.
 
+
 ## Running Tests
 
 To run the tests, execute the following from the project's root directory.
@@ -65,54 +59,65 @@ Or
 
     $ ruby ./minirake test
 
+
 ## Customization
 
 mruby contains a package manager called *mrbgems*. To create extensions
 in C and/or Ruby you should create a *GEM*. You will find a complete
 documentation with examples under *examples/mrbgems*.
 
+
 ## License
 
-Copyright (c) 2013 mruby developers
+Copyright (c) 2014 mruby developers
 
-Permission is hereby granted, free of charge, to any person obtaining a 
-copy of this software and associated documentation files (the "Software"), 
-to deal in the Software without restriction, including without limitation 
-the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the 
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in 
+The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
+
 ## Note for License
 
 mruby has chosen a MIT License due to its permissive license allowing
 developers to target various environments such as embedded systems.
 However, the license requires the display of the copyright notice and license
-information in manuals for instance. Doing so for big projects can be 
-complicated or troublesome.
-This is why mruby has decided to display "mruby developers" as the copyright name
-to make it simple conventionally.
+information in manuals for instance. Doing so for big projects can be
+complicated or troublesome.  This is why mruby has decided to display "mruby
+developers" as the copyright name to make it simple conventionally.
 In the future, mruby might ask you to distribute your new code
 (that you will commit,) under the MIT License as a member of
 "mruby developers" but contributors will keep their copyright.
 (We did not intend for contributors to transfer or waive their copyrights,
- Actual copyright holder name (contributors) will be listed in the AUTHORS file.)
+Actual copyright holder name (contributors) will be listed in the AUTHORS
+file.)
 
 Please ask us if you want to distribute your code under another license.
 
+
 ## How to Contribute
 
-See the [contribution guidelines](https://github.com/mruby/mruby/blob/master/CONTRIBUTING.md)
-then send a pull request to <http://github.com/mruby/mruby>.  We consider you have granted
-non-exclusive right to your contributed code under MIT license.  If you want to be named
-as one of mruby developers, please include an update to the AUTHORS file in your pull request.
+See the [contribution guidelines][contribution-guidelines] then send a pull
+request to <http://github.com/mruby/mruby>.  We consider you have granted
+non-exclusive right to your contributed code under MIT license.  If you want to
+be named as one of mruby developers, please include an update to the AUTHORS
+file in your pull request.
+
+[ISO-standard]: http://www.iso.org/iso/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=59579
+[build-status-img]: https://travis-ci.org/mruby/mruby.png?branch=master
+[contribution-guidelines]: https://github.com/mruby/mruby/blob/master/CONTRIBUTING.md
+[travis-ci]: https://travis-ci.org/mruby/mruby
+

data/modules/mruby/Rakefile

@@ -33,8 +33,11 @@ load "#{MRUBY_ROOT}/test/mrbtest.rake"
 # generic build targets, rules
 task :default => :all
 
+bin_path = "#{MRUBY_ROOT}/bin"
+FileUtils.mkdir_p bin_path, { :verbose => $verbose }
+
 depfiles = MRuby.targets['host'].bins.map do |bin|
-  install_path = MRuby.targets['host'].exefile("#{MRUBY_ROOT}/bin/#{bin}")
+  install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
   source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
 
   file install_path => source_path do |t|
@@ -49,11 +52,15 @@ MRuby.each_target do |target|
   gems.map do |gem|
     current_dir = gem.dir.relative_path_from(Dir.pwd)
     relative_from_root = gem.dir.relative_path_from(MRUBY_ROOT)
-    current_build_dir = "#{build_dir}/#{relative_from_root}"
+    current_build_dir = File.expand_path "#{build_dir}/#{relative_from_root}"
+
+    if current_build_dir !~ /^#{build_dir}/
+      current_build_dir = "#{build_dir}/mrbgems/#{gem.name}"
+    end
 
     gem.bins.each do |bin|
       exec = exefile("#{build_dir}/bin/#{bin}")
-      objs = Dir.glob("#{current_dir}/tools/#{bin}/*.{c,cpp,cxx}").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) }
+      objs = Dir.glob("#{current_dir}/tools/#{bin}/*.{c,cpp,cxx,cc}").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) }
 
       file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t|
         gem_flags = gems.map { |g| g.linker.flags }
@@ -61,7 +68,7 @@ MRuby.each_target do |target|
         gem_flags_after_libraries = gems.map { |g| g.linker.flags_after_libraries }
         gem_libraries = gems.map { |g| g.linker.libraries }
         gem_library_paths = gems.map { |g| g.linker.library_paths }
-        linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries
+        linker.run t.name, t.prerequisites, gem_libraries, gem_library_paths, gem_flags, gem_flags_before_libraries, gem_flags_after_libraries
       end
 
       if target == MRuby.targets['host']
@@ -72,6 +79,16 @@ MRuby.each_target do |target|
           FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
         end
         depfiles += [ install_path ]
+      elsif target == MRuby.targets['host-debug']
+        unless MRuby.targets['host'].gems.map {|g| g.bins}.include?([bin])
+          install_path = MRuby.targets['host-debug'].exefile("#{MRUBY_ROOT}/bin/#{bin}")
+
+          file install_path => exec do |t|
+            FileUtils.rm_f t.name, { :verbose => $verbose }
+            FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
+          end
+          depfiles += [ install_path ]
+        end
       else
         depfiles += [ exec ]
       end
@@ -98,7 +115,7 @@ task :all => depfiles do
 end
 
 desc "run all mruby tests"
-task :test => MRuby.targets.values.map { |t| t.build_mrbtest_lib_only? ? t.libfile("#{t.build_dir}/test/mrbtest") : t.exefile("#{t.build_dir}/test/mrbtest") } do
+task :test => ["all"] + MRuby.targets.values.map { |t| t.build_mrbtest_lib_only? ? t.libfile("#{t.build_dir}/test/mrbtest") : t.exefile("#{t.build_dir}/test/mrbtest") } do
   MRuby.each_target do
     run_test unless build_mrbtest_lib_only?
   end
@@ -110,5 +127,18 @@ task :clean do
     FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
   end
   FileUtils.rm_f depfiles, { :verbose => $verbose }
-  puts "Cleaned up build folder"
+  puts "Cleaned up target build folder"
+end
+
+desc "clean everything!"
+task :deep_clean => ["clean"] do
+  MRuby.each_target do |t|
+    FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose }
+  end
+  puts "Cleaned up mrbgems build folder"
+end
+
+desc 'generate document'
+task :doc do
+  load "#{MRUBY_ROOT}/doc/language/generator.rb"
 end

data/modules/mruby/benchmark/ao-render.rb

@@ -1,7 +1,6 @@
 # AO render benchmark
 # Original program (C) Syoyo Fujita in Javascript (and other languages)
-#      http://lucille.atso-net.jp/blog/?p=642
-#      http://lucille.atso-net.jp/blog/?p=711
+#      https://code.google.com/p/aobench/
 # Ruby(yarv2llvm) version by Hideki Miura
 # mruby version by Hideki Miura
 #