diff options
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/doc.rake | 4 | ||||
| -rw-r--r-- | tasks/gitlab.rake | 4 | ||||
| -rw-r--r-- | tasks/libmruby.rake | 2 | ||||
| -rw-r--r-- | tasks/mrbgems.rake | 4 | ||||
| -rw-r--r-- | tasks/toolchains/android.rake | 4 | ||||
| -rw-r--r-- | tasks/toolchains/gcc.rake | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/tasks/doc.rake b/tasks/doc.rake index 4aec2d0a1..11b76bb3f 100644 --- a/tasks/doc.rake +++ b/tasks/doc.rake @@ -25,12 +25,12 @@ end desc 'clean all built docs' task :clean_api_doc do - FileUtils.rm_rf 'doc/api' + rm_rf 'doc/api' end desc 'clean all built docs' task :clean_capi_doc do - FileUtils.rm_rf 'doc/capi' + rm_rf 'doc/capi' end desc 'clean all built docs' diff --git a/tasks/gitlab.rake b/tasks/gitlab.rake index 471172377..31c8c044a 100644 --- a/tasks/gitlab.rake +++ b/tasks/gitlab.rake @@ -80,7 +80,7 @@ task :gitlab_config do _info += int_conf['16'] ? 'int16 ' : '' _info += int_conf['64'] ? 'int64 ' : '' _info += boxing_conf['NAN'] ? 'nan ' : '' - _info += boxing_conf['word'] ? 'word ' : '' + _info += boxing_conf['WORD'] ? 'word ' : '' _info += utf8_conf['UTF8'] ? 'utf8 ' : '' _info = _info.gsub(/ +/, ' ').strip.tr(' ', '_') configs << { '_info' => _info, 'CFLAGS' => "#{bit}#{env}", 'LDFLAGS' => bit.strip.to_s } @@ -110,7 +110,7 @@ task :gitlab_config do 'stage' => 'test', 'image' => ci_docker_tag(compiler), 'variables' => hash, - 'script' => 'env; ./minirake --verbose all test' + 'script' => 'env; rake --verbose all test' } end end diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake index ab5a15b4a..17f8534e2 100644 --- a/tasks/libmruby.rake +++ b/tasks/libmruby.rake @@ -4,7 +4,7 @@ MRuby.each_target do end file "#{build_dir}/lib/libmruby.flags.mak" => [__FILE__, libmruby_static] do |t| - FileUtils.mkdir_p File.dirname t.name + mkdir_p File.dirname t.name open(t.name, 'w') do |f| f.puts "MRUBY_CFLAGS = #{cc.all_flags}" diff --git a/tasks/mrbgems.rake b/tasks/mrbgems.rake index fb76856e5..8168e4fab 100644 --- a/tasks/mrbgems.rake +++ b/tasks/mrbgems.rake @@ -8,7 +8,7 @@ MRuby.each_target do self.libmruby_objs << objfile("#{build_dir}/mrbgems/gem_init") file objfile("#{build_dir}/mrbgems/gem_init") => ["#{build_dir}/mrbgems/gem_init.c", "#{build_dir}/LEGAL"] file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIG, __FILE__] do |t| - FileUtils.mkdir_p "#{build_dir}/mrbgems" + mkdir_p "#{build_dir}/mrbgems" open(t.name, 'w') do |f| gem_func_gems = gems.select { |g| g.generate_functions } gem_func_decls = gem_func_gems.each_with_object('') do |g, s| @@ -53,7 +53,7 @@ MRuby.each_target do # legal documents file "#{build_dir}/LEGAL" => [MRUBY_CONFIG, __FILE__] do |t| - FileUtils.mkdir_p File.dirname t.name + mkdir_p File.dirname t.name open(t.name, 'w+') do |f| f.puts <<LEGAL Copyright (c) #{Time.now.year} mruby developers diff --git a/tasks/toolchains/android.rake b/tasks/toolchains/android.rake index c7df9ef80..0ac4d000c 100644 --- a/tasks/toolchains/android.rake +++ b/tasks/toolchains/android.rake @@ -67,7 +67,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter end def home_path - @home_path ||= Pathname( + @home_path ||= Pathname.new( params[:ndk_home] || ENV['ANDROID_NDK_HOME'] || DEFAULT_NDK_HOMES.find { |path| @@ -124,7 +124,7 @@ Set ANDROID_PLATFORM environment variable or set :platform parameter path = home_path.join('toolchains', 'llvm' , 'prebuilt', 'windows*') Dir.glob(path.to_s){ |item| next if File.file?(item) - path = Pathname(item) + path = Pathname.new(item) break } path.basename diff --git a/tasks/toolchains/gcc.rake b/tasks/toolchains/gcc.rake index 1a28026bf..e9ea2550c 100644 --- a/tasks/toolchains/gcc.rake +++ b/tasks/toolchains/gcc.rake @@ -15,7 +15,7 @@ MRuby::Toolchain.new(:gcc) do |conf, params| compiler.option_include_path = '-I%s' compiler.option_define = '-D%s' compiler.compile_options = '%{flags} -MMD -o %{outfile} -c %{infile}' - compiler.cxx_compile_flag = '-x c++ -std=c++03' + compiler.cxx_compile_flag = '-x c++ -std=gnu++03' compiler.cxx_exception_flag = '-fexceptions' compiler.cxx_invalid_flags = c_mandatory_flags + cxx_invalid_flags end |