diff options
| author | take_cheeze <[email protected]> | 2014-04-09 13:59:39 +0900 |
|---|---|---|
| committer | take_cheeze <[email protected]> | 2014-04-09 13:59:39 +0900 |
| commit | 604134e57d76487f9904d57aba47880fcfb1314e (patch) | |
| tree | d25c711a36fe6af27bec3f4f825a801d30f56b9c | |
| parent | 63cf7073de6e9341e18b323f679afead2bacd924 (diff) | |
| download | mruby-604134e57d76487f9904d57aba47880fcfb1314e.tar.gz mruby-604134e57d76487f9904d57aba47880fcfb1314e.zip | |
Make bintest enabling like other `enable_xxx` methods.
| -rw-r--r-- | build_config.rb | 2 | ||||
| -rw-r--r-- | doc/compile/README.md | 2 | ||||
| -rw-r--r-- | tasks/mruby_build.rake | 11 | ||||
| -rw-r--r-- | travis_config.rb | 4 |
4 files changed, 14 insertions, 5 deletions
diff --git a/build_config.rb b/build_config.rb index 991a6bfb3..3f8009047 100644 --- a/build_config.rb +++ b/build_config.rb @@ -80,7 +80,7 @@ MRuby::Build.new do |conf| # conf.file_separator = '/' # bintest - # conf.enable_bintest = true + # conf.enable_bintest end # Define cross build settings diff --git a/doc/compile/README.md b/doc/compile/README.md index e494591f7..19bcf1ac6 100644 --- a/doc/compile/README.md +++ b/doc/compile/README.md @@ -193,7 +193,7 @@ If you want a temporary files use `tempfile` module of CRuby instead of ```/tmp/ You can enable it with following: - conf.enable_bintest = true + conf.enable_bintest ### C++ ABI diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index 1de00d496..1df67c37e 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -43,8 +43,9 @@ module MRuby end include Rake::DSL include LoadGems - attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir, :enable_bintest + attr_accessor :name, :bins, :exts, :file_separator, :build_dir, :gem_clone_dir attr_reader :libmruby, :gems + attr_writer :enable_bintest COMPILERS = %w(cc cxx objc asm) COMMANDS = COMPILERS + %w(linker archiver yacc gperf git exts mrbc) @@ -111,6 +112,14 @@ module MRuby @cxx_abi_enabled = true end + def enable_bintest + @enable_bintest = true + end + + def bintest_enabled? + @enable_bintest + end + def toolchain(name) tc = Toolchain.toolchains[name.to_s] fail "Unknown #{name} toolchain" unless tc diff --git a/travis_config.rb b/travis_config.rb index 4c9e623fe..082a79643 100644 --- a/travis_config.rb +++ b/travis_config.rb @@ -19,7 +19,7 @@ MRuby::Build.new do |conf| conf.compilers.each do |c| c.defines += %w(MRB_DEBUG MRB_GC_FIXED_ARENA) end - conf.enable_bintest = true + conf.enable_bintest end MRuby::Build.new('cxx_abi') do |conf| @@ -30,7 +30,7 @@ MRuby::Build.new('cxx_abi') do |conf| conf.compilers.each do |c| c.defines += %w(MRB_DEBUG MRB_GC_FIXED_ARENA) end - conf.enable_bintest = true + conf.enable_bintest enable_cxx_abi end |