diff options
| -rw-r--r-- | tasks/libmruby.rake | 10 | ||||
| -rw-r--r-- | tasks/mrbgem_spec.rake | 10 | ||||
| -rw-r--r-- | tasks/mruby_build_commands.rake | 23 |
3 files changed, 32 insertions, 11 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 439b2c7a8..138b3f1f1 100644 --- a/tasks/mrbgem_spec.rake +++ b/tasks/mrbgem_spec.rake @@ -35,15 +35,15 @@ 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")) } diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake index 7014d5a20..7f9b50313 100644 --- a/tasks/mruby_build_commands.rake +++ b/tasks/mruby_build_commands.rake @@ -45,12 +45,16 @@ 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].flatten.join(' '), :infile => filename(infile), :outfile => filename(outfile) } + _run compile_options, { :flags => all_flags(_defineds, [_include_paths, File.dirname(infile)], _flags), :infile => filename(infile), :outfile => filename(outfile) } end def define_rules(build_dir, source_dir='') @@ -108,11 +112,18 @@ 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].flatten.join(' '), :outfile => filename(outfile) , :objs => filename(objfiles).join(' '), :libs => library_flags.join(' ') } + _run link_options, { :flags => all_flags(_library_paths, _flags), :outfile => filename(outfile) , :objs => filename(objfiles).join(' '), :libs => library_flags(_libraries) } end end |