diff options
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/libmruby.rake | 10 | ||||
| -rw-r--r-- | tasks/mrbgem_spec.rake | 20 | ||||
| -rw-r--r-- | tasks/mrbgems_test.rake | 6 | ||||
| -rw-r--r-- | tasks/mruby_build.rake | 11 | ||||
| -rw-r--r-- | tasks/mruby_build_commands.rake | 35 | ||||
| -rw-r--r-- | tasks/ruby_ext.rake | 23 | ||||
| -rw-r--r-- | tasks/toolchains/vs2012.rake | 4 |
7 files changed, 86 insertions, 23 deletions
diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake index c3b9d714f..108f42f59 100644 --- a/tasks/libmruby.rake +++ b/tasks/libmruby.rake @@ -1,5 +1,15 @@ MRuby.each_target do file libfile("#{build_dir}/lib/libmruby") => libmruby.flatten do |t| archiver.run t.name, t.prerequisites + open("#{build_dir}/lib/libmruby.flags.mak", 'w') do |f| + f.puts 'CFLAGS = "%s"' % cc.all_flags.gsub('"', '\\"') + + gem_flags = gems.map { |g| g.linker.flags } + gem_library_paths = gems.map { |g| g.linker.library_paths } + f.puts 'LDFLAGS = "%s"' % linker.all_flags(gem_library_paths, gem_flags).gsub('"', '\\"') + + gem_libraries = gems.map { |g| g.linker.libraries } + f.puts 'LIBS = "%s"' % linker.library_flags(gem_libraries).gsub('"', '\\"') + end end end diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake index e21e0b670..906f47ad0 100644 --- a/tasks/mrbgem_spec.rake +++ b/tasks/mrbgem_spec.rake @@ -35,22 +35,26 @@ module MRuby def setup MRuby::Gem.current = self - MRuby::Build::COMMANDS.each do |command| - instance_variable_set("@#{command}", @build.send(command).clone) - end - @linker = LinkerConfig.new([], [], []) - compilers.each do |compiler| + @build.compilers.each do |compiler| compiler.defines -= %w(DISABLE_GEMS) compiler.include_paths << "#{dir}/include" end + MRuby::Build::COMMANDS.each do |command| + instance_variable_set("@#{command}", @build.send(command).clone) + end + @linker = LinkerConfig.new([], [], []) @rbfiles = Dir.glob("#{dir}/mrblib/*.rb") - @objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X")) } + @objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map do |f| + objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X")) + end @objs << objfile("#{build_dir}/gem_init") @test_rbfiles = Dir.glob("#{dir}/test/*.rb") - @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X")) } + @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map do |f| + objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X")) + end @test_preload = 'test/assert.rb' instance_eval(&@initializer) @@ -90,7 +94,7 @@ module MRuby def define_gem_init_builder file objfile("#{build_dir}/gem_init") => "#{build_dir}/gem_init.c" - file "#{build_dir}/gem_init.c" => [build.mrbcfile] + rbfiles do |t| + file "#{build_dir}/gem_init.c" => [build.mrbcfile] + [rbfiles].flatten do |t| FileUtils.mkdir_p build_dir generate_gem_init("#{build_dir}/gem_init.c") end diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake index 1c495be5b..cb00aba57 100644 --- a/tasks/mrbgems_test.rake +++ b/tasks/mrbgems_test.rake @@ -5,16 +5,16 @@ MRuby.each_target do test_rbc = "#{g.build_dir}/gem_test.c" test_rbobj = test_rbc.ext(exts.object) - file g.testlib => g.test_objs + [test_rbobj] do |t| + file g.testlib => [g.test_objs, test_rbobj].flatten do |t| g.build.archiver.run t.name, t.prerequisites end file test_rbobj => test_rbc - file test_rbc => g.test_rbfiles + [g.build.mrbcfile, libfile("#{build_dir}/lib/libmruby")] do |t| + file test_rbc => [g.test_rbfiles].flatten + [g.build.mrbcfile, libfile("#{build_dir}/lib/libmruby")] do |t| open(t.name, 'w') do |f| g.print_gem_init_header(f) g.build.mrbc.run f, g.test_preload, "gem_test_irep_#{g.funcname}_preload" - g.test_rbfiles.each_with_index do |rbfile, i| + g.test_rbfiles.flatten.each_with_index do |rbfile, i| g.build.mrbc.run f, rbfile, "gem_test_irep_#{g.funcname}_#{i}" end f.puts %Q[void mrb_#{g.funcname}_gem_test(mrb_state *mrb);] unless g.test_objs.empty? diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index bcae9dfd9..b9e0d2749 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -63,12 +63,11 @@ module MRuby if ENV['OS'] == 'Windows_NT' @exts = Exts.new('.o', '.exe', '.a') - @file_separator = '\\' else @exts = Exts.new('.o', '', '.a') - @file_separator = '/' end + @file_separator = '/' @cc = Command::Compiler.new(self, %w(.c)) @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp)) @objc = Command::Compiler.new(self, %w(.m)) @@ -113,7 +112,7 @@ module MRuby def filename(name) if name.is_a?(Array) - name.map { |n| filename(n) } + name.flatten.map { |n| filename(n) } else '"%s"' % name.gsub('/', file_separator) end @@ -121,7 +120,7 @@ module MRuby def exefile(name) if name.is_a?(Array) - name.map { |n| exefile(n) } + name.flatten.map { |n| exefile(n) } else "#{name}#{exts.executable}" end @@ -129,7 +128,7 @@ module MRuby def objfile(name) if name.is_a?(Array) - name.map { |n| objfile(n) } + name.flatten.map { |n| objfile(n) } else "#{name}#{exts.object}" end @@ -137,7 +136,7 @@ module MRuby def libfile(name) if name.is_a?(Array) - name.map { |n| libfile(n) } + name.flatten.map { |n| libfile(n) } else "#{name}#{exts.library}" end diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake index 023b23763..8ffafe9b0 100644 --- a/tasks/mruby_build_commands.rake +++ b/tasks/mruby_build_commands.rake @@ -45,12 +45,22 @@ module MRuby @option_define = '-D%s' @compile_options = "%{flags} -MMD -o %{outfile} -c %{infile}" end + + def all_flags(_defineds=[], _include_paths=[], _flags=[]) + define_flags = [defines, _defineds].flatten.map{ |d| option_define % d } + include_path_flags = [include_paths, _include_paths].flatten.map{ |f| option_include_path % filename(f) } + [flags, define_flags, include_path_flags, _flags].flatten.join(' ') + end def run(outfile, infile, _defineds=[], _include_paths=[], _flags=[]) FileUtils.mkdir_p File.dirname(outfile) define_flags = [defines, _defineds].flatten.map{ |d| option_define % d } - include_path_flags = [include_paths, _include_paths, File.dirname(infile)].flatten.map{ |f| option_include_path % filename(f) } - _run compile_options, { :flags => (flags + define_flags + include_path_flags + _flags).join(' '), :infile => filename(infile), :outfile => filename(outfile) } + include_path_flags = [include_paths, _include_paths, File.dirname(infile)].flatten.map do |f| + option_include_path % filename(f) + end + _pp "CC #{filename(infile)} > #{filename(outfile)}" + _run compile_options, { :flags => (flags + define_flags + include_path_flags + _flags).join(' '), + :infile => filename(infile), :outfile => filename(outfile) } end def define_rules(build_dir, source_dir='') @@ -108,11 +118,23 @@ module MRuby @link_options = "%{flags} -o %{outfile} %{objs} %{libs}" end + def all_flags(_library_paths=[], _flags=[]) + library_path_flags = [library_paths, _library_paths].flatten.map{ |f| option_library_path % filename(f) } + [flags, library_path_flags, _flags].flatten.join(' ') + end + + def library_flags(_libraries) + [libraries, _libraries].flatten.reverse.map{ |d| option_library % d }.join(' ') + end + def run(outfile, objfiles, _libraries=[], _library_paths=[], _flags=[]) FileUtils.mkdir_p File.dirname(outfile) library_flags = [libraries, _libraries].flatten.reverse.map{ |d| option_library % d } library_path_flags = [library_paths, _library_paths].flatten.map{ |f| option_library_path % filename(f) } - _run link_options, { :flags => (flags + library_path_flags + _flags).join(' '), :outfile => filename(outfile) , :objs => filename(objfiles).join(' '), :libs => library_flags.join(' ') } + _pp "LD #{filename(outfile)}" + _run link_options, { :flags => (flags + library_path_flags + _flags).join(' '), + :outfile => filename(outfile) , :objs => filename(objfiles).join(' '), + :libs => library_flags.join(' ') } end end @@ -127,6 +149,7 @@ module MRuby def run(outfile, objfiles) FileUtils.mkdir_p File.dirname(outfile) + _pp "AR #{filename(outfile)}" _run archive_options, { :outfile => filename(outfile), :objs => filename(objfiles).join(' ') } end end @@ -142,6 +165,7 @@ module MRuby def run(outfile, infile) FileUtils.mkdir_p File.dirname(outfile) + _pp "YACC #{filename(infile)} > #{filename(outfile)}" _run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) } end end @@ -157,6 +181,7 @@ module MRuby def run(outfile, infile) FileUtils.mkdir_p File.dirname(outfile) + _pp "GPERF #{filename(infile)} > #{filename(outfile)}" _run compile_options, { :outfile => filename(outfile) , :infile => filename(infile) } end end @@ -173,6 +198,7 @@ module MRuby end def run_clone(dir, url, _flags = []) + _pp "GIT #{url} > #{filename(dir)}" _run clone_options, { :flags => [flags, _flags].flatten.join(' '), :url => url, :dir => filename(dir) } end end @@ -188,6 +214,7 @@ module MRuby @command ||= @build.mrbcfile IO.popen("#{filename @command} #{@compile_options % {:funcname => funcname}}", 'r+') do |io| [infiles].flatten.each do |f| + _pp " MRBC #{f}" io.write IO.read(f) end io.close_write @@ -195,4 +222,4 @@ module MRuby end end end -end
\ No newline at end of file +end diff --git a/tasks/ruby_ext.rake b/tasks/ruby_ext.rake index 7422e3faf..2536a2e4b 100644 --- a/tasks/ruby_ext.rake +++ b/tasks/ruby_ext.rake @@ -37,3 +37,26 @@ class Symbol proc { |obj, *args| obj.send(self, *args) } end end + +$pp_show = true + +if $verbose.nil? + unless Rake.verbose.nil? + if Rake.verbose.class == TrueClass + # verbose message logging + $pp_show = false + else + $pp_show = true + Rake.verbose(false) + end + else + # could not identify rake version + $pp_show = false + end +else + $pp_show = false if $verbose +end + +def _pp(msg) + puts msg if $pp_show +end diff --git a/tasks/toolchains/vs2012.rake b/tasks/toolchains/vs2012.rake index 8b4212468..1f6ea2d65 100644 --- a/tasks/toolchains/vs2012.rake +++ b/tasks/toolchains/vs2012.rake @@ -12,8 +12,8 @@ MRuby::Toolchain.new(:vs2012) do |conf| conf.linker do |linker| linker.command = ENV['LD'] || 'link.exe' linker.flags = [ENV['LDFLAGS'] || %w(/nologo)] - linkerraries = %w(kernel32 user32 gdi32 winspool comdlg32 advapi32 shell32 ole32 oleaut32 uuid odbc32 odbccp32) - linkerrary_paths = [] + linker.libraries = %w(kernel32 user32 gdi32 winspool comdlg32 advapi32 shell32 ole32 oleaut32 uuid odbc32 odbccp32) + linker.library_paths = [] linker.option_library = '-l%s' linker.option_library_path = '-L%s' linker.link_options = "%{flags} /OUT:%{outfile} %{objs} %{libs}" |