From dcfc2dbf148cd533ed5419efde31822c38bcdaf5 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 1 May 2020 21:16:47 +0900 Subject: Add `host-shared.rb` to create shared mruby library. --- target/host-shared.rb | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 target/host-shared.rb (limited to 'target/host-shared.rb') diff --git a/target/host-shared.rb b/target/host-shared.rb new file mode 100644 index 000000000..c6b6eb3dc --- /dev/null +++ b/target/host-shared.rb @@ -0,0 +1,72 @@ +MRuby::Build.new do |conf| + # load specific toolchain settings + + # Gets set by the VS command prompts. + if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR'] + toolchain :visualcpp + else + toolchain :gcc + end + + # include the GEM box + conf.gembox 'full-core' + + # C compiler settings + conf.cc do |cc| + cc.flags = '-fPIC' + end + + # mrbc settings + # conf.mrbc do |mrbc| + # mrbc.compile_options = "-g -B%{funcname} -o-" # The -g option is required for line numbers + # end + + conf.archiver do |archiver| + archiver.command = 'gcc' + archiver.archive_options = '-shared -o %{outfile} %{objs}' + end + + # Linker settings + # conf.linker do |linker| + # linker.command = ENV['LD'] || 'gcc' + # linker.flags = [ENV['LDFLAGS'] || []] + # linker.flags_before_libraries = [] + # linker.libraries = %w() + # linker.flags_after_libraries = [] + # linker.library_paths = [] + # linker.option_library = '-l%s' + # linker.option_library_path = '-L%s' + # linker.link_options = "%{flags} -o "%{outfile}" %{objs} %{libs}" + # end + + # Archiver settings + # conf.archiver do |archiver| + # archiver.command = ENV['AR'] || 'ar' + # archiver.archive_options = 'rs "%{outfile}" %{objs}' + # end + + # Parser generator settings + # conf.yacc do |yacc| + # yacc.command = ENV['YACC'] || 'bison' + # yacc.compile_options = %q[-o "%{outfile}" "%{infile}"] + # end + + # gperf settings + # conf.gperf do |gperf| + # gperf.command = 'gperf' + # gperf.compile_options = %q[-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" "%{infile}" > "%{outfile}"] + # end + + # file extensions + conf.exts do |exts| + exts.library = '.so' + end + + # file separetor + # conf.file_separator = '/' + + # Turn on `enable_debug` for better debugging + enable_debug + conf.enable_bintest + conf.enable_test +end -- cgit v1.2.3 From 3ec61c09294a399c38509629fccd7e223b762f35 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 2 May 2020 09:09:17 +0900 Subject: Update `host*` targets to use `default.gembox`. And now `default.gembox` includes `mruby-socket` gem. --- mrbgems/default.gembox | 3 +++ target/host-debug.rb | 2 +- target/host-shared.rb | 2 +- target/host.rb | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) (limited to 'target/host-shared.rb') diff --git a/mrbgems/default.gembox b/mrbgems/default.gembox index de1e9a573..822ff8d38 100644 --- a/mrbgems/default.gembox +++ b/mrbgems/default.gembox @@ -5,6 +5,9 @@ MRuby::GemBox.new do |conf| # Use standard IO/File class conf.gem :core => "mruby-io" + # Use standard IO/File class + conf.gem :core => "mruby-socket" + # Use standard Array#pack, String#unpack methods conf.gem :core => "mruby-pack" diff --git a/target/host-debug.rb b/target/host-debug.rb index 4e89d162c..2fcb22e8f 100644 --- a/target/host-debug.rb +++ b/target/host-debug.rb @@ -11,7 +11,7 @@ MRuby::Build.new('host-debug') do |conf| enable_debug # include the default GEMs - conf.gembox 'full-core' + conf.gembox 'default' # C compiler settings conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK) diff --git a/target/host-shared.rb b/target/host-shared.rb index c6b6eb3dc..87b317414 100644 --- a/target/host-shared.rb +++ b/target/host-shared.rb @@ -9,7 +9,7 @@ MRuby::Build.new do |conf| end # include the GEM box - conf.gembox 'full-core' + conf.gembox 'default' # C compiler settings conf.cc do |cc| diff --git a/target/host.rb b/target/host.rb index eb6e3c15f..4b12ab70a 100644 --- a/target/host.rb +++ b/target/host.rb @@ -20,7 +20,7 @@ MRuby::Build.new do |conf| # conf.gem :git => 'git@github.com:mattn/mruby-onig-regexp.git', :branch => 'master', :options => '-v' # include the GEM box - conf.gembox 'full-core' + conf.gembox 'default' # C compiler settings # conf.cc do |cc| -- cgit v1.2.3 From 7fde48b838061e4324d054114c4da38371ae3f6d Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 16 May 2020 21:49:09 +0900 Subject: Remove unnecessary comments from `host-shared` target. --- target/host-shared.rb | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'target/host-shared.rb') diff --git a/target/host-shared.rb b/target/host-shared.rb index 87b317414..8b5028837 100644 --- a/target/host-shared.rb +++ b/target/host-shared.rb @@ -16,47 +16,11 @@ MRuby::Build.new do |conf| cc.flags = '-fPIC' end - # mrbc settings - # conf.mrbc do |mrbc| - # mrbc.compile_options = "-g -B%{funcname} -o-" # The -g option is required for line numbers - # end - conf.archiver do |archiver| archiver.command = 'gcc' archiver.archive_options = '-shared -o %{outfile} %{objs}' end - # Linker settings - # conf.linker do |linker| - # linker.command = ENV['LD'] || 'gcc' - # linker.flags = [ENV['LDFLAGS'] || []] - # linker.flags_before_libraries = [] - # linker.libraries = %w() - # linker.flags_after_libraries = [] - # linker.library_paths = [] - # linker.option_library = '-l%s' - # linker.option_library_path = '-L%s' - # linker.link_options = "%{flags} -o "%{outfile}" %{objs} %{libs}" - # end - - # Archiver settings - # conf.archiver do |archiver| - # archiver.command = ENV['AR'] || 'ar' - # archiver.archive_options = 'rs "%{outfile}" %{objs}' - # end - - # Parser generator settings - # conf.yacc do |yacc| - # yacc.command = ENV['YACC'] || 'bison' - # yacc.compile_options = %q[-o "%{outfile}" "%{infile}"] - # end - - # gperf settings - # conf.gperf do |gperf| - # gperf.command = 'gperf' - # gperf.compile_options = %q[-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" "%{infile}" > "%{outfile}"] - # end - # file extensions conf.exts do |exts| exts.library = '.so' -- cgit v1.2.3