diff options
| -rw-r--r-- | mrbgems/default.gembox | 3 | ||||
| -rw-r--r-- | mrbgems/mruby-version/mrbgem.rake | 4 | ||||
| -rw-r--r-- | mrbgems/mruby-version/src/version.c | 18 | ||||
| -rw-r--r-- | mrbgems/mruby-version/src/version.h | 25 | ||||
| -rw-r--r-- | mrblib/kernel.rb | 2 | ||||
| -rw-r--r-- | src/init.c | 2 | ||||
| -rw-r--r-- | src/print.c | 20 |
7 files changed, 6 insertions, 68 deletions
diff --git a/mrbgems/default.gembox b/mrbgems/default.gembox index 6fe5c30f4..33ee99be0 100644 --- a/mrbgems/default.gembox +++ b/mrbgems/default.gembox @@ -58,7 +58,4 @@ MRuby::GemBox.new do |conf| # Generate mruby command conf.gem :core => "mruby-bin-mruby" - - # Use mruby verison - conf.gem :core => "mruby-version" end diff --git a/mrbgems/mruby-version/mrbgem.rake b/mrbgems/mruby-version/mrbgem.rake deleted file mode 100644 index d7934468f..000000000 --- a/mrbgems/mruby-version/mrbgem.rake +++ /dev/null @@ -1,4 +0,0 @@ -MRuby::Gem::Specification.new('mruby-version') do |spec| - spec.license = 'MIT' - spec.author = 'mruby developers' -end diff --git a/mrbgems/mruby-version/src/version.c b/mrbgems/mruby-version/src/version.c deleted file mode 100644 index ce275d509..000000000 --- a/mrbgems/mruby-version/src/version.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "mruby.h" -#include "mruby/variable.h" -#include "version.h" - -void -mrb_mruby_version_gem_init(mrb_state* mrb) -{ - mrb_define_global_const(mrb, "MRUBY_VERSION", mrb_str_new_lit(mrb, MRUBY_VERSION)); - mrb_define_global_const(mrb, "MRUBY_RELEASE_DATE", mrb_str_new_lit(mrb, MRUBY_RELEASE_DATE)); - mrb_define_global_const(mrb, "MRUBY_DESCRIPTION", mrb_str_new_lit(mrb, MRUBY_DESCRIPTION)); - mrb_define_global_const(mrb, "MRUBY_COPYRIGHT", mrb_str_new_lit(mrb, MRUBY_COPYRIGHT)); -} - -void -mrb_mruby_version_gem_final(mrb_state* mrb) -{ -} - diff --git a/mrbgems/mruby-version/src/version.h b/mrbgems/mruby-version/src/version.h deleted file mode 100644 index 69fbef0fa..000000000 --- a/mrbgems/mruby-version/src/version.h +++ /dev/null @@ -1,25 +0,0 @@ -#define MRUBY_VERSION "v1.0.0" -#define MRUBY_PATCHLEVEL 0 -#define MRUBY_REVISION 0 - -#define MRUBY_RELEASE_DATE "2014-01-10" -#define MRUBY_RELEASE_YEAR 2014 -#define MRUBY_RELEASE_MONTH 1 -#define MRUBY_RELEASE_DAY 10 - -#define MRUBY_BIRTH_YEAR 2010 - -#define MRUBY_AUTHOR "mruby developers" - -#define STRINGIZE0(expr) #expr -#define STRINGIZE(expr) STRINGIZE0(expr) - -#define MRUBY_DESCRIPTION \ - "mruby "MRUBY_VERSION \ - " ("MRUBY_RELEASE_DATE") " -#define MRUBY_COPYRIGHT \ - "mruby - Copyright (c) " \ - STRINGIZE(MRUBY_BIRTH_YEAR)"-" \ - STRINGIZE(MRUBY_RELEASE_YEAR)" " \ - MRUBY_AUTHOR - diff --git a/mrblib/kernel.rb b/mrblib/kernel.rb index fcfe40e3f..0277a1b83 100644 --- a/mrblib/kernel.rb +++ b/mrblib/kernel.rb @@ -49,5 +49,3 @@ module Kernel !(self =~ y) end end - -RUBY_VERSION = "1.9" diff --git a/src/init.c b/src/init.c index e97c72d68..c08c4b046 100644 --- a/src/init.c +++ b/src/init.c @@ -22,6 +22,7 @@ void mrb_init_numeric(mrb_state*); void mrb_init_range(mrb_state*); void mrb_init_gc(mrb_state*); void mrb_init_math(mrb_state*); +void mrb_init_version(mrb_state*); void mrb_init_mrblib(mrb_state*); void mrb_init_mrbgems(mrb_state*); void mrb_final_mrbgems(mrb_state*); @@ -47,6 +48,7 @@ mrb_init_core(mrb_state *mrb) mrb_init_numeric(mrb); DONE; mrb_init_range(mrb); DONE; mrb_init_gc(mrb); DONE; + mrb_init_version(mrb); DONE; mrb_init_mrblib(mrb); DONE; #ifndef DISABLE_GEMS mrb_init_mrbgems(mrb); DONE; diff --git a/src/print.c b/src/print.c index 94250ddce..9d59aa4ff 100644 --- a/src/print.c +++ b/src/print.c @@ -54,31 +54,19 @@ mrb_print_error(mrb_state *mrb) void 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_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_lit(mrb, "\n")); - } - else { - msg = mrb_str_new_lit(mrb, version_msg); - } + msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION")); printstr(mrb, msg); + printstr(mrb, mrb_str_new_lit(mrb, "\n")); } void mrb_show_copyright(mrb_state *mrb) { - static const char copyright_msg[] = "mruby - 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_COPYRIGHT"))) { - msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT")); - msg = mrb_funcall(mrb, msg, "+", 1, mrb_str_new_lit(mrb, "\n")); - } - else { - msg = mrb_str_new_lit(mrb, copyright_msg); - } + msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT")); printstr(mrb, msg); + printstr(mrb, mrb_str_new_lit(mrb, "\n")); } |