From 3d056d084aedd2a1a3a36e33b1cef4e90d282813 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Sat, 21 Nov 2020 21:14:40 +0900 Subject: Rename `MRB_{ENABLE,DISABLE}_` to `MRB_{USE,NO}_`; close #5163 | Previous Name | New Name | |------------------------------|-------------------------| | MRB_ENABLE_ALL_SYMBOLS | MRB_USE_ALL_SYMBOLS | | MRB_ENABLE_SYMBOLL_ALL | MRB_USE_ALL_SYMBOLS | | MRB_ENABLE_CXX_ABI | MRB_USE_CXX_ABI | | MRB_ENABLE_CXX_EXCEPTION | MRB_USE_CXX_EXCEPTION | | MRB_ENABLE_DEBUG_HOOK | MRB_USE_DEBUG_HOOK | | MRB_DISABLE_DIRECT_THREADING | MRB_NO_DIRECT_THREADING | | MRB_DISABLE_STDIO | MRB_NO_STDIO | | ENABLE_LINENOISE | MRB_USE_LINENOISE | | ENABLE_READLINE | MRB_USE_READLINE | | DISABLE_MIRB_UNDERSCORE | MRB_NO_MIRB_UNDERSCORE | | DISABLE_GEMS | MRB_NO_GEMS | * `MRB_ENABLE_SYMBOLL_ALL` seems to be a typo, so it is fixed. * `MRB_` prefix is added to those without. * The previous names can also be used for compatibility. --- build_config/ArduinoDue.rb | 2 +- build_config/IntelEdison.rb | 4 ++-- build_config/RX630.rb | 2 +- build_config/chipKITMax32.rb | 2 +- build_config/host-cxx.rb | 2 +- build_config/host-debug.rb | 2 +- build_config/travis.rb | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'build_config') diff --git a/build_config/ArduinoDue.rb b/build_config/ArduinoDue.rb index 5859f8508..6693efa29 100644 --- a/build_config/ArduinoDue.rb +++ b/build_config/ArduinoDue.rb @@ -33,7 +33,7 @@ MRuby::CrossBuild.new("ArduinoDue") do |conf| cc.defines << %w(KHASH_DEFAULT_SIZE=8) cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20) cc.defines << %w(MRB_GC_STRESS) - #cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio. + #cc.defines << %w(MRB_NO_STDIO) #if you dont need stdio. #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval end diff --git a/build_config/IntelEdison.rb b/build_config/IntelEdison.rb index a22f9cfd2..a33d83bd7 100644 --- a/build_config/IntelEdison.rb +++ b/build_config/IntelEdison.rb @@ -5,7 +5,7 @@ MRuby::Build.new do |conf| toolchain :gcc conf.gembox 'default' - conf.cc.defines = %w(ENABLE_READLINE) + conf.cc.defines = %w(MRB_USE_READLINE) conf.gembox 'default' #lightweight regular expression @@ -33,7 +33,7 @@ MRuby::CrossBuild.new('core2-32-poky-linux') do |conf| cc.flags << %w(-O2 -pipe -g -feliminate-unused-debug-types) cc.flags << "--sysroot=#{POKY_EDISON_SYSROOT}" cc.compile_options = %Q[%{flags} -o "%{outfile}" -c "%{infile}"] - cc.defines = %w(ENABLE_READLINE) + cc.defines = %w(MRB_USE_READLINE) end conf.cxx do |cxx| diff --git a/build_config/RX630.rb b/build_config/RX630.rb index 01c883958..64f9aeccd 100644 --- a/build_config/RX630.rb +++ b/build_config/RX630.rb @@ -19,7 +19,7 @@ MRuby::CrossBuild.new("RX630") do |conf| cc.defines << %w(KHASH_DEFAULT_SIZE=8) cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20) cc.defines << %w(MRB_GC_STRESS) - cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio. + cc.defines << %w(MRB_NO_STDIO) #if you dont need stdio. #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval end diff --git a/build_config/chipKITMax32.rb b/build_config/chipKITMax32.rb index bbee221f5..1165e0ef3 100644 --- a/build_config/chipKITMax32.rb +++ b/build_config/chipKITMax32.rb @@ -30,7 +30,7 @@ MRuby::CrossBuild.new("chipKITMax32") do |conf| cc.defines << %w(KHASH_DEFAULT_SIZE=8) cc.defines << %w(MRB_STR_BUF_MIN_SIZE=20) cc.defines << %w(MRB_GC_STRESS) - #cc.defines << %w(MRB_DISABLE_STDIO) #if you dont need stdio. + #cc.defines << %w(MRB_NO_STDIO) #if you dont need stdio. #cc.defines << %w(POOL_PAGE_SIZE=1000) #effective only for use with mruby-eval end diff --git a/build_config/host-cxx.rb b/build_config/host-cxx.rb index fa75a3ccb..21b4cd417 100644 --- a/build_config/host-cxx.rb +++ b/build_config/host-cxx.rb @@ -6,7 +6,7 @@ MRuby::Build.new do |conf| conf.gembox 'default' # C compiler settings - conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK) + conf.cc.defines = %w(MRB_USE_DEBUG_HOOK) conf.enable_debug conf.enable_cxx_abi conf.enable_test diff --git a/build_config/host-debug.rb b/build_config/host-debug.rb index ad4106065..e798278b9 100644 --- a/build_config/host-debug.rb +++ b/build_config/host-debug.rb @@ -14,7 +14,7 @@ MRuby::Build.new('host') do |conf| conf.gembox 'full-core' # C compiler settings - conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK MRB_NO_BOXING) + conf.cc.defines = %w(MRB_USE_DEBUG_HOOK MRB_NO_BOXING) # Generate mruby debugger command (require mruby-eval) conf.gem :core => "mruby-bin-debugger" diff --git a/build_config/travis.rb b/build_config/travis.rb index 3b28b4c4e..1d0e18b6b 100644 --- a/build_config/travis.rb +++ b/build_config/travis.rb @@ -4,7 +4,7 @@ MRuby::Build.new('full-debug') do |conf| # include all core GEMs conf.gembox 'full-core' - conf.cc.defines += %w(MRB_GC_STRESS MRB_ENABLE_DEBUG_HOOK) + conf.cc.defines += %w(MRB_GC_STRESS MRB_USE_DEBUG_HOOK) conf.enable_test end -- cgit v1.2.3