Changeset 439 for EcnlProtoTool/trunk/mruby-2.1.1/build_config.rb

Timestamp:

Jul 9, 2020, 8:51:43 AM (4 years ago)

Author:

coas-nagasima

Message:

mrubyを2.1.1に更新

Location:

EcnlProtoTool/trunk/mruby-2.1.1

Files:

• . (moved) (moved from EcnlProtoTool/trunk/mruby-1.3.0 )
• build_config.rb (modified) (15 diffs)

EcnlProtoTool/trunk/mruby-2.1.1/build_config.rb

@@ -3 +3 @@
 
   # Gets set by the VS command prompts.
-  #if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
+  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
     toolchain :visualcpp
-  #else
-  #  toolchain :gcc
-  #end
-
-  enable_debug
+  else
+    toolchain :gcc
+  end
+
+  # Turn on `enable_debug` for better debugging
+  # enable_debug
 
   # Use mrbgems
@@ -18 +19 @@
   # conf.gem 'examples/mrbgems/c_and_ruby_extension_example'
   # conf.gem :core => 'mruby-eval'
-  # conf.gem :mgem => 'mruby-io'
-  # conf.gem :github => 'iij/mruby-io'
-  # conf.gem :git => 'git@github.com:iij/mruby-io.git', :branch => 'master', :options => '-v'
+  # conf.gem :mgem => 'mruby-onig-regexp'
+  # conf.gem :github => 'mattn/mruby-onig-regexp'
+  # conf.gem :git => 'git@github.com:mattn/mruby-onig-regexp.git', :branch => 'master', :options => '-v'
 
   # include the default GEMs
@@ -29 +30 @@
   #   cc.flags = [ENV['CFLAGS'] || %w()]
   #   cc.include_paths = ["#{root}/include"]
-  #   cc.defines = %w(DISABLE_GEMS)
-  #   cc.option_include_path = '-I%s'
+  #   cc.defines = %w()
+  #   cc.option_include_path = %q[-I"%s"]
   #   cc.option_define = '-D%s'
-  #   cc.compile_options = "%{flags} -MMD -o %{outfile} -c %{infile}"
+  #   cc.compile_options = %Q[%{flags} -MMD -o "%{outfile}" -c "%{infile}"]
   # end
 
@@ -50 +51 @@
   #   linker.option_library = '-l%s'
   #   linker.option_library_path = '-L%s'
-  #   linker.link_options = "%{flags} -o %{outfile} %{objs} %{libs}"
+  #   linker.link_options = "%{flags} -o "%{outfile}" %{objs} %{libs}"
   # end
 
@@ -56 +57 @@
   # conf.archiver do |archiver|
   #   archiver.command = ENV['AR'] || 'ar'
-  #   archiver.archive_options = 'rs %{outfile} %{objs}'
+  #   archiver.archive_options = 'rs "%{outfile}" %{objs}'
   # end
 
@@ -62 +63 @@
   # conf.yacc do |yacc|
   #   yacc.command = ENV['YACC'] || 'bison'
-  #   yacc.compile_options = '-o %{outfile} %{infile}'
+  #   yacc.compile_options = %q[-o "%{outfile}" "%{infile}"]
   # end
 
@@ -68 +69 @@
   # conf.gperf do |gperf|
   #   gperf.command = 'gperf'
-  #   gperf.compile_options = '-L ANSI-C -C -p -j1 -i 1 -g -o -t -N mrb_reserved_word -k"1,3,$" %{infile} > %{outfile}'
+  #   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
 
@@ -84 +85 @@
   # conf.enable_bintest
 end
-
+=begin
 MRuby::Build.new('host-debug') do |conf|
   # load specific toolchain settings
@@ -110 +111 @@
 end
 
-#MRuby::Build.new('test') do |conf|
+MRuby::Build.new('test') do |conf|
+  # Gets set by the VS command prompts.
+  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
+    toolchain :visualcpp
+  else
+    toolchain :gcc
+  end
+
+  enable_debug
+  conf.enable_bintest
+  conf.enable_test
+
+  conf.gembox 'default'
+end
+=end
+#MRuby::Build.new('bench') do |conf|
 #  # Gets set by the VS command prompts.
 #  if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
@@ -116 +132 @@
 #  else
 #    toolchain :gcc
+#    conf.cc.flags << '-O3'
 #  end
-#
-#  enable_debug
-#  conf.enable_bintest
-#  conf.enable_test
 #
 #  conf.gembox 'default'
@@ -137 +150 @@
 #
 #   conf.test_runner.command = 'env'
-#
 # end
 
-# Define cross build settings
+# Cross build for arm-none-eabi
 MRuby::CrossBuild.new('arm-none-eabi') do |conf|
   toolchain :gcc
@@ -149 +161 @@
   conf.archiver.command = "arm-none-eabi-ar"
 
-  conf.cc.flags << %w(-MD -MP -mlittle-endian -mcpu=cortex-a9 -mthumb -mthumb-interwork -marm -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard -mno-unaligned-access -fno-strict-aliasing -nostdinc)
+  conf.cc.flags << %w(-MD -MP -mlittle-endian -mcpu=cortex-a9 -mthumb -mthumb-interwork -marm -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard -mno-unaligned-access -fno-strict-aliasing -nostdinc -Wstack-usage=256 -ffunction-sections -fdata-sections)
   conf.cc.include_paths  << "../musl-1.1.18/include"
 
-  conf.linker.flags << %w(-nostdlib)
-  conf.linker.library_paths << "../musl-1.1.18/lib"
-  conf.linker.libraries << %w(c gcc)
-
-  #configuration for low memory environment
-  conf.cc.defines << %w(MRB_GC_STRESS)
-  #conf.cc.defines << %w(DISABLE_STDIO)
-  conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK)
-
-  conf.build_mrbtest_lib_only
+  conf.cc.defines << %w(MRB_USE_CUSTOM_RO_DATA_P MRB_ENABLE_DEBUG_HOOK MRB_CONSTRAINED_BASELINE_PROFILE)
+
+  #conf.build_mrbtest_lib_only
 
   conf.gem "#{root}/mrbgems/mruby-compiler"
+  conf.gem "#{root}/mrbgems/mruby-eval"
+  conf.gem "#{root}/mrbgems/mruby-io"
+  conf.gem "#{root}/mrbgems/mruby-math"
+  conf.gem "#{root}/mrbgems/mruby-pack"
+  conf.gem "#{root}/mrbgems/mruby-print"
+  conf.gem "#{root}/mrbgems/mruby-random"
+  conf.gem "#{root}/mrbgems/mruby-socket"
+  conf.gem "#{root}/mrbgems/mruby-sprintf"
+  conf.gem "#{root}/mrbgems/mruby-struct"
+  conf.gem "#{root}/mrbgems/mruby-time"
   conf.gem "#{root}/mrbgems/mruby-numeric-ext"
   conf.gem "#{root}/mrbgems/mruby-string-ext"
   conf.gem '../mrbgems/mruby-onig-regexp'  do |g|
+    g.cc.flags << %w(-DHAVE_ONIGMO_H)
     g.cc.include_paths  << "../onigmo-6.1.3/src"
   end
@@ -177 +193 @@
   conf.gem "#{root}/../mrbgems/mruby-errno"
   conf.gem "#{root}/../mrbgems/mruby-iijson"
-  conf.gem "#{root}/../mrbgems/mruby-io"
   conf.gem "#{root}/../mrbgems/mruby-ipaddr"
   conf.gem "#{root}/../mrbgems/mruby-mock"
-  conf.gem "#{root}/../mrbgems/mruby-pack"
   #conf.gem "#{root}/../mrbgems/mruby-require"
-  conf.gem "#{root}/../mrbgems/mruby-socket"
   conf.gem "#{root}/../mrbgems/mruby-tls-openssl" do |g|
     g.cc.include_paths << "#{g.dir}/../../openssl-1.1.0e/include"
@@ -202 +215 @@
 
   conf.archiver.command = "llvm-ar"
+  conf.cc.flags << '-ffunction-sections -fdata-sections'
+  conf.linker.flags << '-Wl,--gc-sections'
   conf.linker.flags << '--save-bc %{outfile}.bc --pre-js ../webapp/webmrbc/pre.js --post-js ../webapp/webmrbc/post.js --use-preload-plugins'
   #conf.linker.flags << '-s BINARYEN=1'
@@ -207 +222 @@
 
   # include the default GEMs
-  conf.gembox 'default'
+  #conf.gembox 'default'
   conf.gem :core => 'mruby-bin-mrbc'
 end