diff options
| author | MATSUMOTO Ryosuke <[email protected]> | 2014-02-05 22:17:44 +0900 |
|---|---|---|
| committer | MATSUMOTO Ryosuke <[email protected]> | 2014-02-05 22:17:44 +0900 |
| commit | 456a765e53c608811de33b02c3ec8b6c492a1718 (patch) | |
| tree | 215cf11a5554f8c23f8f2fb8c4d81a66a4f508d0 | |
| parent | 6c91ba001f592df6e14127a0d248d5cfcc2cc1a1 (diff) | |
| download | mruby-456a765e53c608811de33b02c3ec8b6c492a1718.tar.gz mruby-456a765e53c608811de33b02c3ec8b6c492a1718.zip | |
replace Kernel.show_version with MRUBY_DESCRIPTION
| -rw-r--r-- | mrbgems/mruby-version/mrblib/version.rb | 5 | ||||
| -rw-r--r-- | mrbgems/mruby-version/src/version.c | 1 | ||||
| -rw-r--r-- | mrbgems/mruby-version/src/version.h | 3 | ||||
| -rw-r--r-- | src/print.c | 5 |
4 files changed, 7 insertions, 7 deletions
diff --git a/mrbgems/mruby-version/mrblib/version.rb b/mrbgems/mruby-version/mrblib/version.rb deleted file mode 100644 index d51158382..000000000 --- a/mrbgems/mruby-version/mrblib/version.rb +++ /dev/null @@ -1,5 +0,0 @@ -module Kernel - def show_version - "mruby " + MRUBY_VERSION + " (" + MRUBY_RELEASE_DATE + ")\n" - end -end diff --git a/mrbgems/mruby-version/src/version.c b/mrbgems/mruby-version/src/version.c index b3a6e8b9b..bfd971209 100644 --- a/mrbgems/mruby-version/src/version.c +++ b/mrbgems/mruby-version/src/version.c @@ -7,6 +7,7 @@ mrb_mruby_version_gem_init(mrb_state* mrb) { mrb_define_global_const(mrb, "MRUBY_VERSION", mrb_str_new_cstr(mrb, MRUBY_VERSION)); mrb_define_global_const(mrb, "MRUBY_RELEASE_DATE", mrb_str_new_cstr(mrb, MRUBY_RELEASE_DATE)); + mrb_define_global_const(mrb, "MRUBY_DESCRIPTION", mrb_str_new_cstr(mrb, MRUBY_DESCRIPTION)); } void diff --git a/mrbgems/mruby-version/src/version.h b/mrbgems/mruby-version/src/version.h index b845ac0c1..ee64036b7 100644 --- a/mrbgems/mruby-version/src/version.h +++ b/mrbgems/mruby-version/src/version.h @@ -7,3 +7,6 @@ #define MRUBY_RELEASE_MONTH 1 #define MRUBY_RELEASE_DAY 10 +#define MRUBY_DESCRIPTION \ + "mruby "MRUBY_VERSION \ + " ("MRUBY_RELEASE_DATE") " diff --git a/src/print.c b/src/print.c index 678e56d6b..44b2049db 100644 --- a/src/print.c +++ b/src/print.c @@ -57,8 +57,9 @@ mrb_show_version(mrb_state *mrb) static const char version_msg[] = "mruby - Embeddable Ruby Copyright (c) 2010-2014 mruby developers\n"; mrb_value msg; - if (mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_VERSION"))) { - msg = mrb_funcall(mrb, mrb_obj_value(mrb->kernel_module), "show_version", 0); + if (mrb_const_defined(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION"))) { + msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION")); + msg = mrb_funcall(mrb, msg, "+", 1, mrb_str_new_cstr(mrb, "\n")); } else { msg = mrb_str_new(mrb, version_msg, sizeof(version_msg) - 1); |