Ignore:
Timestamp:
Apr 29, 2017, 4:33:37 PM (7 years ago)
Author:
coas-nagasima
Message:

ファイルを追加、更新。

Location:
EcnlProtoTool/trunk/mruby-1.2.0
Files:
41 added
4 edited

Legend:

Unmodified
Added
Removed

  • EcnlProtoTool/trunk/mruby-1.2.0/Makefile

    r270 r279  
    33# codebase.
    44
    5 RAKE = ruby ./minirake
     5RAKE = ruby -Eutf-8 ./minirake
    66
    77all :

  • EcnlProtoTool/trunk/mruby-1.2.0/build_config.rb

    r270 r279  
    152152  conf.cc.defines << %w(MRB_GC_STRESS)
    153153  #conf.cc.defines << %w(DISABLE_STDIO)
     154  conf.cc.defines = %w(MRB_ENABLE_DEBUG_HOOK)
    154155
    155156  conf.build_mrbtest_lib_only
    156157
     158  conf.gem "#{root}/mrbgems/mruby-compiler"
    157159  conf.gem "#{root}/mrbgems/mruby-numeric-ext"
    158160  conf.gem "#{root}/mrbgems/mruby-string-ext"
     161  conf.gem '../mrbgems/mruby-onig-regexp'  do |g|
     162    g.cc.include_paths  << "../onigmo-5.15.0/src"
     163  end
    159164  conf.gem "#{root}/../mrbgems/mruby-blockly"
    160   conf.gem "#{root}/../mrbgems/gr_peach" do |g|
    161     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/api"
    162     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/hal"
    163     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/cmsis"
    164     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H"
    165     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc"
    166     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/cmsis/TARGET_RENESAS/TARGET_RZ_A1H/inc/iodefines"
    167     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H"
    168     g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/TARGET_MBED_MBRZA1H"
     165  conf.gem "#{root}/../mrbgems/mruby-io"
     166  conf.gem "#{root}/../mrbgems/mruby-dir" do |g|
     167    g.cc.defines = %w(__NEWLIB__=2)
     168    g.cc.include_paths << "#{g.dir}/../../musl-1.1.12/include"
     169  end
     170  conf.gem "#{root}/../mrbgems/mruby-pack"
     171  conf.gem "#{root}/../mrbgems/mruby-socket" do |g|
     172    g.cc.include_paths << "#{g.dir}/../../musl-1.1.12/include"
    169173  end
    170174  conf.gem "#{root}/../mrbgems/mruby-arduino" do |g|
    … …  
    177181    g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H"
    178182    g.cc.include_paths << "#{g.dir}/../../asp3_dcre/mbed/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/TARGET_MBED_MBRZA1H"
    179     g.cc.include_paths << "#{g.dir}/../../mrbgems/gr_peach/src"
     183    g.cc.include_paths << "#{g.dir}/../../sample/gr_peach"
     184    g.cc.include_paths << "#{g.dir}/../../prototool/src"
    180185  end
    181186  conf.gem "#{root}/../mrbgems/mruby-ecnl"

  • EcnlProtoTool/trunk/mruby-1.2.0/include/mruby.h

    r270 r279  
    859859 *      Pointer to the newly created mrb_state.
    860860 */
    861 MRB_API mrb_state* mrb_open_allocf(mrb_allocf f, void *ud);
     861MRB_API mrb_state* mrb_open_allocf(mrb_allocf f, void *ud, mrb_bool disable_gems);
    862862
    863863/**

  • EcnlProtoTool/trunk/mruby-1.2.0/src/state.c

    r270 r279  
    9797mrb_open(void)
    9898{
    99   mrb_state *mrb = mrb_open_allocf(mrb_default_allocf, NULL);
     99  mrb_state *mrb = mrb_open_allocf(mrb_default_allocf, NULL, FALSE);
    100100
    101101  return mrb;
    … …  
    103103
    104104MRB_API mrb_state*
    105 mrb_open_allocf(mrb_allocf f, void *ud)
     105mrb_open_allocf(mrb_allocf f, void *ud, mrb_bool disable_gems)
    106106{
    107107  mrb_state *mrb = mrb_open_core(f, ud);
    … …  
    111111  }
    112112
    113 #ifndef DISABLE_GEMS
    114   mrb_init_mrbgems(mrb);
    115   mrb_gc_arena_restore(mrb, 0);
    116 #endif
     113  if (!disable_gems) {
     114    mrb_init_mrbgems(mrb);
     115    mrb_gc_arena_restore(mrb, 0);
     116  }
    117117  return mrb;
    118118}
Note: See TracChangeset for help on using the changeset viewer.