diff options
| -rw-r--r-- | doc/compile/README.md | 14 | ||||
| -rw-r--r-- | include/mrbconf.h | 3 | ||||
| -rw-r--r-- | include/mruby/compile.h | 4 | ||||
| -rw-r--r-- | src/dump.c | 1 | ||||
| -rw-r--r-- | tasks/mruby_build.rake | 5 | ||||
| -rw-r--r-- | travis_config.rb | 11 |
6 files changed, 22 insertions, 16 deletions
diff --git a/doc/compile/README.md b/doc/compile/README.md index e7f382f15..cb8bdfc32 100644 --- a/doc/compile/README.md +++ b/doc/compile/README.md @@ -59,17 +59,13 @@ GCC toolchain. toolchain :clang -#### Visual Studio 2010 +#### Visual Studio 2010, 2012 and 2013 -Toolchain configuration for Visual Studio 2010 on Windows. +Toolchain configuration for Visual Studio on Windows. If you use the +[Visual Studio Command Prompt](http://msdn.microsoft.com/en-us/library/ms229859\(v=vs.110\).aspx), +you normally do not have to specify this manually, since it gets automatically detected by our build process. - toolchain :vs2010 - -#### Visual Studio 2012 - -Toolchain configuration for Visual Studio 2012 on Windows. - - toolchain :vs2012 + toolchain :visualcpp #### Android diff --git a/include/mrbconf.h b/include/mrbconf.h index 5c745f479..2172ccc1d 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -56,9 +56,6 @@ /* initial minimum size for string buffer */ //#define MRB_STR_BUF_MIN_SIZE 128 -/* array size for parser buffer */ -//#define MRB_PARSER_BUF_SIZE 1024 - /* arena size */ //#define MRB_GC_ARENA_SIZE 100 diff --git a/include/mruby/compile.h b/include/mruby/compile.h index ec5a6935f..c416df082 100644 --- a/include/mruby/compile.h +++ b/include/mruby/compile.h @@ -96,9 +96,7 @@ struct mrb_parser_heredoc_info { mrb_ast_node *doc; }; -#ifndef MRB_PARSER_BUF_SIZE -# define MRB_PARSER_BUF_SIZE 1024 -#endif +#define MRB_PARSER_BUF_SIZE 1024 /* parser structure */ struct mrb_parser_state { diff --git a/src/dump.c b/src/dump.c index 97c07afcd..6f6063500 100644 --- a/src/dump.c +++ b/src/dump.c @@ -492,6 +492,7 @@ get_filename_table_size(mrb_state *mrb, mrb_irep *irep, mrb_sym **fp, size_t *lp } for (i=0; i<irep->rlen; i++) { size += get_filename_table_size(mrb, irep->reps[i], fp, lp); + filenames = *fp; } } return size; diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index ff6110884..acaabfa81 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -87,6 +87,11 @@ module MRuby MRuby.targets[@name].instance_eval(&block) end + def enable_debug + compilers.each { |c| c.defines += %w(MRB_DEBUG) } + @mrbc.compile_options += ' -g' + end + def toolchain(name) tc = Toolchain.toolchains[name.to_s] fail "Unknown #{name} toolchain" unless tc diff --git a/travis_config.rb b/travis_config.rb index 89aef9f55..360cf3337 100644 --- a/travis_config.rb +++ b/travis_config.rb @@ -1,7 +1,16 @@ +MRuby::Build.new('debug') do |conf| + toolchain :gcc + enable_debug + + # include all core GEMs + conf.gembox 'full-core' + conf.cc.defines = %w(MRB_GC_FIXED_ARENA) +end + MRuby::Build.new do |conf| toolchain :gcc # include all core GEMs conf.gembox 'full-core' - conf.cc.defines = %w(MRB_DEBUG MRB_GC_FIXED_ARENA) + conf.cc.defines = %w(MRB_GC_FIXED_ARENA) end |