revise version description

src/init.c

@@ -29,7 +29,6 @@ void mrb_init_thread(mrb_state *);
 void mrb_init_struct(mrb_state *);
 void mrb_init_gc(mrb_state *);
 void Init_var_tables(mrb_state *mrb);
-void Init_version(mrb_state *mrb);
 void mrb_init_print(mrb_state *mrb);
 void mrb_init_mrblib(mrb_state *mrb);
 void mrb_init_math(mrb_state *mrb);
@@ -48,7 +47,6 @@ mrb_init_core(mrb_state *mrb)
   mrb_init_symbols(mrb);
   mrb_init_proc(mrb);
   mrb_init_string(mrb);
-  Init_version(mrb); /* after init_string */
   mrb_init_array(mrb);
   mrb_init_hash(mrb);
   mrb_init_numeric(mrb);

src/print.c

@@ -73,3 +73,16 @@ mrb_init_print(mrb_state *mrb)
   mrb_define_method(mrb, krn, "__printstr__", mrb_printstr, ARGS_REQ(1));
   mrb_define_method(mrb, krn, "p",  p_m, ARGS_ANY());    /* 15.3.1.3.34 */
 }
+
+
+void
+mrb_show_version(mrb_state *mrb)
+{
+  printf("mruby - Embeddable Ruby  Copyright (c) 2010-2012 mruby developers\n");
+}
+
+void
+mrb_show_copyright(mrb_state *mrb)
+{
+  printf("mruby - Copyright (c) 2010-2012 mruby developers\n");
+}

src/version.c

-/*
-** version.c - version information
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include "mruby.h"
-#include "version.h"
-#include <stdio.h>
-#include "mruby/string.h"
-#include "mruby/variable.h"
-
-#define PRINT(type) puts(ruby_##type)
-//#define MKSTR(type) mrb_obj_freeze(mrb_str_new(ruby_##type, sizeof(ruby_##type)-1))
-#define MKSTR(type) mrb_str_new(mrb, ruby_##type, sizeof(ruby_##type)-1)
-
-const char ruby_version[] = RUBY_VERSION;
-const char ruby_release_date[] = RUBY_RELEASE_DATE;
-const char ruby_platform[] = RUBY_PLATFORM;
-const int ruby_patchlevel = RUBY_PATCHLEVEL;
-const char ruby_engine[] = RUBY_ENGINE;
-
-void
-Init_version(mrb_state *mrb)
-{
-    char description[128];
-    char copyright[128];
-    mrb_value v = MKSTR(version);
-    mrb_value d = MKSTR(release_date);
-    mrb_value p = MKSTR(platform);
-    mrb_value e = MKSTR(engine);
-    mrb_value tmp;
-
-    mrb_define_global_const(mrb, "RUBY_VERSION", v);
-    mrb_define_global_const(mrb, "RUBY_RELEASE_DATE", d);
-    mrb_define_global_const(mrb, "RUBY_PLATFORM", p);
-    mrb_define_global_const(mrb, "RUBY_PATCHLEVEL", mrb_fixnum_value(RUBY_PATCHLEVEL));
-    mrb_define_global_const(mrb, "RUBY_ENGINE", e);
-
-    snprintf(description, sizeof(description), "ruby %s (%s %s %d) [%s]",
-             RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_RELEASE_STR,
-             RUBY_RELEASE_NUM, RUBY_PLATFORM);
-    //tmp = mrb_obj_freeze(mrb_str_new2(description));
-    tmp = mrb_str_new2(mrb, description);
-    mrb_define_global_const(mrb, "RUBY_DESCRIPTION", tmp);
-
-    snprintf(copyright, sizeof(copyright), "ruby - Copyright (C) %d-%d %s",
-             RUBY_BIRTH_YEAR, RUBY_RELEASE_YEAR, RUBY_AUTHOR);
-    //tmp = mrb_obj_freeze(mrb_str_new2(copyright));
-    tmp = mrb_str_new2(mrb, copyright);
-    mrb_define_global_const(mrb, "RUBY_COPYRIGHT", tmp);
-
-    /* obsolete constants */
-    mrb_define_global_const(mrb, "VERSION", v);
-    mrb_define_global_const(mrb, "RELEASE_DATE", d);
-    mrb_define_global_const(mrb, "PLATFORM", p);
-}
-
-void
-ruby_show_version(mrb_state *mrb)
-{
-  mrb_value v = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern(mrb, "RUBY_DESCRIPTION"));
-
-  if (mrb_type(v) != MRB_TT_STRING)
-    return;
-
-  puts(RSTRING_PTR(v));
-  fflush(stdout);
-}
-
-void
-ruby_show_copyright(mrb_state *mrb)
-{
-  mrb_value v = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern(mrb, "RUBY_COPYRIGHT"));
-
-  if (mrb_type(v) != MRB_TT_STRING)
-    return;
-
-  puts(RSTRING_PTR(v));
-  exit(0);
-}

src/version.h

-/*
-** version.h - version information
-**
-** See Copyright Notice in mruby.h
-*/
-
-#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-08-16"
-#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20100816
-#define RUBY_PATCHLEVEL 302
-
-#define RUBY_VERSION_MAJOR 1
-#define RUBY_VERSION_MINOR 8
-#define RUBY_VERSION_TEENY 7
-#define RUBY_RELEASE_YEAR 2010
-#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 16
-
-#ifdef RUBY_EXTERN
-RUBY_EXTERN const char ruby_version[];
-RUBY_EXTERN const char ruby_release_date[];
-RUBY_EXTERN const char ruby_platform[];
-RUBY_EXTERN const int ruby_patchlevel;
-RUBY_EXTERN const char *ruby_description;
-RUBY_EXTERN const char *ruby_copyright;
-#endif
-
-#define RUBY_AUTHOR "Yukihiro Matsumoto"
-#define RUBY_BIRTH_YEAR 1993
-#define RUBY_BIRTH_MONTH 2
-#define RUBY_BIRTH_DAY 24
-
-#define RUBY_RELEASE_STR "patchlevel"
-#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
-
-#define RUBY_PLATFORM "i386-mingw32"
-#define RUBY_ENGINE "ruby"

tools/mrbc/mrbc.c

@@ -9,8 +9,6 @@
 
 #define RITEBIN_EXT ".mrb"
 #define C_EXT       ".c"
-void ruby_show_version(mrb_state *);
-void ruby_show_copyright(mrb_state *);
 void parser_dump(mrb_state*, struct mrb_ast_node*, int);
 void codedump_all(mrb_state*, int);
 
@@ -101,14 +99,14 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
         break;
       case '-':
         if (strcmp((*argv) + 2, "version") == 0) {
-          ruby_show_version(mrb);
+          mrb_show_version(mrb);
         }
         else if (strcmp((*argv) + 2, "verbose") == 0) {
           args->verbose = 1;
           break;
         }
         else if (strcmp((*argv) + 2, "copyright") == 0) {
-          ruby_show_copyright(mrb);
+          mrb_show_copyright(mrb);
         }
         else return -3;
         return 0;